diff options
| author | Sebastian Heinlein <sebi@sebi-pc> | 2006-09-26 10:46:49 +0200 |
|---|---|---|
| committer | Sebastian Heinlein <sebi@sebi-pc> | 2006-09-26 10:46:49 +0200 |
| commit | 90a9b9f0faf09a401693f7cfcbd362ff62559929 (patch) | |
| tree | e00d94e7c77b45f8ac9792a9c80a68e2a2391d7c | |
| parent | a807cb63c7b82450fb53f9de5958ae5637fff0d1 (diff) | |
| parent | d8c288d928da41fae20947b7dd2064740c2593b3 (diff) | |
| download | python-apt-90a9b9f0faf09a401693f7cfcbd362ff62559929.tar.gz | |
* merge with mvo
80 files changed, 17729 insertions, 15481 deletions
diff --git a/DistUpgrade/Changelog b/DistUpgrade/Changelog index 33ecff3d..54d194e6 100644 --- a/DistUpgrade/Changelog +++ b/DistUpgrade/Changelog @@ -1,3 +1,7 @@ +2006-09-23: + - support fetching backports of selected packages first and + use them for the upgrade (needed to support Breaks) + - fetch/use apt/dpkg/python-apt backports for the upgrade 2006-09-06: - increased the "free-space-savety-buffer" to 100MB 2006-09-05: diff --git a/DistUpgrade/DistUpgrade.cfg b/DistUpgrade/DistUpgrade.cfg index 7a8ebba9..60c3ca9f 100644 --- a/DistUpgrade/DistUpgrade.cfg +++ b/DistUpgrade/DistUpgrade.cfg @@ -39,5 +39,11 @@ To=edgy ValidOrigin=Ubuntu ValidMirrors = mirrors.cfg +[Backports] +Packages=apt,dpkg,python2.4-apt +VersionIdent=~dapper +SourcesList=backport-source.list + + [Network] -MaxRetries=3
\ No newline at end of file +MaxRetries=3 diff --git a/DistUpgrade/DistUpgrade.glade b/DistUpgrade/DistUpgrade.glade index dbe7911d..615f698c 100644 --- a/DistUpgrade/DistUpgrade.glade +++ b/DistUpgrade/DistUpgrade.glade @@ -1,1230 +1,2083 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> -<!-- Generated with glade3 - Version: 3.0.0 - Date: Tue Aug 29 21:21:15 2006 - User: egon - Host: top ---> +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> + <glade-interface> - <widget class="GtkWindow" id="window_main"> - <property name="visible">True</property> - <property name="border_width">6</property> - <property name="title">Upgrading Ubuntu</property> - <property name="resizable">False</property> - <property name="window_position">GTK_WIN_POS_CENTER</property> - <property name="urgency_hint">True</property> - <signal name="delete_event" handler="on_window_main_delete_event"/> - <signal name="destroy_event" handler="on_window_main_destroy_event"/> - <child> - <widget class="GtkVBox" id="vbox5"> - <property name="visible">True</property> - <property name="spacing">12</property> - <child> - <widget class="GtkVBox" id="vbox1"> - <property name="visible">True</property> - <property name="border_width">6</property> - <property name="spacing">12</property> - <child> - <widget class="GtkLabel" id="label_title"> - <property name="visible">True</property> - <property name="xalign">0.000000</property> - <property name="label" translatable="yes"><span weight="bold" size="x-large">Upgrading to Ubuntu 6.10</span></property> - <property name="use_markup">True</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - <child> - <widget class="GtkHBox" id="hbox3"> - <property name="visible">True</property> - <child> - <widget class="GtkLabel" id="label17"> - <property name="visible">True</property> - <property name="label" translatable="yes"> </property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - <child> - <widget class="GtkTable" id="table_steps"> - <property name="visible">True</property> - <property name="n_rows">5</property> - <property name="n_columns">2</property> - <property name="column_spacing">6</property> - <property name="row_spacing">6</property> - <child> - <widget class="GtkLabel" id="label_step5"> - <property name="visible">True</property> - <property name="xalign">0.000000</property> - <property name="label" translatable="yes">Restarting the system</property> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkImage" id="image_step5"> - <property name="width_request">18</property> - <property name="height_request">18</property> - <property name="visible">True</property> - </widget> - <packing> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> - <property name="x_options">GTK_FILL</property> - </packing> - </child> - <child> - <widget class="GtkImage" id="image_step1"> - <property name="width_request">18</property> - <property name="height_request">18</property> - <property name="visible">True</property> - </widget> - <packing> - <property name="x_options">GTK_FILL</property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label_step4"> - <property name="visible">True</property> - <property name="xalign">0.000000</property> - <property name="label" translatable="yes">Cleaning up</property> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label_step3"> - <property name="visible">True</property> - <property name="xalign">0.000000</property> - <property name="label" translatable="yes">Fetching and installing the upgrades</property> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label_step2"> - <property name="visible">True</property> - <property name="xalign">0.000000</property> - <property name="label" translatable="yes">Modifying the software channels</property> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label_step1"> - <property name="visible">True</property> - <property name="xalign">0.000000</property> - <property name="label" translatable="yes">Preparing the upgrade</property> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkImage" id="image_step4"> - <property name="width_request">18</property> - <property name="height_request">18</property> - <property name="visible">True</property> - </widget> - <packing> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">GTK_FILL</property> - </packing> - </child> - <child> - <widget class="GtkImage" id="image_step3"> - <property name="width_request">18</property> - <property name="height_request">18</property> - <property name="visible">True</property> - </widget> - <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> - </packing> - </child> - <child> - <widget class="GtkImage" id="image_step2"> - <property name="width_request">18</property> - <property name="height_request">18</property> - <property name="visible">True</property> - </widget> - <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - </packing> - </child> - </widget> - <packing> - <property name="position">1</property> - </packing> - </child> - </widget> - <packing> - <property name="position">1</property> - </packing> - </child> - <child> - <widget class="GtkVBox" id="vbox5"> - <property name="visible">True</property> - <property name="spacing">4</property> - <child> - <widget class="GtkProgressBar" id="progressbar_cache"> - <property name="width_request">350</property> - <property name="visible">True</property> - <property name="pulse_step">0.1</property> - <property name="text"> </property> - <property name="ellipsize">PANGO_ELLIPSIZE_END</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label_status"> - <property name="visible">True</property> - <property name="xalign">0.000000</property> - <property name="wrap">True</property> - <property name="ellipsize">PANGO_ELLIPSIZE_END</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </widget> - <packing> - <property name="position">2</property> - </packing> - </child> - <child> - <widget class="GtkExpander" id="expander_terminal"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="spacing">4</property> - <child> - <widget class="GtkHBox" id="hbox1"> - <property name="visible">True</property> - <child> - <widget class="Custom" id="custom_terminal"> - <property name="visible">True</property> - <property name="creation_function">create_terminal</property> - </widget> - </child> - <child> - <widget class="GtkVScrollbar" id="vscrollbar_terminal"> - <property name="visible">True</property> - <property name="adjustment">0.000000 0.000000 0.000000 0.000000 0.000000 0.000000</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="position">1</property> - </packing> - </child> - </widget> - </child> - <child> - <widget class="GtkLabel" id="label6"> - <property name="visible">True</property> - <property name="label" translatable="yes">Terminal</property> - </widget> - <packing> - <property name="type">label_item</property> - </packing> - </child> - </widget> - <packing> - <property name="position">3</property> - </packing> - </child> - </widget> - </child> - </widget> - </child> - </widget> - <widget class="GtkDialog" id="dialog_changes"> - <property name="border_width">6</property> - <property name="resizable">False</property> - <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property> - <property name="default_width">500</property> - <property name="default_height">400</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> - <property name="skip_taskbar_hint">True</property> - <property name="skip_pager_hint">True</property> - <property name="urgency_hint">True</property> - <property name="has_separator">False</property> - <child internal-child="vbox"> - <widget class="GtkVBox" id="vbox2"> - <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <widget class="GtkHBox" id="hbox12"> - <property name="visible">True</property> - <property name="border_width">6</property> - <property name="spacing">12</property> - <child> - <widget class="GtkImage" id="image9"> - <property name="visible">True</property> - <property name="xalign">0.000000</property> - <property name="yalign">0.000000</property> - <property name="stock">gtk-dialog-question</property> - <property name="icon_size">6</property> - </widget> - <packing> - <property name="expand">False</property> - </packing> - </child> - <child> - <widget class="GtkVBox" id="vbox3"> - <property name="visible">True</property> - <property name="spacing">12</property> - <child> - <widget class="GtkLabel" id="label_summary"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="xalign">0.000000</property> - <property name="use_markup">True</property> - <property name="wrap">True</property> - <property name="selectable">True</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label_changes"> - <property name="visible">True</property> - <property name="xalign">0.000000</property> - <property name="use_markup">True</property> - <property name="wrap">True</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <widget class="GtkExpander" id="expander_details"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="spacing">6</property> - <child> - <widget class="GtkScrolledWindow" id="scrolledwindow1"> - <property name="width_request">400</property> - <property name="height_request">200</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> - <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> - <property name="shadow_type">GTK_SHADOW_IN</property> - <child> - <widget class="GtkTreeView" id="treeview_details"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="headers_visible">False</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkLabel" id="label4"> - <property name="visible">True</property> - <property name="label" translatable="yes">Details</property> - </widget> - <packing> - <property name="type">label_item</property> - </packing> - </child> - </widget> - <packing> - <property name="position">2</property> - </packing> - </child> - </widget> - <packing> - <property name="position">1</property> - </packing> - </child> - </widget> - <packing> - <property name="position">1</property> - </packing> - </child> - <child internal-child="action_area"> - <widget class="GtkHButtonBox" id="hbuttonbox1"> - <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> - <child> - <widget class="GtkButton" id="button_cancel_changes"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="label">gtk-cancel</property> - <property name="use_stock">True</property> - <property name="response_id">-6</property> - </widget> - </child> - <child> - <widget class="GtkButton" id="button_confirm_changes"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="label">_Start Upgrade</property> - <property name="use_underline">True</property> - <property name="response_id">-8</property> - </widget> - <packing> - <property name="position">1</property> - </packing> - </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="pack_type">GTK_PACK_END</property> - </packing> - </child> - </widget> - </child> - </widget> - <widget class="GtkDialog" id="dialog_restart"> - <property name="border_width">6</property> - <property name="resizable">False</property> - <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> - <property name="skip_taskbar_hint">True</property> - <property name="skip_pager_hint">True</property> - <property name="urgency_hint">True</property> - <property name="has_separator">False</property> - <child internal-child="vbox"> - <widget class="GtkVBox" id="dialog-vbox1"> - <property name="visible">True</property> - <property name="spacing">12</property> - <child> - <widget class="GtkHBox" id="hbox5"> - <property name="visible">True</property> - <property name="border_width">6</property> - <property name="spacing">12</property> - <child> - <widget class="GtkImage" id="image2"> - <property name="visible">True</property> - <property name="xalign">0.000000</property> - <property name="yalign">0.000000</property> - <property name="stock">gtk-dialog-info</property> - <property name="icon_size">6</property> - </widget> - <packing> - <property name="expand">False</property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label19"> - <property name="visible">True</property> - <property name="xalign">0.000000</property> - <property name="yalign">0.000000</property> - <property name="label" translatable="yes"><b><big>Restart the system to complete the upgrade</big></b></property> - <property name="use_markup">True</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </widget> - <packing> - <property name="position">1</property> - </packing> - </child> - <child internal-child="action_area"> - <widget class="GtkHButtonBox" id="dialog-action_area1"> - <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> - <child> - <widget class="GtkButton" id="button_restart"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="response_id">-8</property> - <child> - <widget class="GtkAlignment" id="alignment1"> - <property name="visible">True</property> - <property name="xscale">0.000000</property> - <property name="yscale">0.000000</property> - <child> - <widget class="GtkHBox" id="hbox6"> - <property name="visible">True</property> - <property name="spacing">2</property> - <child> - <widget class="GtkImage" id="image3"> - <property name="visible">True</property> - <property name="stock">gtk-refresh</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label20"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Restart Now</property> - <property name="use_underline">True</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </widget> - </child> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkButton" id="button_restart"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="label">gtk-close</property> - <property name="use_stock">True</property> - <property name="response_id">-7</property> - </widget> - <packing> - <property name="position">1</property> - </packing> - </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="pack_type">GTK_PACK_END</property> - </packing> - </child> - </widget> - </child> - </widget> - <widget class="GtkDialog" id="dialog_error"> - <property name="border_width">6</property> - <property name="resizable">False</property> - <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> - <property name="skip_taskbar_hint">True</property> - <property name="skip_pager_hint">True</property> - <property name="urgency_hint">True</property> - <property name="has_separator">False</property> - <child internal-child="vbox"> - <widget class="GtkVBox" id="vbox6"> - <property name="visible">True</property> - <property name="spacing">12</property> - <child> - <widget class="GtkHBox" id="hbox8"> - <property name="visible">True</property> - <property name="border_width">6</property> - <property name="spacing">12</property> - <child> - <widget class="GtkImage" id="image5"> - <property name="visible">True</property> - <property name="xalign">0.000000</property> - <property name="yalign">0.000000</property> - <property name="stock">gtk-dialog-error</property> - <property name="icon_size">6</property> - </widget> - <packing> - <property name="expand">False</property> - </packing> - </child> - <child> - <widget class="GtkVBox" id="vbox7"> - <property name="visible">True</property> - <property name="spacing">12</property> - <child> - <widget class="GtkLabel" id="label_error"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="xalign">0.000000</property> - <property name="use_markup">True</property> - <property name="wrap">True</property> - <property name="selectable">True</property> - </widget> - <packing> - <property name="expand">False</property> - </packing> - </child> - <child> - <widget class="GtkScrolledWindow" id="scroll_error"> - <property name="width_request">400</property> - <property name="height_request">200</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> - <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> - <property name="shadow_type">GTK_SHADOW_IN</property> - <child> - <widget class="GtkTextView" id="textview_error"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="pixels_above_lines">4</property> - <property name="pixels_below_lines">4</property> - <property name="editable">False</property> - <property name="left_margin">4</property> - <property name="right_margin">4</property> - </widget> - </child> - </widget> - <packing> - <property name="position">1</property> - </packing> - </child> - </widget> - <packing> - <property name="position">1</property> - </packing> - </child> - </widget> - <packing> - <property name="position">1</property> - </packing> - </child> - <child internal-child="action_area"> - <widget class="GtkHButtonBox" id="hbuttonbox3"> - <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> - <child> - <widget class="GtkButton" id="button_bugreport"> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="has_default">True</property> - <property name="label" translatable="yes">_Report Bug</property> - <property name="use_underline">True</property> - <property name="response_id">-8</property> - </widget> - </child> - <child> - <widget class="GtkButton" id="button6"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="has_default">True</property> - <property name="label">gtk-close</property> - <property name="use_stock">True</property> - <property name="response_id">-7</property> - </widget> - <packing> - <property name="position">1</property> - </packing> - </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="pack_type">GTK_PACK_END</property> - </packing> - </child> - </widget> - </child> - </widget> - <widget class="GtkDialog" id="dialog_obsolete"> - <property name="border_width">6</property> - <property name="resizable">False</property> - <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property> - <property name="default_width">500</property> - <property name="default_height">400</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> - <property name="skip_taskbar_hint">True</property> - <property name="skip_pager_hint">True</property> - <property name="urgency_hint">True</property> - <property name="has_separator">False</property> - <child internal-child="vbox"> - <widget class="GtkVBox" id="vbox8"> - <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <widget class="GtkVBox" id="vbox9"> - <property name="visible">True</property> - <property name="border_width">6</property> - <property name="spacing">12</property> - <child> - <widget class="GtkHBox" id="hbox9"> - <property name="visible">True</property> - <property name="spacing">12</property> - <child> - <widget class="GtkImage" id="image6"> - <property name="visible">True</property> - <property name="xalign">0.000000</property> - <property name="yalign">0.000000</property> - <property name="stock">gtk-dialog-question</property> - <property name="icon_size">6</property> - </widget> - <packing> - <property name="expand">False</property> - </packing> - </child> - <child> - <widget class="GtkVBox" id="vbox10"> - <property name="visible">True</property> - <property name="spacing">12</property> - <child> - <widget class="GtkLabel" id="label26"> - <property name="visible">True</property> - <property name="xalign">0.000000</property> - <property name="yalign">0.000000</property> - <property name="label" translatable="yes"><b><big>Start the upgrade?</big></b></property> - <property name="use_markup">True</property> - <property name="wrap">True</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label27"> - <property name="visible">True</property> - <property name="xalign">0.000000</property> - <property name="yalign">0.000000</property> - <property name="label">The upgrade of your system requires - - ... to download 2000 MByte - - ... to install 23 new packages - ... to remove 19 packages - ... to update 200 packages - -This is you last chance to cancel the upgrade.</property> - <property name="wrap">True</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <widget class="GtkExpander" id="expander2"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <child> - <widget class="GtkScrolledWindow" id="scrolledwindow4"> - <property name="width_request">400</property> - <property name="height_request">200</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> - <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> - <property name="shadow_type">GTK_SHADOW_IN</property> - <child> - <widget class="GtkTreeView" id="treeview2"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="headers_visible">False</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkLabel" id="label25"> - <property name="visible">True</property> - <property name="label" translatable="yes">Details</property> - </widget> - <packing> - <property name="type">label_item</property> - </packing> - </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - <packing> - <property name="position">1</property> - </packing> - </child> - <child internal-child="action_area"> - <widget class="GtkHButtonBox" id="hbuttonbox4"> - <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> - <child> - <widget class="GtkButton" id="button7"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="label">gtk-cancel</property> - <property name="use_stock">True</property> - <property name="response_id">-6</property> - </widget> - </child> - <child> - <widget class="GtkButton" id="button8"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="label">_Continue</property> - <property name="use_underline">True</property> - <property name="response_id">-8</property> - </widget> - <packing> - <property name="position">1</property> - </packing> - </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="pack_type">GTK_PACK_END</property> - </packing> - </child> - </widget> - </child> - </widget> - <widget class="GtkDialog" id="dialog_cancel"> - <property name="border_width">6</property> - <property name="resizable">False</property> - <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> - <property name="skip_taskbar_hint">True</property> - <property name="skip_pager_hint">True</property> - <property name="urgency_hint">True</property> - <property name="has_separator">False</property> - <child internal-child="vbox"> - <widget class="GtkVBox" id="vbox11"> - <property name="visible">True</property> - <property name="spacing">12</property> - <child> - <widget class="GtkHBox" id="hbox11"> - <property name="visible">True</property> - <property name="border_width">6</property> - <property name="spacing">12</property> - <child> - <widget class="GtkImage" id="image8"> - <property name="visible">True</property> - <property name="xalign">0.000000</property> - <property name="yalign">0.000000</property> - <property name="stock">gtk-dialog-question</property> - <property name="icon_size">6</property> - </widget> - <packing> - <property name="expand">False</property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label29"> - <property name="visible">True</property> - <property name="xalign">0.000000</property> - <property name="yalign">0.000000</property> - <property name="label" translatable="yes"><b><big>Cancel the running upgrade?</big></b> + +<widget class="GtkWindow" id="window_main"> + <property name="border_width">6</property> + <property name="visible">True</property> + <property name="title">Distribution Upgrade</property> + <property name="type">GTK_WINDOW_TOPLEVEL</property> + <property name="window_position">GTK_WIN_POS_CENTER</property> + <property name="modal">False</property> + <property name="resizable">False</property> + <property name="destroy_with_parent">False</property> + <property name="decorated">True</property> + <property name="skip_taskbar_hint">False</property> + <property name="skip_pager_hint">False</property> + <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> + <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> + <property name="focus_on_map">True</property> + <property name="urgency_hint">True</property> + <signal name="delete_event" handler="on_window_main_delete_event"/> + <signal name="destroy_event" handler="on_window_main_destroy_event"/> + + <child> + <widget class="GtkVBox" id="vbox5"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">12</property> + + <child> + <widget class="GtkVBox" id="vbox1"> + <property name="border_width">6</property> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">12</property> + + <child> + <widget class="GtkLabel" id="label_title"> + <property name="visible">True</property> + <property name="label" translatable="yes"><b><big>Upgrading Ubuntu to version 6.10</big></b></property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkHBox" id="hbox3"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child> + <widget class="GtkLabel" id="label17"> + <property name="visible">True</property> + <property name="label" translatable="yes"> </property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkTable" id="table_steps"> + <property name="visible">True</property> + <property name="n_rows">5</property> + <property name="n_columns">2</property> + <property name="homogeneous">False</property> + <property name="row_spacing">6</property> + <property name="column_spacing">6</property> + + <child> + <widget class="GtkLabel" id="label_step1"> + <property name="visible">True</property> + <property name="label" translatable="yes">Preparing the upgrade</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label_step2"> + <property name="visible">True</property> + <property name="label" translatable="yes">Modifying the software channels</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label_step3"> + <property name="visible">True</property> + <property name="label" translatable="yes">Fetching and installing the upgrades</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label_step4"> + <property name="visible">True</property> + <property name="label" translatable="yes">Cleaning up</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label_step5"> + <property name="visible">True</property> + <property name="label" translatable="yes">Restarting the system</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkHBox" id="hbox17"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child> + <widget class="GtkArrow" id="arrow_step1"> + <property name="arrow_type">GTK_ARROW_RIGHT</property> + <property name="shadow_type">GTK_SHADOW_OUT</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkImage" id="image_step1"> + <property name="width_request">18</property> + <property name="height_request">18</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> + <property name="x_options">fill</property> + <property name="y_options">fill</property> + </packing> + </child> + + <child> + <widget class="GtkHBox" id="hbox18"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child> + <widget class="GtkArrow" id="arrow_step2"> + <property name="arrow_type">GTK_ARROW_RIGHT</property> + <property name="shadow_type">GTK_SHADOW_OUT</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkImage" id="image_step2"> + <property name="width_request">18</property> + <property name="height_request">18</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">fill</property> + <property name="y_options">fill</property> + </packing> + </child> + + <child> + <widget class="GtkHBox" id="hbox19"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child> + <widget class="GtkArrow" id="arrow_step3"> + <property name="arrow_type">GTK_ARROW_RIGHT</property> + <property name="shadow_type">GTK_SHADOW_OUT</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkImage" id="image_step3"> + <property name="width_request">18</property> + <property name="height_request">18</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">fill</property> + <property name="y_options">fill</property> + </packing> + </child> + + <child> + <widget class="GtkHBox" id="hbox20"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child> + <widget class="GtkArrow" id="arrow_step4"> + <property name="arrow_type">GTK_ARROW_RIGHT</property> + <property name="shadow_type">GTK_SHADOW_OUT</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkImage" id="image_step4"> + <property name="width_request">18</property> + <property name="height_request">18</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="x_options">fill</property> + <property name="y_options">fill</property> + </packing> + </child> + + <child> + <widget class="GtkHBox" id="hbox21"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child> + <widget class="GtkArrow" id="arrow_step5"> + <property name="arrow_type">GTK_ARROW_RIGHT</property> + <property name="shadow_type">GTK_SHADOW_OUT</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkImage" id="image_step5"> + <property name="width_request">18</property> + <property name="height_request">18</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> + <property name="x_options">fill</property> + <property name="y_options">fill</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkVBox" id="vbox5"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">4</property> + + <child> + <widget class="GtkProgressBar" id="progressbar_cache"> + <property name="width_request">350</property> + <property name="visible">True</property> + <property name="orientation">GTK_PROGRESS_LEFT_TO_RIGHT</property> + <property name="fraction">0</property> + <property name="pulse_step">0.10000000149</property> + <property name="text"> </property> + <property name="ellipsize">PANGO_ELLIPSIZE_END</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label_status"> + <property name="visible">True</property> + <property name="label" translatable="yes"></property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">True</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_END</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkExpander" id="expander_terminal"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="expanded">False</property> + <property name="spacing">4</property> + + <child> + <widget class="GtkHBox" id="hbox1"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child> + <widget class="Custom" id="custom_terminal"> + <property name="visible">True</property> + <property name="creation_function">create_terminal</property> + <property name="int1">0</property> + <property name="int2">0</property> + <property name="last_modification_time">Mon, 11 Sep 2006 12:48:22 GMT</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkVScrollbar" id="vscrollbar_terminal"> + <property name="visible">True</property> + <property name="update_policy">GTK_UPDATE_CONTINUOUS</property> + <property name="inverted">False</property> + <property name="adjustment">0 0 0 0 0 0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + </child> + + <child> + <widget class="GtkLabel" id="label6"> + <property name="visible">True</property> + <property name="label" translatable="yes">Terminal</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="type">label_item</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + </child> +</widget> + +<widget class="GtkDialog" id="dialog_changes"> + <property name="border_width">6</property> + <property name="title" translatable="yes"></property> + <property name="type">GTK_WINDOW_TOPLEVEL</property> + <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property> + <property name="modal">False</property> + <property name="default_width">500</property> + <property name="default_height">400</property> + <property name="resizable">False</property> + <property name="destroy_with_parent">False</property> + <property name="decorated">True</property> + <property name="skip_taskbar_hint">True</property> + <property name="skip_pager_hint">True</property> + <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> + <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> + <property name="focus_on_map">True</property> + <property name="urgency_hint">True</property> + <property name="has_separator">False</property> + + <child internal-child="vbox"> + <widget class="GtkVBox" id="vbox2"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">6</property> + + <child internal-child="action_area"> + <widget class="GtkHButtonBox" id="hbuttonbox1"> + <property name="visible">True</property> + <property name="layout_style">GTK_BUTTONBOX_END</property> + + <child> + <widget class="GtkButton" id="button_cancel_changes"> + <property name="visible">True</property> + <property name="can_default">True</property> + <property name="can_focus">True</property> + <property name="label">gtk-cancel</property> + <property name="use_stock">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="response_id">-6</property> + </widget> + </child> + + <child> + <widget class="GtkButton" id="button_confirm_changes"> + <property name="visible">True</property> + <property name="can_default">True</property> + <property name="can_focus">True</property> + <property name="label">_Start Upgrade</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="response_id">-8</property> + </widget> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">GTK_PACK_END</property> + </packing> + </child> + + <child> + <widget class="GtkHBox" id="hbox12"> + <property name="border_width">6</property> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">12</property> + + <child> + <widget class="GtkImage" id="image9"> + <property name="visible">True</property> + <property name="stock">gtk-dialog-question</property> + <property name="icon_size">6</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkVBox" id="vbox3"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">12</property> + + <child> + <widget class="GtkLabel" id="label_summary"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes"></property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">True</property> + <property name="selectable">True</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label_changes"> + <property name="visible">True</property> + <property name="label" translatable="yes"></property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">True</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkExpander" id="expander_details"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="expanded">False</property> + <property name="spacing">6</property> + + <child> + <widget class="GtkScrolledWindow" id="scrolledwindow1"> + <property name="width_request">400</property> + <property name="height_request">200</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <property name="shadow_type">GTK_SHADOW_IN</property> + <property name="window_placement">GTK_CORNER_TOP_LEFT</property> + + <child> + <widget class="GtkTreeView" id="treeview_details"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="headers_visible">False</property> + <property name="rules_hint">False</property> + <property name="reorderable">False</property> + <property name="enable_search">True</property> + <property name="fixed_height_mode">False</property> + <property name="hover_selection">False</property> + <property name="hover_expand">False</property> + </widget> + </child> + </widget> + </child> + + <child> + <widget class="GtkLabel" id="label4"> + <property name="visible">True</property> + <property name="label" translatable="yes">Details</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="type">label_item</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + </child> +</widget> + +<widget class="GtkDialog" id="dialog_restart"> + <property name="border_width">6</property> + <property name="title" translatable="yes"></property> + <property name="type">GTK_WINDOW_TOPLEVEL</property> + <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property> + <property name="modal">False</property> + <property name="resizable">False</property> + <property name="destroy_with_parent">False</property> + <property name="decorated">True</property> + <property name="skip_taskbar_hint">True</property> + <property name="skip_pager_hint">True</property> + <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> + <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> + <property name="focus_on_map">True</property> + <property name="urgency_hint">True</property> + <property name="has_separator">False</property> + + <child internal-child="vbox"> + <widget class="GtkVBox" id="dialog-vbox1"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">12</property> + + <child internal-child="action_area"> + <widget class="GtkHButtonBox" id="dialog-action_area1"> + <property name="visible">True</property> + <property name="layout_style">GTK_BUTTONBOX_END</property> + + <child> + <widget class="GtkButton" id="button_restart"> + <property name="visible">True</property> + <property name="can_default">True</property> + <property name="can_focus">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="response_id">-8</property> + + <child> + <widget class="GtkAlignment" id="alignment1"> + <property name="visible">True</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xscale">0</property> + <property name="yscale">0</property> + <property name="top_padding">0</property> + <property name="bottom_padding">0</property> + <property name="left_padding">0</property> + <property name="right_padding">0</property> + + <child> + <widget class="GtkHBox" id="hbox6"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">2</property> + + <child> + <widget class="GtkImage" id="image3"> + <property name="visible">True</property> + <property name="stock">gtk-refresh</property> + <property name="icon_size">4</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label20"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Restart Now</property> + <property name="use_underline">True</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + </widget> + </child> + </widget> + </child> + </widget> + </child> + + <child> + <widget class="GtkButton" id="button_restart"> + <property name="visible">True</property> + <property name="can_default">True</property> + <property name="can_focus">True</property> + <property name="label">gtk-close</property> + <property name="use_stock">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="response_id">-7</property> + </widget> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">GTK_PACK_END</property> + </packing> + </child> + + <child> + <widget class="GtkHBox" id="hbox5"> + <property name="border_width">6</property> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">12</property> + + <child> + <widget class="GtkImage" id="image2"> + <property name="visible">True</property> + <property name="stock">gtk-dialog-info</property> + <property name="icon_size">6</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label19"> + <property name="visible">True</property> + <property name="label" translatable="yes"><b><big>Restart the system to complete the upgrade</big></b></property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + </child> +</widget> + +<widget class="GtkDialog" id="dialog_error"> + <property name="border_width">6</property> + <property name="title" translatable="yes"></property> + <property name="type">GTK_WINDOW_TOPLEVEL</property> + <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property> + <property name="modal">False</property> + <property name="resizable">False</property> + <property name="destroy_with_parent">False</property> + <property name="decorated">True</property> + <property name="skip_taskbar_hint">True</property> + <property name="skip_pager_hint">True</property> + <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> + <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> + <property name="focus_on_map">True</property> + <property name="urgency_hint">True</property> + <property name="has_separator">False</property> + + <child internal-child="vbox"> + <widget class="GtkVBox" id="vbox6"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">12</property> + + <child internal-child="action_area"> + <widget class="GtkHButtonBox" id="hbuttonbox3"> + <property name="visible">True</property> + <property name="layout_style">GTK_BUTTONBOX_END</property> + + <child> + <widget class="GtkButton" id="button_bugreport"> + <property name="can_default">True</property> + <property name="has_default">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">_Report Bug</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="response_id">-8</property> + </widget> + </child> + + <child> + <widget class="GtkButton" id="button6"> + <property name="visible">True</property> + <property name="can_default">True</property> + <property name="has_default">True</property> + <property name="can_focus">True</property> + <property name="label">gtk-close</property> + <property name="use_stock">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="response_id">-7</property> + </widget> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">GTK_PACK_END</property> + </packing> + </child> + + <child> + <widget class="GtkHBox" id="hbox8"> + <property name="border_width">6</property> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">12</property> + + <child> + <widget class="GtkImage" id="image5"> + <property name="visible">True</property> + <property name="stock">gtk-dialog-error</property> + <property name="icon_size">6</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkVBox" id="vbox7"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">12</property> + + <child> + <widget class="GtkLabel" id="label_error"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes"></property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">True</property> + <property name="selectable">True</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkScrolledWindow" id="scroll_error"> + <property name="width_request">400</property> + <property name="height_request">200</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <property name="shadow_type">GTK_SHADOW_IN</property> + <property name="window_placement">GTK_CORNER_TOP_LEFT</property> + + <child> + <widget class="GtkTextView" id="textview_error"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="editable">False</property> + <property name="overwrite">False</property> + <property name="accepts_tab">True</property> + <property name="justification">GTK_JUSTIFY_LEFT</property> + <property name="wrap_mode">GTK_WRAP_NONE</property> + <property name="cursor_visible">True</property> + <property name="pixels_above_lines">4</property> + <property name="pixels_below_lines">4</property> + <property name="pixels_inside_wrap">0</property> + <property name="left_margin">4</property> + <property name="right_margin">4</property> + <property name="indent">0</property> + <property name="text" translatable="yes"></property> + </widget> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + </child> +</widget> + +<widget class="GtkDialog" id="dialog_obsolete"> + <property name="border_width">6</property> + <property name="title" translatable="yes"></property> + <property name="type">GTK_WINDOW_TOPLEVEL</property> + <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property> + <property name="modal">False</property> + <property name="default_width">500</property> + <property name="default_height">400</property> + <property name="resizable">False</property> + <property name="destroy_with_parent">False</property> + <property name="decorated">True</property> + <property name="skip_taskbar_hint">True</property> + <property name="skip_pager_hint">True</property> + <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> + <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> + <property name="focus_on_map">True</property> + <property name="urgency_hint">True</property> + <property name="has_separator">False</property> + + <child internal-child="vbox"> + <widget class="GtkVBox" id="vbox8"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">6</property> + + <child internal-child="action_area"> + <widget class="GtkHButtonBox" id="hbuttonbox4"> + <property name="visible">True</property> + <property name="layout_style">GTK_BUTTONBOX_END</property> + + <child> + <widget class="GtkButton" id="button7"> + <property name="visible">True</property> + <property name="can_default">True</property> + <property name="can_focus">True</property> + <property name="label">gtk-cancel</property> + <property name="use_stock">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="response_id">-6</property> + </widget> + </child> + + <child> + <widget class="GtkButton" id="button8"> + <property name="visible">True</property> + <property name="can_default">True</property> + <property name="can_focus">True</property> + <property name="label">_Continue</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="response_id">-8</property> + </widget> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">GTK_PACK_END</property> + </packing> + </child> + + <child> + <widget class="GtkVBox" id="vbox9"> + <property name="border_width">6</property> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">12</property> + + <child> + <widget class="GtkHBox" id="hbox9"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">12</property> + + <child> + <widget class="GtkImage" id="image6"> + <property name="visible">True</property> + <property name="stock">gtk-dialog-question</property> + <property name="icon_size">6</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkVBox" id="vbox10"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">12</property> + + <child> + <widget class="GtkLabel" id="label26"> + <property name="visible">True</property> + <property name="label" translatable="yes"><b><big>Start the upgrade?</big></b></property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">True</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label27"> + <property name="visible">True</property> + <property name="label"></property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">True</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkExpander" id="expander2"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="expanded">False</property> + <property name="spacing">0</property> + + <child> + <widget class="GtkScrolledWindow" id="scrolledwindow4"> + <property name="width_request">400</property> + <property name="height_request">200</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <property name="shadow_type">GTK_SHADOW_IN</property> + <property name="window_placement">GTK_CORNER_TOP_LEFT</property> + + <child> + <widget class="GtkTreeView" id="treeview2"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="headers_visible">False</property> + <property name="rules_hint">False</property> + <property name="reorderable">False</property> + <property name="enable_search">True</property> + <property name="fixed_height_mode">False</property> + <property name="hover_selection">False</property> + <property name="hover_expand">False</property> + </widget> + </child> + </widget> + </child> + + <child> + <widget class="GtkLabel" id="label25"> + <property name="visible">True</property> + <property name="label" translatable="yes">Details</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="type">label_item</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + </child> +</widget> + +<widget class="GtkDialog" id="dialog_cancel"> + <property name="border_width">6</property> + <property name="title" translatable="yes"></property> + <property name="type">GTK_WINDOW_TOPLEVEL</property> + <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property> + <property name="modal">False</property> + <property name="resizable">False</property> + <property name="destroy_with_parent">False</property> + <property name="decorated">True</property> + <property name="skip_taskbar_hint">True</property> + <property name="skip_pager_hint">True</property> + <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> + <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> + <property name="focus_on_map">True</property> + <property name="urgency_hint">True</property> + <property name="has_separator">False</property> + + <child internal-child="vbox"> + <widget class="GtkVBox" id="vbox11"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">12</property> + + <child internal-child="action_area"> + <widget class="GtkHButtonBox" id="hbuttonbox5"> + <property name="visible">True</property> + <property name="layout_style">GTK_BUTTONBOX_END</property> + + <child> + <widget class="GtkButton" id="button_cancel"> + <property name="visible">True</property> + <property name="can_default">True</property> + <property name="can_focus">True</property> + <property name="label">_Cancel Upgrade</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="response_id">-6</property> + </widget> + </child> + + <child> + <widget class="GtkButton" id="button_resume"> + <property name="visible">True</property> + <property name="can_default">True</property> + <property name="has_default">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">_Resume Upgrade</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="response_id">-5</property> + </widget> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">GTK_PACK_END</property> + </packing> + </child> + + <child> + <widget class="GtkHBox" id="hbox11"> + <property name="border_width">6</property> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">12</property> + + <child> + <widget class="GtkImage" id="image8"> + <property name="visible">True</property> + <property name="stock">gtk-dialog-question</property> + <property name="icon_size">6</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label29"> + <property name="visible">True</property> + <property name="label" translatable="yes"><b><big>Cancel the running upgrade?</big></b> The system could be in an unusable state if you cancel the upgrade. You are strongly adviced to resume the upgrade.</property> - <property name="use_markup">True</property> - <property name="wrap">True</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </widget> - <packing> - <property name="position">1</property> - </packing> - </child> - <child internal-child="action_area"> - <widget class="GtkHButtonBox" id="hbuttonbox5"> - <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> - <child> - <widget class="GtkButton" id="button_cancel"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="label">_Cancel Upgrade</property> - <property name="use_underline">True</property> - <property name="response_id">-6</property> - </widget> - </child> - <child> - <widget class="GtkButton" id="button_resume"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="has_default">True</property> - <property name="label" translatable="yes">_Resume Upgrade</property> - <property name="use_underline">True</property> - <property name="response_id">-5</property> - </widget> - <packing> - <property name="position">1</property> - </packing> - </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="pack_type">GTK_PACK_END</property> - </packing> - </child> - </widget> - </child> - </widget> - <widget class="GtkDialog" id="dialog_conffile"> - <property name="border_width">5</property> - <property name="resizable">False</property> - <property name="modal">True</property> - <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> - <property name="has_separator">False</property> - <child internal-child="vbox"> - <widget class="GtkVBox" id="vbox12"> - <property name="visible">True</property> - <property name="spacing">12</property> - <child> - <widget class="GtkHBox" id="hbox15"> - <property name="visible">True</property> - <property name="border_width">6</property> - <property name="spacing">12</property> - <child> - <widget class="GtkImage" id="image12"> - <property name="visible">True</property> - <property name="xalign">0.000000</property> - <property name="yalign">0.000000</property> - <property name="stock">gtk-dialog-question</property> - <property name="icon_size">6</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - <child> - <widget class="GtkVBox" id="vbox13"> - <property name="visible">True</property> - <property name="spacing">12</property> - <child> - <widget class="GtkLabel" id="label_conffile"> - <property name="visible">True</property> - <property name="xalign">0.000000</property> - <property name="use_markup">True</property> - <property name="wrap">True</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - <packing> - <property name="position">1</property> - </packing> - </child> - </widget> - <packing> - <property name="position">1</property> - </packing> - </child> - <child> - <widget class="GtkExpander" id="expander3"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <child> - <widget class="GtkVBox" id="vbox14"> - <property name="visible">True</property> - <child> - <widget class="GtkScrolledWindow" id="scrolledwindow5"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> - <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> - <property name="shadow_type">GTK_SHADOW_IN</property> - <child> - <widget class="GtkTextView" id="textview_conffile"> - <property name="height_request">300</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="editable">False</property> - <property name="cursor_visible">False</property> - </widget> - </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - </child> - <child> - <widget class="GtkLabel" id="label33"> - <property name="visible">True</property> - <property name="label" translatable="yes">Difference between the files</property> - </widget> - <packing> - <property name="type">label_item</property> - </packing> - </child> - </widget> - <packing> - <property name="position">2</property> - </packing> - </child> - <child internal-child="action_area"> - <widget class="GtkHButtonBox" id="hbuttonbox6"> - <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> - <child> - <widget class="GtkButton" id="button9"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="has_focus">True</property> - <property name="can_default">True</property> - <property name="has_default">True</property> - <property name="response_id">-9</property> - <child> - <widget class="GtkAlignment" id="alignment2"> - <property name="visible">True</property> - <property name="xscale">0.000000</property> - <property name="yscale">0.000000</property> - <child> - <widget class="GtkHBox" id="hbox13"> - <property name="visible">True</property> - <property name="spacing">2</property> - <child> - <widget class="GtkImage" id="image10"> - <property name="visible">True</property> - <property name="stock">gtk-cancel</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label30"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Keep</property> - <property name="use_underline">True</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </widget> - </child> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkButton" id="button10"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="response_id">-8</property> - <child> - <widget class="GtkAlignment" id="alignment3"> - <property name="visible">True</property> - <property name="xscale">0.000000</property> - <property name="yscale">0.000000</property> - <child> - <widget class="GtkHBox" id="hbox14"> - <property name="visible">True</property> - <property name="spacing">2</property> - <child> - <widget class="GtkImage" id="image11"> - <property name="visible">True</property> - <property name="stock">gtk-ok</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label31"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Replace</property> - <property name="use_underline">True</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </widget> - </child> - </widget> - </child> - </widget> - <packing> - <property name="position">1</property> - </packing> - </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="pack_type">GTK_PACK_END</property> - </packing> - </child> - </widget> - </child> - </widget> - <widget class="GtkDialog" id="dialog_information"> - <property name="border_width">6</property> - <property name="resizable">False</property> - <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> - <property name="skip_taskbar_hint">True</property> - <property name="skip_pager_hint">True</property> - <property name="urgency_hint">True</property> - <property name="has_separator">False</property> - <child internal-child="vbox"> - <widget class="GtkVBox" id="vbox15"> - <property name="visible">True</property> - <property name="spacing">12</property> - <child> - <widget class="GtkHBox" id="hbox16"> - <property name="visible">True</property> - <property name="border_width">6</property> - <property name="spacing">12</property> - <child> - <widget class="GtkImage" id="image13"> - <property name="visible">True</property> - <property name="xalign">0.000000</property> - <property name="yalign">0.000000</property> - <property name="stock">gtk-dialog-info</property> - <property name="icon_size">6</property> - </widget> - <packing> - <property name="expand">False</property> - </packing> - </child> - <child> - <widget class="GtkVBox" id="vbox16"> - <property name="visible">True</property> - <property name="spacing">12</property> - <child> - <widget class="GtkLabel" id="label_information"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="xalign">0.000000</property> - <property name="use_markup">True</property> - <property name="wrap">True</property> - <property name="selectable">True</property> - </widget> - <packing> - <property name="expand">False</property> - </packing> - </child> - <child> - <widget class="GtkScrolledWindow" id="scroll_information"> - <property name="width_request">400</property> - <property name="height_request">200</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> - <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> - <property name="shadow_type">GTK_SHADOW_IN</property> - <child> - <widget class="GtkTextView" id="textview_information"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="pixels_above_lines">4</property> - <property name="pixels_below_lines">4</property> - <property name="editable">False</property> - <property name="left_margin">4</property> - <property name="right_margin">4</property> - </widget> - </child> - </widget> - <packing> - <property name="position">1</property> - </packing> - </child> - </widget> - <packing> - <property name="position">1</property> - </packing> - </child> - </widget> - <packing> - <property name="position">1</property> - </packing> - </child> - <child internal-child="action_area"> - <widget class="GtkHButtonBox" id="hbuttonbox7"> - <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> - <child> - <widget class="GtkButton" id="button12"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="has_default">True</property> - <property name="label">gtk-close</property> - <property name="use_stock">True</property> - <property name="response_id">-5</property> - </widget> - </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="pack_type">GTK_PACK_END</property> - </packing> - </child> - </widget> - </child> - </widget> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">True</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + </child> +</widget> + +<widget class="GtkDialog" id="dialog_conffile"> + <property name="border_width">5</property> + <property name="title" translatable="yes"></property> + <property name="type">GTK_WINDOW_TOPLEVEL</property> + <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property> + <property name="modal">True</property> + <property name="resizable">False</property> + <property name="destroy_with_parent">False</property> + <property name="decorated">True</property> + <property name="skip_taskbar_hint">False</property> + <property name="skip_pager_hint">False</property> + <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> + <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> + <property name="focus_on_map">True</property> + <property name="urgency_hint">False</property> + <property name="has_separator">False</property> + + <child internal-child="vbox"> + <widget class="GtkVBox" id="vbox12"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">12</property> + + <child internal-child="action_area"> + <widget class="GtkHButtonBox" id="hbuttonbox6"> + <property name="visible">True</property> + <property name="layout_style">GTK_BUTTONBOX_END</property> + + <child> + <widget class="GtkButton" id="button9"> + <property name="visible">True</property> + <property name="can_default">True</property> + <property name="has_default">True</property> + <property name="can_focus">True</property> + <property name="has_focus">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="response_id">-9</property> + + <child> + <widget class="GtkAlignment" id="alignment2"> + <property name="visible">True</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xscale">0</property> + <property name="yscale">0</property> + <property name="top_padding">0</property> + <property name="bottom_padding">0</property> + <property name="left_padding">0</property> + <property name="right_padding">0</property> + + <child> + <widget class="GtkHBox" id="hbox13"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">2</property> + + <child> + <widget class="GtkImage" id="image10"> + <property name="visible">True</property> + <property name="stock">gtk-cancel</property> + <property name="icon_size">4</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label30"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Keep</property> + <property name="use_underline">True</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + </widget> + </child> + </widget> + </child> + </widget> + </child> + + <child> + <widget class="GtkButton" id="button10"> + <property name="visible">True</property> + <property name="can_default">True</property> + <property name="can_focus">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="response_id">-8</property> + + <child> + <widget class="GtkAlignment" id="alignment3"> + <property name="visible">True</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xscale">0</property> + <property name="yscale">0</property> + <property name="top_padding">0</property> + <property name="bottom_padding">0</property> + <property name="left_padding">0</property> + <property name="right_padding">0</property> + + <child> + <widget class="GtkHBox" id="hbox14"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">2</property> + + <child> + <widget class="GtkImage" id="image11"> + <property name="visible">True</property> + <property name="stock">gtk-ok</property> + <property name="icon_size">4</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label31"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Replace</property> + <property name="use_underline">True</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + </widget> + </child> + </widget> + </child> + </widget> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">GTK_PACK_END</property> + </packing> + </child> + + <child> + <widget class="GtkHBox" id="hbox15"> + <property name="border_width">6</property> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">12</property> + + <child> + <widget class="GtkImage" id="image12"> + <property name="visible">True</property> + <property name="stock">gtk-dialog-question</property> + <property name="icon_size">6</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkVBox" id="vbox13"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">12</property> + + <child> + <widget class="GtkLabel" id="label_conffile"> + <property name="visible">True</property> + <property name="label" translatable="yes"></property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">True</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkExpander" id="expander3"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="expanded">False</property> + <property name="spacing">0</property> + + <child> + <widget class="GtkVBox" id="vbox14"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child> + <widget class="GtkScrolledWindow" id="scrolledwindow5"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <property name="shadow_type">GTK_SHADOW_IN</property> + <property name="window_placement">GTK_CORNER_TOP_LEFT</property> + + <child> + <widget class="GtkTextView" id="textview_conffile"> + <property name="height_request">300</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="editable">False</property> + <property name="overwrite">False</property> + <property name="accepts_tab">True</property> + <property name="justification">GTK_JUSTIFY_LEFT</property> + <property name="wrap_mode">GTK_WRAP_NONE</property> + <property name="cursor_visible">False</property> + <property name="pixels_above_lines">0</property> + <property name="pixels_below_lines">0</property> + <property name="pixels_inside_wrap">0</property> + <property name="left_margin">0</property> + <property name="right_margin">0</property> + <property name="indent">0</property> + <property name="text" translatable="yes"></property> + </widget> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + </widget> + </child> + + <child> + <widget class="GtkLabel" id="label33"> + <property name="visible">True</property> + <property name="label" translatable="yes">Difference between the files</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="type">label_item</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + </child> +</widget> + +<widget class="GtkDialog" id="dialog_information"> + <property name="border_width">6</property> + <property name="title" translatable="yes"></property> + <property name="type">GTK_WINDOW_TOPLEVEL</property> + <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property> + <property name="modal">False</property> + <property name="resizable">False</property> + <property name="destroy_with_parent">False</property> + <property name="decorated">True</property> + <property name="skip_taskbar_hint">True</property> + <property name="skip_pager_hint">True</property> + <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> + <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> + <property name="focus_on_map">True</property> + <property name="urgency_hint">True</property> + <property name="has_separator">False</property> + + <child internal-child="vbox"> + <widget class="GtkVBox" id="vbox15"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">12</property> + + <child internal-child="action_area"> + <widget class="GtkHButtonBox" id="hbuttonbox7"> + <property name="visible">True</property> + <property name="layout_style">GTK_BUTTONBOX_END</property> + + <child> + <widget class="GtkButton" id="button12"> + <property name="visible">True</property> + <property name="can_default">True</property> + <property name="has_default">True</property> + <property name="can_focus">True</property> + <property name="label">gtk-close</property> + <property name="use_stock">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="response_id">-5</property> + </widget> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">GTK_PACK_END</property> + </packing> + </child> + + <child> + <widget class="GtkHBox" id="hbox16"> + <property name="border_width">6</property> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">12</property> + + <child> + <widget class="GtkImage" id="image13"> + <property name="visible">True</property> + <property name="stock">gtk-dialog-info</property> + <property name="icon_size">6</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkVBox" id="vbox16"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">12</property> + + <child> + <widget class="GtkLabel" id="label_information"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes"></property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">True</property> + <property name="selectable">True</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkScrolledWindow" id="scroll_information"> + <property name="width_request">400</property> + <property name="height_request">200</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <property name="shadow_type">GTK_SHADOW_IN</property> + <property name="window_placement">GTK_CORNER_TOP_LEFT</property> + + <child> + <widget class="GtkTextView" id="textview_information"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="editable">False</property> + <property name="overwrite">False</property> + <property name="accepts_tab">True</property> + <property name="justification">GTK_JUSTIFY_LEFT</property> + <property name="wrap_mode">GTK_WRAP_NONE</property> + <property name="cursor_visible">True</property> + <property name="pixels_above_lines">4</property> + <property name="pixels_below_lines">4</property> + <property name="pixels_inside_wrap">0</property> + <property name="left_margin">4</property> + <property name="right_margin">4</property> + <property name="indent">0</property> + <property name="text" translatable="yes"></property> + </widget> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + </child> +</widget> + </glade-interface> diff --git a/DistUpgrade/DistUpgradeCache.py b/DistUpgrade/DistUpgradeCache.py index 680e7d9e..8427bb3d 100644 --- a/DistUpgrade/DistUpgradeCache.py +++ b/DistUpgrade/DistUpgradeCache.py @@ -1,6 +1,7 @@ import warnings warnings.filterwarnings("ignore", "apt API not stable yet", FutureWarning) +warnings.filterwarnings("ignore", "apt API not stable yet", FutureWarning) import apt import apt_pkg import os @@ -66,10 +67,12 @@ class MyCache(apt.Cache): if pkg.markedDelete: self.to_remove.append(pkg.name) + def clear(self): + self._depcache.Init() + def restore_snapshot(self): """ restore a snapshot """ - for pkg in self: - pkg.markKeep() + self.clear() for name in self.to_remove: pkg = self[name] pkg.markDelete() @@ -155,7 +158,7 @@ class MyCache(apt.Cache): except SystemError, e: # FIXME: change the text to something more useful view.error(_("Could not calculate the upgrade"), - _("A unresolvable problem occured while " + _("A unresolvable problem occurred while " "calculating the upgrade.\n\n" "Please report this bug against the 'update-manager' " "package and include the files in /var/log/dist-upgrade/ " @@ -259,7 +262,7 @@ class MyCache(apt.Cache): "ubuntu-desktop, kubuntu-desktop or " "edubuntu-desktop package and it was not " "possible to detect which version of " - "ubuntu you are runing.\n " + "ubuntu you are running.\n " "Please install one of the packages " "above first using synaptic or " "apt-get before proceeding.")) @@ -315,3 +318,8 @@ class MyCache(apt.Cache): if foreign: foreign_pkgs.add(pkg.name) return foreign_pkgs + +if __name__ == "__main__": + import DistUpgradeConfigParser + c = MyCache(DistUpgradeConfigParser.DistUpgradeConfig(".")) + c.clear() diff --git a/DistUpgrade/DistUpgradeConfigParser.py b/DistUpgrade/DistUpgradeConfigParser.py index 6879dfda..d5391939 100644 --- a/DistUpgrade/DistUpgradeConfigParser.py +++ b/DistUpgrade/DistUpgradeConfigParser.py @@ -2,10 +2,10 @@ from ConfigParser import ConfigParser, NoOptionError class DistUpgradeConfig(ConfigParser): - def __init__(self, datadir): + def __init__(self, datadir, name="DistUpgrade.cfg"): ConfigParser.__init__(self) self.datadir=datadir - self.read([datadir+'/DistUpgrade.cfg']) + self.read([datadir+"/"+name]) def getlist(self, section, option): try: tmp = self.get(section, option) diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py index 02d25121..e32c0c5f 100644 --- a/DistUpgrade/DistUpgradeControler.py +++ b/DistUpgrade/DistUpgradeControler.py @@ -31,6 +31,7 @@ import logging import re import statvfs import shutil +import glob from DistUpgradeConfigParser import DistUpgradeConfig from aptsources import SourcesList, SourceEntry, Distribution, is_mirror @@ -86,7 +87,7 @@ class AptCdrom(object): class DistUpgradeControler(object): """ this is the controler that does most of the work """ - def __init__(self, distUpgradeView, cdromPath=None, datadir=None): + def __init__(self, distUpgradeView, options=None, datadir=None): # setup the pathes localedir = "/usr/share/locale/update-manager/" if datadir == None: @@ -95,6 +96,8 @@ class DistUpgradeControler(object): gladedir = datadir self.datadir = datadir + self.options = options + # init gettext gettext.bindtextdomain("update-manager",localedir) gettext.textdomain("update-manager") @@ -104,9 +107,15 @@ class DistUpgradeControler(object): self._view.updateStatus(_("Reading cache")) self.cache = None - # specific for the CDROM based upgrade - self.aptcdrom = AptCdrom(distUpgradeView, cdromPath) - self.useNetwork = True + if not self.options or self.options.withNetwork == None: + self.useNetwork = True + else: + self.useNetwork = self.options.withNetwork + if options: + cdrompath = options.cdromPath + else: + cdrompath = None + self.aptcdrom = AptCdrom(distUpgradeView, cdrompath) # the configuration self.config = DistUpgradeConfig(datadir) @@ -123,9 +132,8 @@ class DistUpgradeControler(object): # turn on debuging in the cache apt_pkg.Config.Set("Debug::pkgProblemResolver","true") apt_pkg.Config.Set("Debug::pkgDepCache::AutoInstall","true") - # FIXME: make this "append"? fd = os.open("/var/log/dist-upgrade/apt.log", - os.O_RDWR|os.O_CREAT|os.O_TRUNC, 0644) + os.O_RDWR|os.O_CREAT|os.O_APPEND, 0644) os.dup2(fd,1) os.dup2(fd,2) @@ -137,9 +145,9 @@ class DistUpgradeControler(object): self.openCache() if not self.cache.sanityCheck(self._view): return False - # FIXME: we may try to find out a bit more about the network connection here and ask more - # inteligent questions - if self.aptcdrom: + # FIXME: we may try to find out a bit more about the network + # connection here and ask more inteligent questions + if self.aptcdrom and self.options and self.options.withNetwork == None: res = self._view.askYesNoQuestion(_("Fetch data from the network for the upgrade?"), _("The upgrade can use the network to check " "the latest updates and to fetch packages that are not on the " @@ -270,7 +278,7 @@ class DistUpgradeControler(object): self.toDist+"-security", comps) else: self.abort() - + # write (well, backup first ;) ! self.sources.backup(self.sources_backup_ext) self.sources.save() @@ -293,7 +301,7 @@ class DistUpgradeControler(object): if self.sources_disabled: self._view.information(_("Third party sources disabled"), - _("Some third party entries in your souces.list " + _("Some third party entries in your sources.list " "were disabled. You can re-enable them " "after the upgrade with the " "'software-properties' tool or with synaptic." @@ -418,6 +426,9 @@ class DistUpgradeControler(object): return res def doDistUpgrade(self): + if self.options and self.options.haveBackports: + backportsdir = os.getcwd()+"/backports" + apt_pkg.Config.Set("Dir::Bin::dpkg",backportsdir+"/usr/bin/dpkg"); currentRetry = 0 fprogress = self._view.getFetchProgress() iprogress = self._view.getInstallProgress(self.cache) @@ -485,15 +496,15 @@ class DistUpgradeControler(object): demoted = [pkg.name for pkg in installed_demotions] demoted.sort() logging.debug("demoted: '%s'" % " ".join(demoted)) - self._view.information(_("Some software no longer officially " - "supported"), - _("These installed packages are " - "no longer officially supported, " - "and are now only " - "community-supported ('universe').\n\n" - "If you don't have 'universe' enabled " + self._view.information(_("Support for some applications ended"), + _("Canonical Ltd. no longer provides " + "support for the following software " + "packages. You can still get support " + "from the community.\n\n" + "If you havn't enabled community " + "maintained software (universe), " "these packages will be suggested for " - "removal in the next step. "), + "removal in the next step."), "\n".join(demoted)) # mark packages that are now obsolete (and where not obsolete @@ -540,23 +551,112 @@ class DistUpgradeControler(object): def abort(self): """ abort the upgrade, cleanup (as much as possible) """ - self.sources.restoreBackup(self.sources_backup_ext) - self.aptcdrom.restoreBackup(self.sources_backup_ext) + if hasattr(self, sources): + self.sources.restoreBackup(self.sources_backup_ext) + if hasattr(self, aptcdrom): + self.aptcdrom.restoreBackup(self.sources_backup_ext) # generate a new cache self._view.updateStatus(_("Restoring original system state")) + self._view.abort() self.openCache() sys.exit(1) + def getRequiredBackports(self): + " download the backports specified in DistUpgrade.cfg " + # add the backports sources.list fragment + shutil.copy(self.config.get("Backports","SourcesList"), + apt_pkg.Config.FindDir("Dir::Etc::sourceparts")) + # run update + self.doUpdate() + self.openCache() + + # save cachedir and setup new one + cachedir = apt_pkg.Config.Find("Dir::Cache::archives") + cwd = os.getcwd() + backportsdir = os.path.join(os.getcwd(),"backports") + if not os.path.exists(backportsdir): + os.mkdir(backportsdir) + if not os.path.exists(os.path.join(backportsdir,"partial")): + os.mkdir(os.path.join(backportsdir,"partial")) + os.chdir(backportsdir) + apt_pkg.Config.Set("Dir::Cache::archives",backportsdir) + + # mark the backports for upgrade and get them + fetcher = apt_pkg.GetAcquire(self._view.getFetchProgress()) + # FIXME: add a version line to the cfg file to make sure + # we get the right version file! and add sanity checking + # that we don't get (accidently) the edgy version + for pkgname in self.config.getlist("Backports","Packages"): + pkg = self.cache[pkgname] + # look for the right version (backport) + for ver in pkg._pkg.VersionList: + print ver.VerStr + if self.config.get("Backports","VersionIdent") in ver.VerStr: + break + else: + # FIXME: be more clever here (exception) + raise Exception, "No backport found!?!" + return False + if ver.FileList == None: + print "No FileList for: %s " % self._pkg.Name() + return False + f, index = ver.FileList.pop(0) + pkg._records.Lookup((f,index)) + path = apt_pkg.ParseSection(pkg._records.Record)["Filename"] + for (packagefile,i) in ver.FileList: + indexfile = self.cache._list.FindIndex(packagefile) + if indexfile: + match = re.match(r"<.*ArchiveURI='(.*)'>$", + str(indexfile)) + if match: + uri = match.group(1) + path + apt_pkg.GetPkgAcqFile(fetcher, uri=uri, + size=ver.Size, + descr=_("Fetching backport of '%s'" % pkgname)) + res = fetcher.Run() + if res != fetcher.ResultContinue: + # ick! error ... + return False + + # reset the cache dir + os.unlink(apt_pkg.Config.FindDir("Dir::Etc::sourceparts")+"/backport-source.list") + apt_pkg.Config.Set("Dir::Cache::archives",cachedir) + os.chdir(cwd) + return self.setupRequiredBackports(backportsdir) + + def setupRequiredBackports(self, backportsdir): + " setup the required backports in a evil way " + # unpack it + for deb in glob.glob(backportsdir+"/*.deb"): + ret = os.system("dpkg-deb -x %s %s" % (deb, backportsdir)) + # FIXME: do error checking + # setup some pathes to make sure the new stuff is used + os.environ["LD_LIBRARY_PATH"] = backportsdir+"/usr/lib" + os.environ["PYTHONPATH"] = backportsdir+"/usr/lib/python2.4/site-packages/" + os.environ["PATH"] = "%s:%s" % (backportsdir+"/usr/bin", + os.getenv("PATH")) + + # now exec self again + args = sys.argv+["--have-backports"] + if self.useNetwork: + args.append("--with-network") + else: + args.append("--without-network") + os.execve(sys.argv[0],args, os.environ) # this is the core def edgyUpgrade(self): # sanity check (check for ubuntu-desktop, brokenCache etc) self._view.updateStatus(_("Checking package manager")) self._view.setStep(1) - + if not self.prepare(): self.abort(1) + if self.options and self.options.haveBackports == False: + # get backported packages (if needed) + self.getRequiredBackports() + # run a "apt-get update" now if not self.doUpdate(): sys.exit(1) diff --git a/DistUpgrade/DistUpgradeView.py b/DistUpgrade/DistUpgradeView.py index 9fda83d4..a9cd16d7 100644 --- a/DistUpgrade/DistUpgradeView.py +++ b/DistUpgrade/DistUpgradeView.py @@ -43,6 +43,7 @@ def estimatedDownloadTime(requiredDownload): class DumbTerminal(object): def call(self, cmd): " expects a command in the subprocess style (as a list) " + import subprocess subprocess.call(cmd) @@ -72,6 +73,9 @@ class DistUpgradeView(object): on the current view """ pass + def abort(): + """ provide a visual feedback that the upgrade was aborted """ + pass def setStep(self, step): """ we have 5 steps current for a upgrade: 1. Analyzing the system diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py index 73440f3e..1385d18f 100644 --- a/DistUpgrade/DistUpgradeViewGtk.py +++ b/DistUpgrade/DistUpgradeViewGtk.py @@ -199,13 +199,10 @@ class GtkInstallProgressAdapter(InstallProgress): def conffile(self, current, new): logging.debug("got a conffile-prompt from dpkg for file: '%s'" % current) #self.expander.set_expanded(True) - prim = _("Replace configuration file\n'%s'?" % current) - sec = ("The configuration file %s was modified (by " - "you or by a script). An updated version is shipped " - "in this package. If you want to keep your current " - "version say 'Keep'. Do you want to replace the " - "current file and install the new package " - "maintainers version? " % current) + prim = _("Replace the customized configuration file\n'%s'?") % current + sec = _("You will loose all customizations, that have been made by " + "yourself or by a script, if you replace the file by its " + "latest version.") markup = "<span weight=\"bold\" size=\"larger\">%s </span> \n\n%s" % (prim, sec) self.parent.label_conffile.set_markup(markup) self.parent.dialog_conffile.set_transient_for(self.parent.window_main) @@ -322,6 +319,7 @@ class DistUpgradeViewGtk(DistUpgradeView,SimpleGladeApp): gtk.window_set_default_icon(icons.load_icon("update-manager", 32, 0)) SimpleGladeApp.__init__(self, gladedir+"/DistUpgrade.glade", None, domain="update-manager") + self.last_step = 0 # keep a record of the latest step # we dont use this currently #self.window_main.set_keep_above(True) self.window_main.realize() @@ -410,21 +408,35 @@ class DistUpgradeViewGtk(DistUpgradeView,SimpleGladeApp): label = getattr(self,"label_step%i" % step) image.hide() label.hide() + def abort(self): + size = gtk.ICON_SIZE_MENU + step = self.last_step + if step > 0: + image = getattr(self,"image_step%i" % step) + arrow = getattr(self,"arrow_step%i" % step) + image.set_from_stock(gtk.STOCK_CANCEL, size) + image.show() + arrow.hide() def setStep(self, step): # first update the "last" step as completed size = gtk.ICON_SIZE_MENU attrlist=pango.AttrList() - if step > 1: - image = getattr(self,"image_step%i" % (step-1)) - label = getattr(self,"label_step%i" % (step-1)) - image.set_from_stock(gtk.STOCK_APPLY, size) + if self.last_step: + image = getattr(self,"image_step%i" % self.last_step) + label = getattr(self,"label_step%i" % self.last_step) + arrow = getattr(self,"arrow_step%i" % self.last_step) label.set_property("attributes",attrlist) + image.set_from_stock(gtk.STOCK_APPLY, size) + image.show() + arrow.hide() + self.last_step = step + # show the an arrow for the current step and make the label bold image = getattr(self,"image_step%i" % step) label = getattr(self,"label_step%i" % step) - image.set_from_stock(gtk.STOCK_YES, size) + arrow = getattr(self,"arrow_step%i" % step) + arrow.show() + image.hide() attr = pango.AttrWeight(pango.WEIGHT_BOLD, 0, -1) - # we can't make it bold here without layout changes in the view :( - #attr = pango.AttrStyle(pango.STYLE_ITALIC, 0, -1) attrlist.insert(attr) label.set_property("attributes",attrlist) @@ -472,19 +484,19 @@ class DistUpgradeViewGtk(DistUpgradeView,SimpleGladeApp): if pkgs_remove > 0: # FIXME: make those two seperate lines to make it clear # that the "%" applies to the result of ngettext - msg += gettext.ngettext("%s package is going to be removed.", - "%s packages are going to be removed.", + msg += gettext.ngettext("%d package is going to be removed.", + "%d packages are going to be removed.", pkgs_remove) % pkgs_remove msg += " " if pkgs_inst > 0: - msg += gettext.ngettext("%s new package is going to be " + msg += gettext.ngettext("%d new package is going to be " "installed.", - "%s new packages are going to be " + "%d new packages are going to be " "installed.",pkgs_inst) % pkgs_inst msg += " " if pkgs_upgrade > 0: - msg += gettext.ngettext("%s package is going to be upgraded.", - "%s packages are going to be upgraded.", + msg += gettext.ngettext("%d package is going to be upgraded.", + "%d packages are going to be upgraded.", pkgs_upgrade) % pkgs_upgrade msg +=" " if downloadSize > 0: @@ -503,8 +515,9 @@ class DistUpgradeViewGtk(DistUpgradeView,SimpleGladeApp): # Show an error if no actions are planned if (pkgs_upgrade + pkgs_inst + pkgs_remove) < 1: # FIXME: this should go into DistUpgradeController - summary = _("Could not find any upgrades") - msg = _("Your system has already been upgraded.") + summary = _("Your system is up-to-date") + msg = _("There are no upgrades available for your system. " + "The upgrade will now be canceled.") self.error(summary, msg) return False diff --git a/DistUpgrade/README b/DistUpgrade/README index 60c761d6..c38a422f 100644 --- a/DistUpgrade/README +++ b/DistUpgrade/README @@ -46,4 +46,11 @@ ForcedObsoletes: [Sources] - how to rewrite the sources.list -[Network] - network specific options
\ No newline at end of file +[Network] - network specific options + +[Backports] - use specific packages for dist-upgrade +Packages= List of what packages to look for +VersionIdent=Version identification. needs to be uniq, dist-upgrader will + fetch the version that contains this string +SourcesList=a sources.list fragment that will be placed into + /etc/apt/sources.list.d and that contains the backported pkgs
\ No newline at end of file diff --git a/DistUpgrade/backport-source.list b/DistUpgrade/backport-source.list new file mode 100644 index 00000000..5945e218 --- /dev/null +++ b/DistUpgrade/backport-source.list @@ -0,0 +1,2 @@ +# sources.list fragment for backported apt/dpkg/python-apt +deb http://people.ubuntu.com/~mvo/backports/dapper /
\ No newline at end of file diff --git a/DistUpgrade/build-tarball.sh b/DistUpgrade/build-tarball.sh index 4f88b848..df9d6506 100755 --- a/DistUpgrade/build-tarball.sh +++ b/DistUpgrade/build-tarball.sh @@ -3,7 +3,10 @@ DIST=edgy # cleanup +echo "Cleaning up" rm -f *~ *.bak *.pyc *.moved '#'* +sudo rm -rf backports/ profile/ result/ tarball/ *.deb + # update po (cd ../po; make update-po) diff --git a/DistUpgrade/dist-upgrade.py b/DistUpgrade/dist-upgrade.py index 07320fb9..ff2fb933 100755 --- a/DistUpgrade/dist-upgrade.py +++ b/DistUpgrade/dist-upgrade.py @@ -12,6 +12,10 @@ if __name__ == "__main__": parser = OptionParser() parser.add_option("-c", "--cdrom", dest="cdromPath", default=None, help="Use the given path to search for a cdrom with upgradable packages") + parser.add_option("--have-backports", dest="haveBackports", + action="store_true", default=False) + parser.add_option("--with-network", dest="withNetwork",action="store_true") + parser.add_option("--without-network", dest="withNetwork",action="store_false") (options, args) = parser.parse_args() if not os.path.exists("/var/log/dist-upgrade"): @@ -31,7 +35,7 @@ if __name__ == "__main__": logging.error("can't import view '%s'" % requested_view) print "can't find %s" % requested_view sys.exit(1) - app = DistUpgradeControler(view, cdromPath=options.cdromPath) + app = DistUpgradeControler(view, options) app.run() diff --git a/SoftwareProperties/SoftwareProperties.py b/SoftwareProperties/SoftwareProperties.py index a18fec20..1c8a3425 100644 --- a/SoftwareProperties/SoftwareProperties.py +++ b/SoftwareProperties/SoftwareProperties.py @@ -261,7 +261,7 @@ class SoftwareProperties(SimpleGladeApp): # TRANSLATORS: Label for the components in the Internet section # first %s is the description of the component # second %s is the code name of the comp, eg main, universe - label = _("%s (%s)") % (self.distro.source_template.components[comp][2], + label = _("%s (%s)") % (self.distro.source_template.components[comp][1], comp) checkbox = gtk.CheckButton(label) # check if the comp is enabled @@ -721,7 +721,7 @@ class SoftwareProperties(SimpleGladeApp): for comp in source.comps: if source.template.components.has_key(comp): print source.template.components[comp] - (desc, enabled, desc_long) = source.template.components[comp] + (desc, desc_long) = source.template.components[comp] contents += "\n%s" % desc else: contents += "\n%s" % comp @@ -1033,7 +1033,7 @@ class SoftwareProperties(SimpleGladeApp): type=gtk.MESSAGE_ERROR, buttons=gtk.BUTTONS_OK, message_format=None) - dialog.set_markup(_("<big><b>Error scaning the CD</b></big>\n\n%s"%msg)) + dialog.set_markup(_("<big><b>Error scanning the CD</b></big>\n\n%s"%msg)) res = dialog.run() dialog.destroy() return diff --git a/UpdateManager/Common/DistInfo.py b/UpdateManager/Common/DistInfo.py index 81f08200..8153f04b 100644 --- a/UpdateManager/Common/DistInfo.py +++ b/UpdateManager/Common/DistInfo.py @@ -48,7 +48,6 @@ class Component: self.name = "" self.description = "" self.description_long = "" - self.enabled = None class DistInfo: def __init__(self, @@ -85,7 +84,7 @@ class DistInfo: if suite: if component: suite.components["%s" % component.name] = \ - (component.description, component.enabled, + (component.description, component.description_long) component = None self.suites.append (suite) @@ -100,6 +99,13 @@ class DistInfo: for nanny in self.suites: if nanny.name == value: nanny.children.append(suite) + # reuse some properties of the parent suite + if suite.match_uri == None: + suite.match_uri = nanny.match_uri + if suite.valid_mirrors == None: + suite.valid_mirrors = nanny.valid_mirrors + if suite.base_uri == None: + suite.base_uri = nanny.base_uri elif field == 'Available': suite.available = value elif field == 'RepositoryType': @@ -110,22 +116,23 @@ class DistInfo: elif field == 'MatchURI': suite.match_uri = value elif field == 'MirrorsFile': - suite.valid_mirrors = filter(lambda s: - ((s != "") and - (not s.startswith("#"))), - map(string.strip, - open(value))) + if os.path.exists(value): + suite.valid_mirrors = filter(lambda s: + ((s != "") and + (not s.startswith("#"))), + map(string.strip, + open(value))) + else: + print "WARNING: can't read '%s'" % value elif field == 'Description': suite.description = _(value) elif field == 'Component': if component: suite.components["%s" % component.name] = \ - (component.description, component.enabled, + (component.description, component.description_long) component = Component () component.name = value - elif field == 'Enabled': - component.enabled = bool(int(value)) elif field == 'CompDescription': component.description = _(value) elif field == 'CompDescriptionLong': @@ -133,7 +140,7 @@ class DistInfo: if suite: if component: suite.components["%s" % component.name] = \ - (component.description, component.enabled, + (component.description, component.description_long) component = None self.suites.append (suite) @@ -152,7 +159,6 @@ if __name__ == "__main__": for component in suite.components: print " %s - %s - %s - %s" % (component, suite.components[component][0], - suite.components[component][1], - suite.components[component][2]) + suite.components[component][1]) for child in suite.children: print " %s" % child.description diff --git a/UpdateManager/Common/aptsources.py b/UpdateManager/Common/aptsources.py index bc6886d9..836b8fae 100644 --- a/UpdateManager/Common/aptsources.py +++ b/UpdateManager/Common/aptsources.py @@ -87,7 +87,6 @@ class SourceEntry: file = apt_pkg.Config.FindDir("Dir::Etc")+apt_pkg.Config.Find("Dir::Etc::sourcelist") self.file = file # the file that the entry is located in self.parse(line) - # FIXME: this name is really misleading and already overloaded self.template = None # type DistInfo.Suite self.children = [] @@ -373,56 +372,6 @@ class SourcesList: #print self.parents return (parents, used_child_templates) -# templates for the add dialog -class SourceEntryTemplate(SourceEntry): - def __init__(self,a_type,uri,dist,description,comps): - self.comps_descriptions = [] - self.type = a_type - self.uri = uri - self.dist = dist - self.description = description - self.comps = comps - - def matches(self,source_entry): - """ check if a given source_entry matches this one """ - if (self.type != source_entry.type): - return False - if (self.dist != source_entry.dist): - return False - if not is_mirror(self.uri,source_entry.uri): - return False - for e_comp in source_entry.comps: - for t_comp in self.comps: - if e_comp == t_comp.name: break - else: - return False - return True - -class SourceCompTemplate: - def __init__(self, name, description, on_by_default): - self.name = name - self.description = description - self.on_by_default = on_by_default - -class SourceEntryTemplates: - - def __init__(self,datadir): - _ = gettext.gettext - self.templates = [] - - dinfo = DistInfo (base_dir=datadir+"channels/") - - for suite in dinfo.suites: - comps = [] - for comp in suite.components: - comps.append(SourceCompTemplate(comp.name, _(comp.description), - comp.enabled)) - self.templates.append (SourceEntryTemplate(suite.repository_type, - suite.base_uri, - suite.name, - suite.description, - comps)) - # matcher class to make a source entry look nice # lots of predefined matchers to make it i18n/gettext friendly class SourceEntryMatcher: @@ -447,7 +396,7 @@ class SourceEntryMatcher: f = os.path.basename(f) i = f.find(".info") f = f[0:i] - dist = DistInfo(f) + dist = DistInfo(f,base_dir=matcherPath) for suite in dist.suites: if suite.match_uri != None: self.templates.append(suite) diff --git a/UpdateManager/DistUpgradeFetcher.py b/UpdateManager/DistUpgradeFetcher.py index af07cfb4..cda27e2f 100644 --- a/UpdateManager/DistUpgradeFetcher.py +++ b/UpdateManager/DistUpgradeFetcher.py @@ -219,7 +219,7 @@ class DistUpgradeFetcher(object): if not self.verifyDistUprader(): error(self.window_main, _("Verfication failed"), - _("Verfing the upgrade failed. There may be a problem " + _("Verifying the upgrade failed. There may be a problem " "with the network or with the server. ")) self.cleanup() return diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py index 343dcd85..63d0eab9 100644 --- a/UpdateManager/UpdateManager.py +++ b/UpdateManager/UpdateManager.py @@ -33,8 +33,11 @@ try: except: import fakegconf as gconf import gobject +import warnings +warnings.filterwarnings("ignore", "apt API not stable yet", FutureWarning) import apt import apt_pkg + import gettext import copy import string @@ -120,7 +123,7 @@ class MyCache(apt.Cache): # don't touch the gui in this function, it needs to be thread-safe pkg = self[name] - # get the src package name + # get the src package name srcpkg = pkg.sourcePackageName # assume "main" section @@ -130,6 +133,7 @@ class MyCache(apt.Cache): # get the source version, start with the binaries version binver = pkg.candidateVersion + srcver = pkg.candidateVersion #print "bin: %s" % binver try: # try to get the source version of the pkg, this differs @@ -146,6 +150,9 @@ class MyCache(apt.Cache): #print "srcver: %s" % srcver section = srcrecords.Section #print "srcsect: %s" % section + else: + # fail into the error handler + raise SystemError except SystemError, e: srcver = binver @@ -219,38 +226,40 @@ class UpdateList: self.importance = importance self.description = desc - def __init__(self, parent_window): + def __init__(self): # a map of packages under their origin pipe = os.popen("lsb_release -c -s") dist = pipe.read().strip() del pipe - templates = [("%s-security" % dist, "Ubuntu", _("Important security updates" - " of Ubuntu"), 10), - ("%s-updates" % dist, "Ubuntu", _("Recommended updates of " - "Ubuntu"), 9), - ("%s-proposed" % dist, "Ubuntu", _("Proposed updates for Ubuntu"), 8), - ("%s-backports" % dist, "Ubuntu", _("Backports of Ubuntu"), 7), - (dist, "Ubuntu", _("Updates of Ubuntu"), 6)] + templates = [("%s-security" % dist, "Ubuntu", _("Important security updates") + , 10), + ("%s-updates" % dist, "Ubuntu", _("Recommended updates"), 9), + ("%s-proposed" % dist, "Ubuntu", _("Proposed updates"), 8), + ("%s-backports" % dist, "Ubuntu", _("Backports"), 7), + (dist, "Ubuntu", _("Normal updates"), 6)] self.pkgs = {} self.matcher = {} self.num_updates = 0 - self.parent_window = parent_window for (origin, archive, desc, importance) in templates: self.matcher[(origin, archive)] = self.UpdateOrigin(desc, importance) self.unknown_origin = self.UpdateOrigin(_("Other updates"), -1) def update(self, cache): - held_back = [] - broken = [] + self.held_back = [] # do the upgrade cache.saveDistUpgrade() # sort by origin for pkg in cache: - if pkg.markedUpgrade or pkg.markedInstall: + if pkg.isUpgradable: + if pkg.candidateOrigin == None: + # can happen for e.g. loged packages + # FIXME: do something more sensible here (but what?) + print "WARNING: upgradable but no canidateOrigin?!?: ", pkg.name + continue # TRANSLATORS: updates from an 'unknown' origin originstr = _("Other updates") for aorigin in pkg.candidateOrigin: @@ -264,38 +273,11 @@ class UpdateList: self.pkgs[origin_node] = [] self.pkgs[origin_node].append(pkg) self.num_updates = self.num_updates + 1 - elif pkg.isUpgradable: - held_back.append(pkg.name) + if pkg.isUpgradable and not (pkg.markedUpgrade or pkg.markedInstall): + self.held_back.append(pkg.name) for l in self.pkgs.keys(): self.pkgs[l].sort(lambda x,y: cmp(x.name,y.name)) - - # check if we have held-back something - if cache._depcache.KeepCount > 0: - keepcount = cache._depcache.KeepCount - msg = ("<big><b>%s</b></big>\n\n%s" % \ - (_("Cannot install all available updates"), - _("Some of the updates require more extensive changes " - "than expected.\n\n" - "This usually means that you have enabled unoffical " - "repositories, that it is not " - "fully upgraded from the last distribution release or " - "that you run a development release " - "of the distribution.\n\n" - "Would you like to perform a full distribution upgrade " - "now?"))) - dialog = gtk.MessageDialog(self.parent_window, 0, - gtk.MESSAGE_QUESTION, - gtk.BUTTONS_YES_NO,"") - dialog.set_default_response(gtk.RESPONSE_NO) - dialog.set_markup(msg) - dialog.set_title("") - dialog.vbox.set_spacing(6) - res = dialog.run() - if res == gtk.RESPONSE_YES: - os.execl("/usr/bin/gksu", - "/usr/bin/gksu", - "/usr/bin/update-manager --dist-upgrade") - dialog.destroy() + self.keepcount = cache._depcache.KeepCount class UpdateManagerDbusControler(dbus.service.Object): @@ -419,7 +401,11 @@ class UpdateManager(SimpleGladeApp): return to_install = pkg.markedInstall or pkg.markedUpgrade renderer.set_property("active", to_install) - + if pkg.name in self.list.held_back: + renderer.set_property("activatable", False) + else: + renderer.set_property("activatable", True) + def package_column_view_func(self, cell_layout, renderer, model, iter): self.header_column_func(cell_layout, renderer, model, iter) @@ -532,8 +518,11 @@ class UpdateManager(SimpleGladeApp): lock = thread.allocate_lock() lock.acquire() t=thread.start_new_thread(self.cache.get_changelog,(name,lock)) - changes_buffer.set_text(_("Downloading the list of changes...")) - button = self.button_cancel_dl_changelog + changes_buffer.set_text("%s\n" % _("Downloading list of changes...")) + iter = changes_buffer.get_iter_at_line(1) + anchor = changes_buffer.create_child_anchor(iter) + button = gtk.Button(stock="gtk-cancel") + self.textview_changes.add_child_at_anchor(button, anchor) button.show() id = button.connect("clicked", lambda w,lock: lock.release(), lock) @@ -556,13 +545,13 @@ class UpdateManager(SimpleGladeApp): """ if event.type == gtk.gdk.BUTTON_PRESS and event.button == 3: menu = gtk.Menu() - item_select_none = gtk.MenuItem(_("Select _None")) + item_select_none = gtk.MenuItem(_("_Uncheck All")) item_select_none.connect("activate", self.select_none_updgrades) menu.add(item_select_none) num_updates = self.cache.installCount if num_updates == 0: item_select_none.set_property("sensitive", False) - item_select_all = gtk.MenuItem(_("Select _All")) + item_select_all = gtk.MenuItem(_("_Check All")) item_select_all.connect("activate", self.select_all_updgrades) menu.add(item_select_all) menu.popup(None, None, None, 0, event.time) @@ -668,7 +657,7 @@ class UpdateManager(SimpleGladeApp): apt_pkg.PkgSystemUnLock() except SystemError: pass - cmd = ["gksu", "--desktop", "/usr/share/applications/synaptic.desktop", + cmd = ["gksu", "--desktop", "/usr/share/applications/update-manager.desktop", "--", "/usr/sbin/synaptic", "--hide-main-window", "--non-interactive", "--parent-window-id", "%s" % (id) ] if action == INSTALL: @@ -726,6 +715,7 @@ class UpdateManager(SimpleGladeApp): time.sleep(0.05) while gtk.events_pending(): gtk.main_iteration() + self.label_cache_progress_title.set_label("<b><big>%s</big></b>" % _("Checking for updates")) self.fillstore() # Allow suspend after synaptic is finished @@ -734,6 +724,7 @@ class UpdateManager(SimpleGladeApp): self.window_main.set_sensitive(True) self.window_main.window.set_cursor(None) + def inhibit_sleep(self): """Send a dbus signal to gnome-power-manager to not suspend the system""" @@ -755,9 +746,13 @@ class UpdateManager(SimpleGladeApp): def toggled(self, renderer, path): """ a toggle button in the listview was toggled """ - self.setBusy(True) iter = self.store.get_iter(path) pkg = self.store.get_value(iter, LIST_PKG) + # make sure that we don't allow to toggle deactivated updates + # this is needed for the call by the row activation callback + if pkg.name in self.list.held_back: + return False + self.setBusy(True) # update the cache if pkg.markedInstall or pkg.markedUpgrade: pkg.markKeep() @@ -809,9 +804,9 @@ class UpdateManager(SimpleGladeApp): # clean most objects self.dl_size = 0 - self.store.clear() self.initCache() - self.list = UpdateList(self.window_main) + self.store.clear() + self.list = UpdateList() # fill them again self.list.update(self.cache) @@ -839,6 +834,7 @@ class UpdateManager(SimpleGladeApp): self.store.append([contents, pkg.name, pkg]) self.update_count() self.setBusy(False) + self.check_all_updates_installable() return False def dist_no_longer_supported(self, meta_release): @@ -929,6 +925,18 @@ class UpdateManager(SimpleGladeApp): if res == gtk.RESPONSE_YES: self.on_button_reload_clicked(None) + def check_all_updates_installable(self): + """ Check if all available updates can be installed and suggest + to run a distribution upgrade if not """ + if self.list.keepcount > 0: + self.dialog_dist_upgrade.set_transient_for(self.window_main) + res = self.dialog_dist_upgrade.run() + self.dialog_dist_upgrade.hide() + if res == gtk.RESPONSE_YES: + os.execl("/usr/bin/gksu", + "/usr/bin/gksu", "--desktop", + "/usr/share/applications/update-manager.desktop", + "--", "/usr/bin/update-manager", "--dist-upgrade") def main(self, options): gconfclient = gconf.client_get_default() diff --git a/data/channels/README.channels b/data/channels/README.channels index 6bc76872..414148ed 100644 --- a/data/channels/README.channels +++ b/data/channels/README.channels @@ -37,11 +37,10 @@ Description: description of the suite. the translation is done through Component: a component/section of the suite (ignored if ParentSuite is set) -Enabled: activate the component by default (ignored if ParentSuite is - set) - CompDescription: humand readable description of the component/section (ignored if ParentSuite is set). the translation is done through gettext at runtime +ValidMirros: A file that contains a list of mirrors + diff --git a/data/channels/Ubuntu.info b/data/channels/Ubuntu.info index 93ec83d2..4588a9b1 100644 --- a/data/channels/Ubuntu.info +++ b/data/channels/Ubuntu.info @@ -7,19 +7,15 @@ MatchURI: archive.ubuntu.com/ubuntu MirrorsFile: /usr/share/update-manager/mirrors.cfg Description: Ubuntu 6.10 'Edgy Eft' Component: main -Enabled: 1 CompDescription: Officially supported CompDescriptionLong: By Canonical supported Open Source software Component: universe -Enabled: 0 CompDescription: Community maintained CompDescriptionLong: Community maintained Open Source software Component: restricted -Enabled: 1 CompDescription: Non-free drivers CompDescriptionLong: Proprietary drivers for devices Component: multiverse -Enabled: 0 CompDescription: Restricted software CompDescriptionLong: By copyright or legal issues restricted software @@ -29,10 +25,8 @@ BaseURI: cdrom:\[Ubuntu.*6.10 Description: Cdrom with Ubuntu 6.10 'Edgy Eft' Available: False Component: main -Enabled: 1 CompDescription: Oficially supported Component: restricted -Enabled: 1 CompDescription: Restricted copyright Suite: edgy-security @@ -45,22 +39,16 @@ Description: Important security updates Suite: edgy-updates ParentSuite: edgy RepositoryType: deb -BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu Description: Recommended updates Suite: edgy-proposed ParentSuite: edgy RepositoryType: deb -BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu Description: Proposed updates Suite: edgy-backports ParentSuite: edgy RepositoryType: deb -BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu Description: Backported updates Suite: dapper @@ -70,19 +58,15 @@ MatchURI: archive.ubuntu.com/ubuntu MirrorsFile: /usr/share/update-manager/mirrors.cfg Description: Ubuntu 6.06 LTS 'Dapper Drake' Component: main -Enabled: 1 CompDescription: Officially supported CompDescriptionLong: By Canonical supported Open Source software Component: universe -Enabled: 0 CompDescription: Community maintained (universe) CompDescriptionLong: Community maintained Open Source software Component: restricted -Enabled: 1 CompDescription: Non-free drivers CompDescriptionLong: Proprietary drivers for devices Component: multiverse -Enabled: 0 CompDescription: Restricted software (Multiverse) CompDescriptionLong: By copyright or legal issues restricted software @@ -92,10 +76,8 @@ BaseURI: cdrom:\[Ubuntu.*6.06 Description: Cdrom with Ubuntu 6.06 LTS 'Dapper Drake' Available: False Component: main -Enabled: 1 CompDescription: Oficially supported Component: restricted -Enabled: 1 CompDescription: Restricted copyright Suite: dapper-security @@ -108,22 +90,16 @@ Description: Important security updates Suite: dapper-updates ParentSuite: dapper RepositoryType: deb -BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu Description: Recommended updates Suite: dapper-proposed ParentSuite: dapper RepositoryType: deb -BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu Description: Proposed updates Suite: dapper-backports ParentSuite: dapper RepositoryType: deb -BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu Description: Backported updates Suite: breezy @@ -133,16 +109,12 @@ MatchURI: archive.ubuntu.com/ubuntu MirrorsFile: /usr/share/update-manager/mirrors.cfg Description: Ubuntu 5.10 'Breezy Badger' Component: main -Enabled: 1 CompDescription: Officially supported Component: restricted -Enabled: 1 CompDescription: Restricted copyright Component: universe -Enabled: 0 CompDescription: Community maintained (Universe) Component: multiverse -Enabled: 0 CompDescription: Non-free (Multiverse) Suite: breezy @@ -151,10 +123,8 @@ BaseURI: cdrom:\[Ubuntu.*5.10 Description: Cdrom with Ubuntu 5.10 'Breezy Badger' Available: False Component: main -Enabled: 1 CompDescription: Oficially supported Component: restricted -Enabled: 1 CompDescription: Restricted copyright Suite: breezy-security @@ -167,15 +137,11 @@ Description: Ubuntu 5.10 Security Updates Suite: breezy-updates ParentSuite: breezy RepositoryType: deb -BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu Description: Ubuntu 5.10 Updates Suite: breezy-backports ParentSuite: breezy RepositoryType: deb -BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu Description: Ubuntu 5.10 Backports Suite: hoary @@ -185,16 +151,12 @@ MatchURI: archive.ubuntu.com/ubuntu MirrorsFile: /usr/share/update-manager/mirrors.cfg Description: Ubuntu 5.04 'Hoary Hedgehog' Component: main -Enabled: 1 CompDescription: Oficially supported Component: restricted -Enabled: 1 CompDescription: Restricted copyright Component: universe -Enabled: 0 CompDescription: Community maintained (Universe) Component: multiverse -Enabled: 0 CompDescription: Non-free (Multiverse) Suite: hoary @@ -203,10 +165,8 @@ BaseURI: cdrom:\[Ubuntu.*5.04 Description: Cdrom with Ubuntu 5.04 'Hoary Hedgehog' Available: False Component: main -Enabled: 1 CompDescription: Oficially supported Component: restricted -Enabled: 1 CompDescription: Restricted copyright Suite: hoary-security @@ -219,15 +179,11 @@ Description: Ubuntu 5.04 Security Updates Suite: hoary-updates ParentSuite: hoary RepositoryType: deb -BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu Description: Ubuntu 5.04 Updates Suite: hoary-backports ParentSuite: hoary RepositoryType: deb -BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu Description: Ubuntu 5.04 Backports Suite: warty @@ -236,16 +192,12 @@ BaseURI: http://archive.ubuntu.com/ubuntu/ MatchURI: archive.ubuntu.com/ubuntu Description: Ubuntu 4.10 'Warty Warthog' Component: main -Enabled: 1 CompDescription: No longer oficially supported Component: restricted -Enabled: 1 CompDescription: Restricted copyright Component: universe -Enabled: 0 CompDescription: Community maintained (Universe) Component: multiverse -Enabled: 0 CompDescription: Non-free (Multiverse) Suite: warty @@ -254,29 +206,23 @@ BaseURI: cdrom:\[Ubuntu.*4.10 Description: Cdrom with Ubuntu 4.10 'Warty Warthog' Available: False Component: main -Enabled: 1 CompDescription: No longer oficially supported Component: restricted -Enabled: 1 CompDescription: Restricted copyright Suite: warty-security ParentSuite: warty RepositoryType: deb BaseURI: http://security.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.comubuntu/|security.ubuntu.com +MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com Description: Ubuntu 4.10 Security Updates Suite: warty-updates ParentSuite: warty RepositoryType: deb -BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu Description: Ubuntu 4.10 Updates Suite: warty-backports ParentSuite: warty RepositoryType: deb -BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu Description: Ubuntu 4.10 Backports diff --git a/data/channels/Ubuntu.info.in b/data/channels/Ubuntu.info.in index 2b20cf8f..1afc66c9 100644 --- a/data/channels/Ubuntu.info.in +++ b/data/channels/Ubuntu.info.in @@ -7,19 +7,15 @@ MatchURI: archive.ubuntu.com/ubuntu MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Ubuntu 6.10 'Edgy Eft' Component: main -Enabled: 1 _CompDescription: Officially supported _CompDescriptionLong: By Canonical supported Open Source software Component: universe -Enabled: 0 _CompDescription: Community maintained _CompDescriptionLong: Community maintained Open Source software Component: restricted -Enabled: 1 _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices Component: multiverse -Enabled: 0 _CompDescription: Restricted software _CompDescriptionLong: By copyright or legal issues restricted software @@ -29,10 +25,8 @@ BaseURI: cdrom:\[Ubuntu.*6.10 _Description: Cdrom with Ubuntu 6.10 'Edgy Eft' Available: False Component: main -Enabled: 1 -_CompDescription: Oficially supported +_CompDescription: Officially supported Component: restricted -Enabled: 1 _CompDescription: Restricted copyright Suite: edgy-security @@ -40,31 +34,21 @@ ParentSuite: edgy RepositoryType: deb BaseURI: http://security.ubuntu.com/ubuntu/ MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com -MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Important security updates Suite: edgy-updates ParentSuite: edgy RepositoryType: deb -BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu -MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Recommended updates Suite: edgy-proposed ParentSuite: edgy RepositoryType: deb -BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu -MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Proposed updates Suite: edgy-backports ParentSuite: edgy RepositoryType: deb -BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu -MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Backported updates Suite: dapper @@ -74,19 +58,15 @@ MatchURI: archive.ubuntu.com/ubuntu MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Ubuntu 6.06 LTS 'Dapper Drake' Component: main -Enabled: 1 _CompDescription: Officially supported _CompDescriptionLong: By Canonical supported Open Source software Component: universe -Enabled: 0 _CompDescription: Community maintained (universe) _CompDescriptionLong: Community maintained Open Source software Component: restricted -Enabled: 1 _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices Component: multiverse -Enabled: 0 _CompDescription: Restricted software (Multiverse) _CompDescriptionLong: By copyright or legal issues restricted software @@ -96,10 +76,8 @@ BaseURI: cdrom:\[Ubuntu.*6.06 _Description: Cdrom with Ubuntu 6.06 LTS 'Dapper Drake' Available: False Component: main -Enabled: 1 -_CompDescription: Oficially supported +_CompDescription: Officially supported Component: restricted -Enabled: 1 _CompDescription: Restricted copyright Suite: dapper-security @@ -107,31 +85,21 @@ ParentSuite: dapper RepositoryType: deb BaseURI: http://security.ubuntu.com/ubuntu/ MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com -MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Important security updates Suite: dapper-updates ParentSuite: dapper RepositoryType: deb -BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu -MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Recommended updates Suite: dapper-proposed ParentSuite: dapper RepositoryType: deb -BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu -MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Proposed updates Suite: dapper-backports ParentSuite: dapper RepositoryType: deb -BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu -MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Backported updates Suite: breezy @@ -141,16 +109,12 @@ MatchURI: archive.ubuntu.com/ubuntu MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Ubuntu 5.10 'Breezy Badger' Component: main -Enabled: 1 _CompDescription: Officially supported Component: restricted -Enabled: 1 _CompDescription: Restricted copyright Component: universe -Enabled: 0 _CompDescription: Community maintained (Universe) Component: multiverse -Enabled: 0 _CompDescription: Non-free (Multiverse) Suite: breezy @@ -159,10 +123,8 @@ BaseURI: cdrom:\[Ubuntu.*5.10 _Description: Cdrom with Ubuntu 5.10 'Breezy Badger' Available: False Component: main -Enabled: 1 -_CompDescription: Oficially supported +_CompDescription: Officially supported Component: restricted -Enabled: 1 _CompDescription: Restricted copyright Suite: breezy-security @@ -170,23 +132,16 @@ ParentSuite: breezy RepositoryType: deb BaseURI: http://security.ubuntu.com/ubuntu/ MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com -MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Ubuntu 5.10 Security Updates Suite: breezy-updates ParentSuite: breezy RepositoryType: deb -BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu -MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Ubuntu 5.10 Updates Suite: breezy-backports ParentSuite: breezy RepositoryType: deb -BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu -MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Ubuntu 5.10 Backports Suite: hoary @@ -196,16 +151,12 @@ MatchURI: archive.ubuntu.com/ubuntu MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Ubuntu 5.04 'Hoary Hedgehog' Component: main -Enabled: 1 -_CompDescription: Oficially supported +_CompDescription: Officially supported Component: restricted -Enabled: 1 _CompDescription: Restricted copyright Component: universe -Enabled: 0 _CompDescription: Community maintained (Universe) Component: multiverse -Enabled: 0 _CompDescription: Non-free (Multiverse) Suite: hoary @@ -214,10 +165,8 @@ BaseURI: cdrom:\[Ubuntu.*5.04 _Description: Cdrom with Ubuntu 5.04 'Hoary Hedgehog' Available: False Component: main -Enabled: 1 -_CompDescription: Oficially supported +_CompDescription: Officially supported Component: restricted -Enabled: 1 _CompDescription: Restricted copyright Suite: hoary-security @@ -225,23 +174,16 @@ ParentSuite: hoary RepositoryType: deb BaseURI: http://security.ubuntu.com/ubuntu/ MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com -MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Ubuntu 5.04 Security Updates Suite: hoary-updates ParentSuite: hoary RepositoryType: deb -BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu -MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Ubuntu 5.04 Updates Suite: hoary-backports ParentSuite: hoary RepositoryType: deb -BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu -MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Ubuntu 5.04 Backports Suite: warty @@ -250,16 +192,12 @@ BaseURI: http://archive.ubuntu.com/ubuntu/ MatchURI: archive.ubuntu.com/ubuntu _Description: Ubuntu 4.10 'Warty Warthog' Component: main -Enabled: 1 -_CompDescription: No longer oficially supported +_CompDescription: No longer officially supported Component: restricted -Enabled: 1 _CompDescription: Restricted copyright Component: universe -Enabled: 0 _CompDescription: Community maintained (Universe) Component: multiverse -Enabled: 0 _CompDescription: Non-free (Multiverse) Suite: warty @@ -268,29 +206,23 @@ BaseURI: cdrom:\[Ubuntu.*4.10 _Description: Cdrom with Ubuntu 4.10 'Warty Warthog' Available: False Component: main -Enabled: 1 -_CompDescription: No longer oficially supported +_CompDescription: No longer officially supported Component: restricted -Enabled: 1 _CompDescription: Restricted copyright Suite: warty-security ParentSuite: warty RepositoryType: deb BaseURI: http://security.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.comubuntu/|security.ubuntu.com +MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com _Description: Ubuntu 4.10 Security Updates Suite: warty-updates ParentSuite: warty RepositoryType: deb -BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu _Description: Ubuntu 4.10 Updates Suite: warty-backports ParentSuite: warty RepositoryType: deb -BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu _Description: Ubuntu 4.10 Backports diff --git a/data/glade/SoftwarePropertiesDialogs.glade b/data/glade/SoftwarePropertiesDialogs.glade index b4bf6180..7334d67a 100644 --- a/data/glade/SoftwarePropertiesDialogs.glade +++ b/data/glade/SoftwarePropertiesDialogs.glade @@ -164,9 +164,9 @@ <widget class="GtkLabel" id="label33"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes"><big><b>Enter the complete APT line of the source that you want to add</b></big> + <property name="label" translatable="yes"><big><b>Enter the complete APT line of the repository that you want to add as source</b></big> -The APT line includes the type, location and components of a source, for example <i>"deb http://ftp.debian.org sarge main"</i>.</property> +The APT line includes the type, location and components of a repository, for example <i>"deb http://ftp.debian.org sarge main"</i>.</property> <property name="use_underline">False</property> <property name="use_markup">True</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -859,9 +859,9 @@ Source</property> <widget class="GtkLabel" id="label70"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes"><b><big>The channel information is out-of-date</big></b> + <property name="label" translatable="yes"><b><big>The information about available software is out-of-date</big></b> -You have to reload the channel information to install software and updates from newly added or changed channels. +To install software and updates from newly added or changed sources, you have to reload the information about available software. You need a working internet connection to continue.</property> <property name="use_underline">False</property> diff --git a/data/glade/UpdateManager.glade b/data/glade/UpdateManager.glade index 372be566..a11a5a43 100644 --- a/data/glade/UpdateManager.glade +++ b/data/glade/UpdateManager.glade @@ -468,7 +468,7 @@ <widget class="GtkExpander" id="expander_details"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="expanded">False</property> + <property name="expanded">True</property> <property name="spacing">6</property> <signal name="activate" handler="on_expander_details_activate" last_modification_time="Mon, 31 Jan 2005 17:55:19 GMT"/> @@ -533,92 +533,6 @@ <property name="fill">True</property> </packing> </child> - - <child> - <widget class="GtkHButtonBox" id="hbuttonbox3"> - <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> - <property name="spacing">0</property> - - <child> - <widget class="GtkButton" id="button_cancel_dl_changelog"> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - - <child> - <widget class="GtkAlignment" id="alignment2"> - <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <property name="top_padding">0</property> - <property name="bottom_padding">0</property> - <property name="left_padding">0</property> - <property name="right_padding">0</property> - - <child> - <widget class="GtkHBox" id="hbox8"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">2</property> - - <child> - <widget class="GtkImage" id="image7"> - <property name="visible">True</property> - <property name="stock">gtk-cancel</property> - <property name="icon_size">4</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label13"> - <property name="visible">True</property> - <property name="label" translatable="yes">Cancel _Download</property> - <property name="use_underline">True</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - </child> - </widget> - </child> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> </widget> <packing> <property name="tab_expand">False</property> @@ -1288,7 +1202,7 @@ <property name="can_focus">True</property> <property name="label" translatable="yes"><b><big>You must check for updates manually</big></b> -Your system does not check for updates automatically. You can configure this behavior in "System" -> "Administration" -> "Software Properties".</property> +Your system does not check for updates automatically. You can configure this behavior in <i>Software Sources</i> on the <i>Internet Updates</i> tab.</property> <property name="use_underline">False</property> <property name="use_markup">True</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -1371,11 +1285,34 @@ Your system does not check for updates automatically. You can configure this beh <property name="spacing">12</property> <child> - <widget class="GtkLabel" id="label22"> + <widget class="GtkLabel" id="label_cache_progress_title"> <property name="visible">True</property> - <property name="label" translatable="yes"><big><b>Examining your system</b></big> + <property name="label" translatable="yes"><big><b>Starting update manager</b></big></property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> -Software updates correct errors, eliminate security vulnerabilities and provide new features.</property> + <child> + <widget class="GtkLabel" id="label22"> + <property name="visible">True</property> + <property name="label" translatable="yes">Software updates correct errors, eliminate security vulnerabilities and provide new features.</property> <property name="use_underline">False</property> <property name="use_markup">True</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -1431,7 +1368,7 @@ Software updates correct errors, eliminate security vulnerabilities and provide <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="ellipsize">PANGO_ELLIPSIZE_END</property> <property name="width_chars">-1</property> <property name="single_line_mode">False</property> <property name="angle">0</property> @@ -1453,4 +1390,167 @@ Software updates correct errors, eliminate security vulnerabilities and provide </child> </widget> +<widget class="GtkDialog" id="dialog_dist_upgrade"> + <property name="border_width">6</property> + <property name="title" translatable="yes"></property> + <property name="type">GTK_WINDOW_TOPLEVEL</property> + <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property> + <property name="modal">True</property> + <property name="resizable">False</property> + <property name="destroy_with_parent">False</property> + <property name="decorated">True</property> + <property name="skip_taskbar_hint">True</property> + <property name="skip_pager_hint">True</property> + <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> + <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> + <property name="focus_on_map">True</property> + <property name="urgency_hint">True</property> + <property name="has_separator">False</property> + + <child internal-child="vbox"> + <widget class="GtkVBox" id="dialog-vbox5"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">12</property> + + <child internal-child="action_area"> + <widget class="GtkHButtonBox" id="dialog-action_area5"> + <property name="visible">True</property> + <property name="layout_style">GTK_BUTTONBOX_END</property> + + <child> + <widget class="GtkButton" id="cancelbutton2"> + <property name="visible">True</property> + <property name="can_default">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">_Distribution Upgrade</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="response_id">-8</property> + </widget> + </child> + + <child> + <widget class="GtkButton" id="okbutton3"> + <property name="visible">True</property> + <property name="can_default">True</property> + <property name="has_default">True</property> + <property name="can_focus">True</property> + <property name="label">gtk-close</property> + <property name="use_stock">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="response_id">-7</property> + </widget> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">GTK_PACK_END</property> + </packing> + </child> + + <child> + <widget class="GtkHBox" id="hbox20"> + <property name="border_width">6</property> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">12</property> + + <child> + <widget class="GtkImage" id="image15"> + <property name="visible">True</property> + <property name="stock">gtk-dialog-warning</property> + <property name="icon_size">6</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkVBox" id="vbox18"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">12</property> + + <child> + <widget class="GtkLabel" id="label30"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes"><big><b>Not all updates can be installed</b></big></property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">True</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label31"> + <property name="visible">True</property> + <property name="label" translatable="yes">Run a distribution upgrade, to install as many updates as possible. + +This can be caused by an uncompleted upgrade, unofficial software packages or by running a development version.</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">True</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + </child> +</widget> + </glade-interface> diff --git a/data/update-manager.schemas.in b/data/update-manager.schemas.in index ad72c893..3740318c 100644 --- a/data/update-manager.schemas.in +++ b/data/update-manager.schemas.in @@ -11,7 +11,7 @@ <locale name="C"> <short>Remind to reload the channel list</short> <long> - If automatic checking for updates is disabeld, you have + If automatic checking for updates is disabled, you have to reload the channel list manually. This option allows to hide the reminder shown in this case. </long> @@ -28,7 +28,7 @@ <short>Show details of an update</short> <long> Stores the state of the expander that contains the - list of changs and the description + list of changes and the description </long> </locale> </schema> diff --git a/debian/changelog b/debian/changelog index 413dcfce..d817dea3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,42 @@ +update-manager (0.44.14) edgy; urgency=low + + * UpdateManager/UpdateManager.py: + - put the cancel button inside the text-area to avoid flickering + * DistUprade/DistUpgradeControler.py: + - check for self.sources, self.aptcdrom before using it (lp: #61852) + + -- + +update-manager (0.44.13) edgy; urgency=low + + * UpdateManager/UpdateManager.py: + - make sure that src_ver is always initialized (thanks to + Simira for reporting) + - filter python-apt future warning (especially for seb128) + + -- Michael Vogt <michael.vogt@ubuntu.com> Sat, 23 Sep 2006 00:53:06 +0200 + +update-manager (0.44.12) edgy; urgency=low + + * DistUpgrade/DistUpgradeViewGtk.py: + - use '%d' instead of '%s' where appropriate (lp: #60239) + * fixed lots of typos (lp: #60633) + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 18 Sep 2006 16:37:52 +0200 + +update-manager (0.44.11) edgy; urgency=low + + * UpdateManager/UpdateManager.py: + - fix error in get_changelog (lp: #59940). + Thanks to Denis Washington + - bugfix in the ListStore + - use the update-manager desktop file when runing synaptic + as the backend to get a consistent UI + - UI improvements (thanks to Sebastian Heinlein!) + - remove branding + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 12 Sep 2006 20:37:55 +0200 + update-manager (0.44.10) edgy; urgency=low * aptsources.py: @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-23 19:46+0000\n" "Last-Translator: Jadmadi <contact@jadmadi.net>\n" "Language-Team: Arabic <ar@li.org>\n" @@ -129,7 +129,7 @@ msgstr "" #: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" -"<big><b>Error scaning the CD</b></big>\n" +"<big><b>Error scanning the CD</b></big>\n" "\n" "%s" msgstr "" @@ -142,79 +142,79 @@ msgstr "الرجاء ادخال اسم القرص" msgid "Please insert a disc in the drive:" msgstr "الرجاء ادخال القرص في الجهاز" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -224,15 +224,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "قراءة من الكاش" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -240,11 +240,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -257,11 +257,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -270,42 +270,42 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "importing" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "مصدر الطرف الثالث غير مفعل" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "خطاء خلال التحديث" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "لا يوجد مساحة كافية على القرص الصلب" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -314,15 +314,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "هل تريد البدء في عملية التحديث الان؟" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -331,72 +331,77 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -406,19 +411,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "" @@ -438,7 +443,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, python-format msgid "About %s remaining" msgstr "" @@ -470,19 +475,25 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " @@ -492,31 +503,31 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 #, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 #, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, python-format msgid "" "\n" @@ -524,36 +535,39 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "" @@ -587,11 +601,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -622,7 +636,7 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -743,8 +757,8 @@ msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:222 msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -767,110 +781,94 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 msgid "The list of changes is not available" msgstr "" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" -#: ../UpdateManager/UpdateManager.py:228 -msgid "Important security updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 +msgid "Important security updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +msgid "Proposed updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 -msgid "Updates of Ubuntu" +#: ../UpdateManager/UpdateManager.py:240 +msgid "Normal updates" msgstr "" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 msgid "Other updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" +#: ../UpdateManager/UpdateManager.py:551 +msgid "_Check All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -878,52 +876,56 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +msgid "Checking for updates" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -939,84 +941,96 @@ msgid "" msgstr "" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"<big><b>Examining your system</b></big>\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "<big><b>Keep your system up-to-date</b></big>" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:5 +msgid "<big><b>Not all updates can be installed</b></big>" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:6 +msgid "<big><b>Starting update manager</b></big>" msgstr "" #: ../data/glade/UpdateManager.glade.h:7 -msgid "<big><b>Keep your system up-to-date</b></big>" +msgid "Cancel _Download" msgstr "" #: ../data/glade/UpdateManager.glade.h:8 -msgid "Cancel _Download" +msgid "Changes" msgstr "" #: ../data/glade/UpdateManager.glade.h:9 -msgid "Changes" +msgid "Changes and description of the update" msgstr "" #: ../data/glade/UpdateManager.glade.h:10 -msgid "Changes and description of the update" +msgid "Chec_k" msgstr "" #: ../data/glade/UpdateManager.glade.h:11 -msgid "Chec_k" +msgid "Check the software channels for new updates" msgstr "" #: ../data/glade/UpdateManager.glade.h:12 -msgid "Check the software channels for new updates" +msgid "Description" msgstr "" #: ../data/glade/UpdateManager.glade.h:13 -msgid "Description" +msgid "Release Notes" msgstr "" #: ../data/glade/UpdateManager.glade.h:14 -msgid "Release Notes" +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +msgid "_Distribution Upgrade" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 msgid "changes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1120,10 +1134,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" -"<b><big>The channel information is out-of-date</big></b>\n" +"<b><big>The information about available software is out-of-date</big></b>\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1150,10 +1164,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 msgid "" -"<big><b>Enter the complete APT line of the source that you want to add</b></" -"big>\n" +"<big><b>Enter the complete APT line of the repository that you want to add " +"as source</b></big>\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" @@ -1203,7 +1217,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:3 msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1222,7 +1236,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:7 msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" @@ -1246,192 +1260,172 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:106 -msgid "Important security updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -msgid "Proposed updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 -msgid "No longer oficially supported" +#: ../data/channels/Ubuntu.info.in:209 +msgid "No longer officially supported" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-23 19:40+0000\n" "Last-Translator: Nikola Kasabov <nikola.kasabov@gmail.com>\n" "Language-Team: Bulgarian <dict@fsa-bg.org>\n" @@ -132,9 +132,9 @@ msgstr "" "грешка." #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"<big><b>Error scaning the CD</b></big>\n" +"<big><b>Error scanning the CD</b></big>\n" "\n" "%s" msgstr "" @@ -150,11 +150,11 @@ msgstr "Моля, въведете име за диска" msgid "Please insert a disc in the drive:" msgstr "Моля, поставете диск в устройството:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "Повредени пакети" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -163,23 +163,23 @@ msgstr "" "този софтуер. Моля, поправете ги със synaptic или apt-get преди да " "продължите!" -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Не може да бъдат надградени изисквани мета-пакети" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "Ще трябва да бъде премахнат важен пакет" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Не може да бъде планирано надграждането" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -188,11 +188,11 @@ msgstr "" "това като грешка. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "Грешка при удостоверяването автентичността на някои пакети" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -202,12 +202,12 @@ msgstr "" "да е временен проблем с мрежата. Може би бихте искали да опитате отново по-" "късно. Вижте по-долу списъка на неудоствоерените пакети." -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "Не може да се инсталира '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -216,15 +216,16 @@ msgstr "" "грешка! " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "Не могат да бъдат предположени мета-пакети" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -233,12 +234,12 @@ msgstr "" " Моля, преди да продължите, инсталирайте един от тези пакети, като " "използвате synaptic или apt-get!" -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "Грешка при доставянето" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -248,15 +249,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "Четене на кеша" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -264,11 +265,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "Не е открит валиден огледален сървър" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -288,11 +289,11 @@ msgstr "" "Ако изберете \"Не\", актуализирането ще бъде отменено." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "Генериране на източници по подразбиране?" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -306,11 +307,11 @@ msgstr "" "Да бъдат ли добавени записи по подразбиране за \"%s\"? Ако изберете \"Не\", " "актуализацията ще бъде отменена." -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "Информацията от хранилището е невалидна" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -318,13 +319,14 @@ msgstr "" "Надграждане на информацията от хранилището доведе до невалиден файл. Моля, " "съобщете това като грешка!" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "Забранени са източници от трети страни" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#, fuzzy msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" @@ -332,11 +334,11 @@ msgstr "" "Можете да ги разрешите отново след надграждането чрез инструмента software-" "properties или чрез synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "Грешка по време на надграждане" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -344,11 +346,11 @@ msgstr "" "Възникна проблем при актуализацията. Това обикновено е накакъв проблем с " "мрежата. Моля, проверете мрежовата връзка и опитайте пак!" -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "Недостатъчно свободно място на диска" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -357,15 +359,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "Желаете ли да започне надграждането?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "Не можеше да бъдат инсталирани надгражданията" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -377,11 +379,11 @@ msgstr "" "Надграждането сега ще бъде прекратено. Системата Ви може да е в " "неизползваемо състояние. Бе изпълнено възстановяване (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "Не можеше да бъдат свалени надгражданията" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -389,36 +391,36 @@ msgstr "" "Надграждането се прекратява. Моля, проверете Интернет връзката или " "инсталационния носител и опитайте отново! " -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "Премахване на остарелите пакети?" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "П_рескачане на стъпката" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "_Премахване" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "Грешка при прехвърляне" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -427,27 +429,32 @@ msgstr "" "информация! " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "Рестартиране на системата" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "Проверка на диспечера на пакети" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "Актуализиране информацията от хранилището" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 #, fuzzy msgid "Invalid package information" msgstr "Невалидна информация за пакет" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -460,19 +467,19 @@ msgstr "" "бъде открит.\n" "Това показва сериозна грешка. Моля, съобщете за това!" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "Запитване за потвърждение" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "Надграждане" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "Търсене на остарял софтуер" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "Надграждането на системата завърши." @@ -493,7 +500,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "Сваляне на файл %li от %li при %s/сек" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, python-format msgid "About %s remaining" msgstr "" @@ -523,23 +530,29 @@ msgstr "" #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, python-format +#, fuzzy, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" "Замяна на конфигурационния файл\n" "\"%s\"?" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "Командата \"diff\" не бе намерена" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "Възникна фатална грешка" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -555,28 +568,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "Пакетът %s ще бъде премахнат." msgstr[1] "Пакетите %s ще бъдат премахнати." -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "%s нов пакет ще бъде инсталиран." msgstr[1] "%s нови пакети ще бъдат инталирани." -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "%s пакет ще бъде надграден." msgstr[1] "%s нови пакети ще бъдат надградени." -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -584,7 +597,7 @@ msgid "" "You have to download a total of %s. " msgstr "Трябва да изтеглите данни общо %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -593,32 +606,35 @@ msgstr "" "Надграждането може да отнеме няколко часа, като не може да бъде отменено по-" "нататък." -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" "За да предодвратите загуба на данни, затворете всички отворени приложения и " "документи." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "Не можеше да бъдат намерени надграждания" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "Системата Ви е актуална" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "Системата Ви вече е надградена." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>Премахване на %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "Инсталиране на %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "Надграждане на %s" @@ -652,11 +668,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "Нужно е рестартиране" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "Надграждането е завършено и има нужда от рестарт. Рестартиране сега?" @@ -692,10 +708,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Започване на надграждането?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>" msgstr "" -"<span weight=\"bold\" size=\"x-large\">Надграждане до Ubuntu 6.06 LTS</span>" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -822,9 +836,10 @@ msgid "Verfication failed" msgstr "Грешка при удостоверяване" #: ../UpdateManager/DistUpgradeFetcher.py:222 +#, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" "Удостоверяването на надграждането не успя. Възможно е да има проблем с " "мрежата или със сървъра. " @@ -851,16 +866,16 @@ msgstr "Сваляне на файл %li от %li при %s/сек" msgid "Downloading file %li of %li with unknown speed" msgstr "Сваляне на файл %li от %li при неизвестна скорост" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "Списъкът с промените още не е наличен. Моля, опитайте по-късно!" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "Списъкът с промените още не е наличен. Моля, опитайте по-късно!" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -868,134 +883,125 @@ msgstr "" "Неуспех при изтегляне на списъка с промени. Моля, проверете Интернет " "връзката си." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Ubuntu 5.10 актуализации на сигурността" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "_Инсталиране на актуализациите" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "Надграждане до последната версия на Ubuntu" +msgid "Normal updates" +msgstr "_Инсталиране на актуализациите" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "_Инсталиране на актуализациите" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "Не могат да бъдат инсталирани всички актуализации" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Версия %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "Сваляне на списъка с промени..." -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "_Проверка" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "Размер за изтегляне: %s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "Системата Ви е актуална" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Можете да инсталирате %s актуализация" msgstr[1] "Можете да инсталирате %s актуализации" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "Моля, изчакайте! Това може да отнеме известно време." -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "Актуализацията е завършена" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "_Инсталиране на актуализациите" + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Нова версия: %s (Размер: %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Версия %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "Вашата дистрибуция вече не се поддържа" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -1005,17 +1011,17 @@ msgstr "" "Надградете до по-късна версия на Ubuntu Linux. Вижте http://www.ubuntu.com " "за повече информация за надграждането!" -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "Индексът на софтуера е повреден" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1038,58 +1044,67 @@ msgstr "" "това в „Система” -> „Администрация” -> „Свойства на софтуера”" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"<big><b>Examining your system</b></big>\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "<big><b>Keep your system up-to-date</b></big>" +msgstr "<big><b>Поддържане на системата в съвременно състояние</b></big>" + +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "<big><b>Not all updates can be installed</b></big>" msgstr "" -"<big><b>Преглеждане на системата Ви</b></big>\n" +"<big><b>Грешка при сканиране на CD</b></big>\n" "\n" -"Софтуерните актуализации поправят грешки, премахват уаизвими места в " -"сигурността и предлагат нови възможности." +"%s" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "<big><b>Keep your system up-to-date</b></big>" -msgstr "<big><b>Поддържане на системата в съвременно състояние</b></big>" +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "<big><b>Starting update manager</b></big>" +msgstr "<b><big>Започване на надграждането?</big></b>" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "Отмяна на _изтеглянето" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Промени" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "Провер_ка" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "Проверка на софтуерните канали за нови актуализации" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Описание" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "Бележки към изданието" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "Показване напредъка на отделните файлове" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Актуализации на софтуера" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1097,32 +1112,37 @@ msgstr "" "Софтуерните актуализации поправят грешки, премахват уаизвими места в " "сигурността и предлагат нови възможности." -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "_Надграждане" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "Надграждане до последната версия на Ubuntu" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "_Проверка" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "_Поднови надграждането" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "_Скрий тази информация за в бъдеще" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "_Инсталиране на актуализациите" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Промени" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1234,11 +1254,12 @@ msgid "_Install security updates without confirmation" msgstr "_Инсталирай актуализациите на сигурноста без потвърждение" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 +#, fuzzy msgid "" -"<b><big>The channel information is out-of-date</big></b>\n" +"<b><big>The information about available software is out-of-date</big></b>\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1272,10 +1293,10 @@ msgstr "<b>URI:</b>" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the source that you want to add</b></" -"big>\n" +"<big><b>Enter the complete APT line of the repository that you want to add " +"as source</b></big>\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>Добавете пълния APT ред за канала, който искате да добавите</b></" @@ -1335,8 +1356,9 @@ msgid "Check for new distribution releases" msgstr "Проверка за нови версии на дистрибуцията" #: ../data/update-manager.schemas.in.h:3 +#, fuzzy msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1357,8 +1379,9 @@ msgid "Stores the size of the update-manager dialog" msgstr "Съхранява размера на update-manager диалога" #: ../data/update-manager.schemas.in.h:7 +#, fuzzy msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" "Съхранява състоянието на разширения панел, който съдържа списъка с промени и " @@ -1386,214 +1409,191 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 актуализации" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "Поддържани от обществото (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Допринесен софтуер" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 #, fuzzy msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "CD с Ubuntu 4.10 „Warty Warthog“" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "Поддържани от обществото (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "Поддържани от обществото (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Несвободни (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Несвободни (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "By copyright or legal issues restricted software" msgstr "Ограничен за изнасяне от САЩ софтуер" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Ubuntu 5.10 актуализации на сигурността" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "_Инсталиране на актуализациите" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "Официално поддържани" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 актуализации на сигурността" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 актуализации" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Състарени версии" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD с Ubuntu 5.04 „Hoary Hedgehog“" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD с Ubuntu 5.04 „Hoary Hedgehog“" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -#, fuzzy -msgid "Oficially supported" -msgstr "Официално поддържан" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" +msgstr "Официално поддържани" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 актуализации на сигурността" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 актуализации" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 Състарени версии" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "CD с Ubuntu 4.10 „Warty Warthog“" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Поддържани от обществото (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Несвободни (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 #, fuzzy msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "CD с Ubuntu 4.10 „Warty Warthog“" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "Официално поддържан" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Ограничени авторски права" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 обновления по сигурността" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 4.10 обновления" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 Състарени версии" @@ -1644,6 +1644,45 @@ msgstr "DFSG-съвместим софтуер с несвободни зави msgid "Non-DFSG-compatible Software" msgstr "Софтуер несъвместим с DFSG" +#~ msgid "Could not find any upgrades" +#~ msgstr "Не можеше да бъдат намерени надграждания" + +#~ msgid "Your system has already been upgraded." +#~ msgstr "Системата Ви вече е надградена." + +#, fuzzy +#~ msgid "" +#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +#~ msgstr "" +#~ "<span weight=\"bold\" size=\"x-large\">Надграждане до Ubuntu 6.06 LTS</" +#~ "span>" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Ubuntu 5.10 актуализации на сигурността" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "Надграждане до последната версия на Ubuntu" + +#~ msgid "Cannot install all available updates" +#~ msgstr "Не могат да бъдат инсталирани всички актуализации" + +#~ msgid "" +#~ "<big><b>Examining your system</b></big>\n" +#~ "\n" +#~ "Software updates correct errors, eliminate security vulnerabilities and " +#~ "provide new features." +#~ msgstr "" +#~ "<big><b>Преглеждане на системата Ви</b></big>\n" +#~ "\n" +#~ "Софтуерните актуализации поправят грешки, премахват уаизвими места в " +#~ "сигурността и предлагат нови възможности." + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "Официално поддържан" + #~ msgid "" #~ "Some updates require the removal of further software. Use the function " #~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-26 12:09+0000\n" "Last-Translator: Khandakar Mujahidul Islam <suzan@bengalinux.org>\n" "Language-Team: Bengali <bn@li.org>\n" @@ -128,9 +128,9 @@ msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"<big><b>Error scaning the CD</b></big>\n" +"<big><b>Error scanning the CD</b></big>\n" "\n" "%s" msgstr "" @@ -146,55 +146,55 @@ msgstr "ডিস্কের জন্য একটি নাম দিন" msgid "Please insert a disc in the drive:" msgstr "অনুগ্রহ করে ড্রাইভে একটি ডিস্ক দিন:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "ভাঙা প্যাকেজসমূহ" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "দরকারী meta-packages আপগ্রেড করতে পারে নি" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "একটি প্রয়োজনীয় প্যকেজ অপসারণ করা হতে পারে" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "আপগ্রেড গণনা করতে পারছে না" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "'%s' ইন্সটল করা যাচ্ছে না" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -203,25 +203,25 @@ msgstr "" "রিপোর্ট করুন। " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "meta-package অনুমান করা যাচ্ছ না" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "আনতে ব্যর্থ" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -231,15 +231,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "ক্যাশ পড়া হচ্ছে" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -247,11 +247,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "কোন সঠিক মিরর পাওয়া যায় নি" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -264,11 +264,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "ডিফল্ট sources তৈরি করে?" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -282,11 +282,11 @@ msgstr "" "'%s' জন্য ডিফল্ট যুক্ত করার উচিত? আপনি যদি 'না' নির্বাচন করেন তাহলে আপডেট বাতিল " "হবে।" -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "রিপোজিটরির তথ্য সঠিক নয়" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -294,22 +294,22 @@ msgstr "" "রিপোজিটোরি তথ্য আপগ্রেড করার সময় একটি ভুল ফাইল তৈরী হয়েছে। অনুগ্রহ করে এটিকে বাগ " "হিসাবে রিপোর্ট করুন।" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "তৃতীয় পার্টির উত্স নিষ্ক্রিয়" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "আপগ্রেড করার সময় সমস্যা" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -317,11 +317,11 @@ msgstr "" "আপগ্রেড করার সময় একটি সমস্যা হয়েছে। এটি সাধারনত নেটওয়ার্কের সমস্যা, অনুগ্রহ করে " "আপনার নেটওয়ার্ক সংযোগ পরীক্ষা করুন এবং পুনরায় চেষ্টা করুন।" -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "ডিস্কে যথেস্ট ফাঁকা জায়গা নেই" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -330,15 +330,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "আপনি কি আপগ্রেড শুরু করতে চান?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "আপগ্রেড ইন্সটল করা যায় নি" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -347,11 +347,11 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "আপগ্রেড ডাউনলোড করা যায় নি" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -359,62 +359,67 @@ msgstr "" "আপগ্রেড এখন বন্ধ হবে। দয়া করে আপনার ইন্টারনেট সংযুক্তি বা ইনস্টলেশন মিডিয়া পরীক্ষা " "করুন এবং আবার চেষ্টা করুন। " -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" -msgstr "কিছু সফটওয়্যার অফিসিয়ালি আর সমর্থিত নয়" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "অপ্রচলিত প্যাকেজগুলো মুছে ফেলা হবে?" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "এই ধাপটি এড়িয়ে যাও (_এ)" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "সরাও (_স)" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "প্রেরণ করার সময় সমস্যা" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "সিস্টেমটি রিস্টার্ট করছি" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "প্যাকেজ ম্যানেজার পরীক্ষা করা হচ্ছ" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "রিপজিটরির তথ্য আপডেট করা হচ্ছে" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "ভুল প্যাকেজ তথ্য" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -424,19 +429,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "তথ্যের জন্য জিজ্ঞাসা" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "আপগ্রেড করা হচ্ছে" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "অপ্রচলিত সফ্টওয়্যার অনুসন্ধান করা হচ্ছে" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "সিস্টেম আপগ্রেড সম্পন্ন।" @@ -457,7 +462,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "%li of %li ফাইল ডাউনলোড করছে" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, fuzzy, python-format msgid "About %s remaining" msgstr "%li মিিনিট বাকি আছে" @@ -487,23 +492,29 @@ msgstr "" #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, python-format +#, fuzzy, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" "কনফিগারেশন ফাইল '%s'\n" "কি সরানো হবে?" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "'diff' কমান্ডটি পাওয়া যায় নি" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "একটি মারাত্মক সমস্যা সংঘটিত হয়েছে" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " @@ -513,28 +524,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "%s টি প্যাকেজ মোছা হবে।" msgstr[1] "%s টি প্যাকেজ মোছা হবে।" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "%s টি নতুন প্যাকেজ ইনস্টল হতে যাচ্ছে।" msgstr[1] "%s টি নতুন প্যাকেজ ইনস্টল হতে যাচ্ছে।" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "%s টি নতুন প্যাকেজ আপগ্রেড হতে যাচ্ছে।" msgstr[1] "%s টি নতুন প্যাকেজ আপগ্রেড হতে যাচ্ছে।" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -542,37 +553,40 @@ msgid "" "You have to download a total of %s. " msgstr "আপনাকে সর্বমোট %s ডাউনলোড করতে হবে।" -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "আপগ্রেড করতে কয়েক ঘন্টা লেগে যেতে পারে এবং পরে এটি বাতিল করা যাবে না।" -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "তথ্য হারাতে না চাইলে সকল অ্যাপলিকেশন এবং ডকুমেন্ট বন্ধ রাখুন।" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "কোন আপগ্রেড পাওয়া যায় নি" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "আপনার সিস্টেম আপ-টু-ডেট" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "আপনার সিস্টেম ইতিমধ্যেই আপগ্রেড করা হয়েছে।" +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>%s মুছো</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "%s ইন্সটল" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "%s আপগ্রেড" @@ -606,11 +620,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "রিবুট করা প্রয়োজন" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "আপগ্রেডটি সম্পন্ন এবং রিবুট করা প্রয়োজন। আপনি কি এক্ষুনি তা করতে চান?" @@ -641,11 +655,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>আপগ্রেড শুরু করবো?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>" msgstr "" -"<span weight=\"bold\" size=\"x-large\">উবুন্টু \"ড্যাপার\" ৬.০৬ এ আপগ্রেড করছি</" -"span>" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -765,9 +776,10 @@ msgid "Verfication failed" msgstr "যথার্থ্যতা পরীক্ষা করতে ব্যর্থ" #: ../UpdateManager/DistUpgradeFetcher.py:222 +#, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" "আপগ্রেড যথার্থ্য হয়েছে কিনা তা পরীক্ষা করতে ব্যর্থ। নেটওয়ার্ক অথবা সার্ভারে সমস্যা " "থাকতে পারে। " @@ -792,16 +804,16 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "পরিবর্তনের তালিকা এখনে উপস্হিত নয়। অনুগ্রহ করে পরে আবার চেষ্টা করুন।" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "পরিবর্তনের তালিকা এখনে উপস্হিত নয়। অনুগ্রহ করে পরে আবার চেষ্টা করুন।" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " @@ -809,151 +821,142 @@ msgid "" msgstr "" "পরিবর্তন তালিকা ডাউনলোড করতে ব্যর্থ। অনুগ্রহ করে আপনার ইন্টারনেট সংযোগ পরীক্ষা করুন।" -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "আপডেট ইন্সটল করো (_I)" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "উবুন্টু এর সর্বশেষ ভার্সনে আপগ্রেড করো" +msgid "Normal updates" +msgstr "আপডেট ইন্সটল করো (_I)" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "আপডেট ইন্সটল করো (_I)" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "সকল উপস্হিত আপডেট ইন্সটল করা যায় নি" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "ভার্সন %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "পরিবর্তনের তালিকা ডাউনলোড করা হচ্ছ..." -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "পরীক্ষা করো (_C)" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "ডাউনলোড এর আকার: %s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "আপনার সিস্টেম আপ-টু-ডেট" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "আপনি %s আপডেট ইনস্টল করতে পারেন" msgstr[1] "আপনি %s আপডেট ইনস্টল করতে পারেন" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "অনুগ্রহ করে অপেক্ষা করুন, এটি কিছুটা সময় নিতে পারে।" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "আপডেট সম্পন্ন" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "আপডেট ইন্সটল করো (_I)" + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "নতুন ভার্সন: %s (আকার: %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "ভার্সন %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "আপনার ডিস্ট্রিবিউশনটি আর সমর্থিত নয়" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "সফ্টওয়্যার ইন্ডেক্সটি নস্ট" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -969,85 +972,103 @@ msgid "" msgstr "" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"<big><b>Examining your system</b></big>\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" - -#: ../data/glade/UpdateManager.glade.h:7 msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "<big><b>আপনার সিস্টেম আপ-টু-ডেট রাখুন</b></big>" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "<big><b>Not all updates can be installed</b></big>" +msgstr "" +"<big><b>সিডি স্ক্যানিং এ ত্রুটি</b></big>\n" +"\n" +"%s" + +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "<big><b>Starting update manager</b></big>" +msgstr "<b><big>আপগ্রেড শুরু করবো?</big></b>" + +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "ডাউনলোড বাতিল (_D)" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "পরিবর্তন" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "পরীক্ষা করো (_k)" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "নতুন আপডেট এর জন্য সফ্টওয়্যার চ্যানেল পরীক্ষা করো" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "বর্ননা" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "রিলিজ নোট" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "একটি ফাইলের অগ্রগতি দেখাও" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "সফ্টওয়্যার আপডেট" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "আপগ্রেড (_p)" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "উবুন্টু এর সর্বশেষ ভার্সনে আপগ্রেড করো" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "পরীক্ষা করো (_C)" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "পুনরায় আপগ্রেড শুরু (_R)" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "ভবিষ্যতে এই তথ্য আড়াল রাখো (_H)" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "আপডেট ইন্সটল করো (_I)" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "পরিবর্তন" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1156,10 +1177,10 @@ msgstr "নিরাপত্তা জনিত আপডেট গুলো #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" -"<b><big>The channel information is out-of-date</big></b>\n" +"<b><big>The information about available software is out-of-date</big></b>\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1186,10 +1207,10 @@ msgstr "<b>ইউ-আর-আই:</b>" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 msgid "" -"<big><b>Enter the complete APT line of the source that you want to add</b></" -"big>\n" +"<big><b>Enter the complete APT line of the repository that you want to add " +"as source</b></big>\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" @@ -1241,7 +1262,7 @@ msgstr "নতুন ডিস্ট্রিবিউশন রিলিজে #: ../data/update-manager.schemas.in.h:3 msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1260,7 +1281,7 @@ msgstr "update-manager ডায়ালগের আকার সংরক্ষ #: ../data/update-manager.schemas.in.h:7 msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" @@ -1286,209 +1307,186 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "উবুন্টু ৫.১০ আপডেট" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "ফ্রি নয় (মাল্টিভার্স)" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "উবুন্টু ৬.০৬ 'ড্যাপার ড্রেক'" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "ফ্রি নয় (মাল্টিভার্স)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "ফ্রি নয় (মাল্টিভার্স)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "উবুন্টু ৬.০৬ 'ড্যাপার ড্রেক'" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "আপডেট ইন্সটল করো (_I)" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "অফিসিয়াল ভাবে সমর্থিত" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "উবুন্টু ৫.১০ আপডেট" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "উবুন্টু ৫.১০ ব্যাকপোর্ট" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -#, fuzzy -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "অফিসিয়াল ভাবে সমর্থিত" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "উবুন্টু ৫.১০ আপডেট" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "উবুন্টু ৫.১০ ব্যাকপোর্ট" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "ফ্রি নয় (মাল্টিভার্স)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "কিছু সফটওয়্যার অফিসিয়ালি আর সমর্থিত নয়" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "উবুন্টু ৫.১০ আপডেট" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "উবুন্টু ৫.১০ ব্যাকপোর্ট" @@ -1539,6 +1537,37 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#~ msgid "Some software no longer officially supported" +#~ msgstr "কিছু সফটওয়্যার অফিসিয়ালি আর সমর্থিত নয়" + +#~ msgid "Could not find any upgrades" +#~ msgstr "কোন আপগ্রেড পাওয়া যায় নি" + +#~ msgid "Your system has already been upgraded." +#~ msgstr "আপনার সিস্টেম ইতিমধ্যেই আপগ্রেড করা হয়েছে।" + +#, fuzzy +#~ msgid "" +#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +#~ msgstr "" +#~ "<span weight=\"bold\" size=\"x-large\">উবুন্টু \"ড্যাপার\" ৬.০৬ এ আপগ্রেড " +#~ "করছি</span>" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "উবুন্টু এর সর্বশেষ ভার্সনে আপগ্রেড করো" + +#~ msgid "Cannot install all available updates" +#~ msgstr "সকল উপস্হিত আপডেট ইন্সটল করা যায় নি" + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "অফিসিয়াল ভাবে সমর্থিত" + #~ msgid "The following updates will be skipped:" #~ msgstr "নিম্নের আপডেটগুলো বাদ দেয়া হবে:" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-19 02:42+0000\n" "Last-Translator: Oublieuse <oublieuse@gmail.com>\n" "Language-Team: Breton <br@li.org>\n" @@ -133,7 +133,7 @@ msgstr "" #: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" -"<big><b>Error scaning the CD</b></big>\n" +"<big><b>Error scanning the CD</b></big>\n" "\n" "%s" msgstr "" @@ -146,79 +146,79 @@ msgstr "Roit un anv evit ar bladenn marplij" msgid "Please insert a disc in the drive:" msgstr "Lakait ur bladenn e-barzh ul lenner marplij:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "Pakadoù torr" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -228,15 +228,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -244,11 +244,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -261,11 +261,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -274,42 +274,42 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -318,15 +318,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -335,72 +335,77 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -410,19 +415,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "" @@ -442,7 +447,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, python-format msgid "About %s remaining" msgstr "" @@ -474,19 +479,25 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " @@ -496,28 +507,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 #, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 #, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, python-format msgid "" "\n" @@ -525,36 +536,39 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "" @@ -588,11 +602,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -623,7 +637,7 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -744,8 +758,8 @@ msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:222 msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -768,162 +782,150 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 msgid "The list of changes is not available" msgstr "" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" -#: ../UpdateManager/UpdateManager.py:228 -msgid "Important security updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 +msgid "Important security updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +msgid "Proposed updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 -msgid "Updates of Ubuntu" +#: ../UpdateManager/UpdateManager.py:240 +msgid "Normal updates" msgstr "" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 msgid "Other updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" +#: ../UpdateManager/UpdateManager.py:551 +msgid "_Check All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +msgid "Checking for updates" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -939,84 +941,96 @@ msgid "" msgstr "" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"<big><b>Examining your system</b></big>\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "<big><b>Keep your system up-to-date</b></big>" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:5 +msgid "<big><b>Not all updates can be installed</b></big>" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:6 +msgid "<big><b>Starting update manager</b></big>" msgstr "" #: ../data/glade/UpdateManager.glade.h:7 -msgid "<big><b>Keep your system up-to-date</b></big>" +msgid "Cancel _Download" msgstr "" #: ../data/glade/UpdateManager.glade.h:8 -msgid "Cancel _Download" +msgid "Changes" msgstr "" #: ../data/glade/UpdateManager.glade.h:9 -msgid "Changes" +msgid "Changes and description of the update" msgstr "" #: ../data/glade/UpdateManager.glade.h:10 -msgid "Changes and description of the update" +msgid "Chec_k" msgstr "" #: ../data/glade/UpdateManager.glade.h:11 -msgid "Chec_k" +msgid "Check the software channels for new updates" msgstr "" #: ../data/glade/UpdateManager.glade.h:12 -msgid "Check the software channels for new updates" +msgid "Description" msgstr "" #: ../data/glade/UpdateManager.glade.h:13 -msgid "Description" +msgid "Release Notes" msgstr "" #: ../data/glade/UpdateManager.glade.h:14 -msgid "Release Notes" +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +msgid "_Distribution Upgrade" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 msgid "changes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1121,10 +1135,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" -"<b><big>The channel information is out-of-date</big></b>\n" +"<b><big>The information about available software is out-of-date</big></b>\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1151,10 +1165,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 msgid "" -"<big><b>Enter the complete APT line of the source that you want to add</b></" -"big>\n" +"<big><b>Enter the complete APT line of the repository that you want to add " +"as source</b></big>\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" @@ -1204,7 +1218,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:3 msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1223,7 +1237,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:7 msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" @@ -1247,192 +1261,172 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:106 -msgid "Important security updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -msgid "Proposed updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 -msgid "No longer oficially supported" +#: ../data/channels/Ubuntu.info.in:209 +msgid "No longer officially supported" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-29 21:18+0000\n" "Last-Translator: Jordi Irazuzta <irazuzta@gmail.com>\n" "Language-Team: Catalan <tradgnome@softcatala.org>\n" @@ -133,9 +133,9 @@ msgstr "" "programació." #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"<big><b>Error scaning the CD</b></big>\n" +"<big><b>Error scanning the CD</b></big>\n" "\n" "%s" msgstr "" @@ -151,11 +151,11 @@ msgstr "Introduïu un nom per al disc" msgid "Please insert a disc in the drive:" msgstr "Inseriu un disc a la unitat:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "Paquets trencats" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -163,24 +163,24 @@ msgstr "" "El vostre sistema conté paquets trencats que no es poden arreglar amb " "aquesta aplicació. Utilitzeu el Synaptic o apt-get abans de continuar." -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, fuzzy msgid "Can't upgrade required meta-packages" msgstr "No s'han pogut actualitzar els metapaquets sol·licitats" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "S'haurà d'esborrar un paquet essencial" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "No s'ha pogut calcular l'actualització" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -189,11 +189,11 @@ msgstr "" "de l'error. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "S'ha produït un error en autenticar alguns paquets" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -203,12 +203,12 @@ msgstr "" "amb la xarxa. Podeu provar-ho després. A continuació es mostra la llista amb " "els paquets no autenticats." -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "No s'ha pogut instal·lar '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -217,15 +217,16 @@ msgstr "" "els error. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -235,12 +236,12 @@ msgstr "" " Instal·leu algun dels paquets anteriors des del Synaptic o amb l'apt-get " "per poder continuar." -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "Ha fallat l'extracció" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -250,15 +251,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "S'està llegint la memòria cau" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -266,11 +267,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "No s'ha trobat una rèplica vàlida" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -283,11 +284,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -296,11 +297,11 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "La informació del dipòsit no és vàlida" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -308,13 +309,14 @@ msgstr "" "En actualitzar la informació del dipòsit s'ha produït un error. Informeu de " "l'error." -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "S'han desactivat les fonts de tercers" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#, fuzzy msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" @@ -322,11 +324,11 @@ msgstr "" "reactivar-los, després de l'actualització de programari, des de 'propietats " "del programari' o des del Synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "S'ha produït un error en l'actualització" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -334,11 +336,11 @@ msgstr "" "S'ha produït un error mentre s'actualizava el vostre sistema. Comproveu la " "vostra connexió de xarxa i torneu a intentar-ho." -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "No disposeu de suficient espai al disc" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -351,15 +353,15 @@ msgstr "" "apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "Voleu iniciar l'actualització?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "No s'han pogut instal·lar les actualitzacions" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -371,11 +373,11 @@ msgstr "" "L'actualització s'ha cancel·lat. El vostre sistema ha pogut quedar " "inservible. S'ha executat una recuperació del sistema (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "No s'han pogut descarregar les actualitzacions" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -383,66 +385,72 @@ msgstr "" "S'ha cancel·lat l'actualització. Comproveu la vostra connexió a Internet o " "el mitjà d'instal·lació i torneu-ho a provar. " -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" -msgstr "Algun programari ja no es mantindrà oficialment" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 +#, fuzzy msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" "Aquests paquets instal·lats ja no es mantindran de manera oficial i només " "els mantindrà la comunitat Ubuntu ('universe').\n" "\n" "Si no teniu activat 'universe' se us sugerirà que els desintal·leu. " -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "Voleu esborrar els paquets obsolets?" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "_Omet aquest pas" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "Esbo_rra" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "S'està restaurant l'estat original del sistema" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "S'està comprovant el gestor de paquets" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "S'està actualitzant la informació del dipòsit" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "La informació del paquet no és valida" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -452,19 +460,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "Actualitzant" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "S'està cercant programari obsolet" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "S'ha completat l'actualització del sistema" @@ -485,7 +493,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "S'està descarregant el fitxer %li de %li a %s/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, fuzzy, python-format msgid "About %s remaining" msgstr "Queden uns %li minuts" @@ -515,23 +523,29 @@ msgstr "" #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, python-format +#, fuzzy, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" "Voleu reemplaçar el fitxer de\n" "configuració '%s'?" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "No s'ha trobat l'ordre 'diff'" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "S'ha produït un error greu" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " @@ -541,28 +555,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "S'esborrarà %s paquet" msgstr[1] "S'esborraran %s paquets" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "S'instal·larà %s paquet" msgstr[1] "S'instal·laran %s paquets" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "S'actualitzarà %s paquet" msgstr[1] "S'actualitzaran %s paquets" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -570,7 +584,7 @@ msgid "" "You have to download a total of %s. " msgstr "Heu de descarregar un total de %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -579,32 +593,35 @@ msgstr "" "L'actualització pot durar algunes hores i no la podreu cancel·lar un cop " "hagi començat." -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" "Per a evitar una possible pèrdua de dades, tanqueu tos els documents i " "aplicacions." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "No s'han pogut trobar actualitzacions" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "El vostre sistema està actualitzat" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "El vostre sistema ja està actualitzat" +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>Esborra %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "Instal·la %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "Actualitza %s" @@ -638,11 +655,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "És necessari que reinicieu el sistema" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -679,11 +696,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Voleu iniciar l'actualització?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>" msgstr "" -"<span weight=\"bold\" size=\"x-large\">S'està actualitzant a Ubuntu 6.06 " -"LTS</span>" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -805,8 +819,8 @@ msgstr "Ha fallat la verificació" #: ../UpdateManager/DistUpgradeFetcher.py:222 msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -829,16 +843,16 @@ msgstr "S'està descarregant el fitxer %li de %li amb %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "S'està descarregant el fitxer %li de %li a una velocitat desconeguda" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "La llista de canvis encara no està disponible. Proveu-ho després." -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "La llista de canvis encara no està disponible. Proveu-ho després." -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -846,134 +860,125 @@ msgstr "" "S'ha produït un error en descarregar els canvis. Comproveu si teniu connexió " "a Internet." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Debian Stable Security Updates" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "_Instal·la les actualitzacions" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "Actualitza a la darrera versió d'Ubuntu" +msgid "Normal updates" +msgstr "_Instal·la les actualitzacions" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "_Instal·la les actualitzacions" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "No es poden instal·lar les actualitzacions disponibles" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Versió %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "S'està descarregant la llista de canvis..." -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "_Comprova" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "Mida de la descàrrega: %s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "El vostre sistema està actualitzat" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Podeu instal·lar %s actualització" msgstr[1] "Podeu instal·lar %s actualitzacions" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "Espereu, això pot tardar una estona." -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "S'ha completat l'actualització" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "S'estan comprovant les actualitzacions..." + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Versió nova: %s (Mida: %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Versió %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "La vostra distribució ja no es mantindrà més" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -983,17 +988,17 @@ msgstr "" "sistema a la darrera versió d'Ubuntu. Vegeu http://www.ubuntu.com per a més " "informació." -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "<b>Ja disposeu de la nova distribució '%s'</b>" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "L'índex de programari s'ha trencat" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1017,58 +1022,67 @@ msgstr "" "\"Propietats del programari\"" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"<big><b>Examining your system</b></big>\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "<big><b>Keep your system up-to-date</b></big>" +msgstr "<big><b>Manteniu el vostre sistema actualitzat</b></big>" + +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "<big><b>Not all updates can be installed</b></big>" msgstr "" -"<big><b>S'està comprovant el vostre sistema</b></big>\n" +"<big><b>S'ha produït un error en llegir el CD</b></big>\n" "\n" -"L'actualització del programari corregeix errors, elimina problemes de " -"seguretat i afegeix prestacions noves." +"%s" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "<big><b>Keep your system up-to-date</b></big>" -msgstr "<big><b>Manteniu el vostre sistema actualitzat</b></big>" +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "<big><b>Starting update manager</b></big>" +msgstr "<b><big>Voleu iniciar l'actualització?</big></b>" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "Cancel·la la _descàrrega" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Canvis" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "Compro_va" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "Comprova els canals de programari per a actualitzacions noves" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Descripció" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "Notes de la versió" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "Mostra el progrés per als fitxers individuals" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Actualitzacions de programari" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1076,32 +1090,37 @@ msgstr "" "Les actualitzacions de programari corregeixen errors, eliminen problemes de " "seguretat i proporcionen prestacions noves." -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "_Actualitza" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "Actualitza a la darrera versió d'Ubuntu" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "_Comprova" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "_Reprén l'actualització" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "_En el futur oculta aquesta informació" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "_Instal·la les actualitzacions" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Canvis" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1210,11 +1229,12 @@ msgid "_Install security updates without confirmation" msgstr "_Instal·la actualitzacions de seguretat sense confirmació" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 +#, fuzzy msgid "" -"<b><big>The channel information is out-of-date</big></b>\n" +"<b><big>The information about available software is out-of-date</big></b>\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1248,10 +1268,10 @@ msgstr "<b>URI:</b>" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the source that you want to add</b></" -"big>\n" +"<big><b>Enter the complete APT line of the repository that you want to add " +"as source</b></big>\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>Introduïu la línia APT del canal que voleu afegir</b></big>\n" @@ -1310,7 +1330,7 @@ msgstr "Comprova si hi ha noves distribucions" #: ../data/update-manager.schemas.in.h:3 #, fuzzy msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1331,7 +1351,7 @@ msgstr "Emmagatzema la mida del diàleg del gestor d'actualitzacions" #: ../data/update-manager.schemas.in.h:7 msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" @@ -1357,213 +1377,190 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Actualitzacions d'Ubuntu 5.10" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "Paquets mantinguts per la comunitat (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Programari de la comunitat" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 #, fuzzy msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "CD amb Ubuntu 4.10 \"Warty Warthog\"" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "Paquets mantinguts per la comunitat (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "Paquets mantinguts per la comunitat (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Paquets sense llicència lliure (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Paquets sense llicència lliure (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "By copyright or legal issues restricted software" msgstr "Programari amb restriccions d'exportació als EUA" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Debian Stable Security Updates" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "_Instal·la les actualitzacions" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "Paquets mantinguts oficialment (Main)" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "CD amb Ubuntu 5.10 \"Breezy Badger\"" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Actualitzacions de seguretat d'Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Actualitzacions d'Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Actualitzacions d'Ubuntu 6.06 LTS" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD amb Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD amb Ubuntu 5.04 \"Hoary Hedgehog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -#, fuzzy -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "Paquets mantinguts oficialment (Main)" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "Actualitzacions de seguretat d'Ubuntu 5.04" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "Actualitzacions d'Ubuntu 5.04" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Actualitzacions d'Ubuntu 6.06 LTS" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "CD amb Ubuntu 4.10 \"Warty Warthog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Paquets mantinguts per la comunitat (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Paquets sense llicència lliure (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 #, fuzzy msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "CD amb Ubuntu 4.10 \"Warty Warthog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "Algun programari ja no es mantindrà oficialment" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Paquets amb restriccions per copyright (Restricted)" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Actualitzacions de seguretat d'Ubuntu 4.10" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "Actualitzacions d'Ubuntu 4.10" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Actualitzacions d'Ubuntu 6.06 LTS" @@ -1616,6 +1613,48 @@ msgstr "Programari compatible DFSG amb dependències no lliures" msgid "Non-DFSG-compatible Software" msgstr "Programari no compatible DFSG" +#~ msgid "Some software no longer officially supported" +#~ msgstr "Algun programari ja no es mantindrà oficialment" + +#~ msgid "Could not find any upgrades" +#~ msgstr "No s'han pogut trobar actualitzacions" + +#~ msgid "Your system has already been upgraded." +#~ msgstr "El vostre sistema ja està actualitzat" + +#, fuzzy +#~ msgid "" +#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +#~ msgstr "" +#~ "<span weight=\"bold\" size=\"x-large\">S'està actualitzant a Ubuntu 6.06 " +#~ "LTS</span>" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Debian Stable Security Updates" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "Actualitza a la darrera versió d'Ubuntu" + +#~ msgid "Cannot install all available updates" +#~ msgstr "No es poden instal·lar les actualitzacions disponibles" + +#~ msgid "" +#~ "<big><b>Examining your system</b></big>\n" +#~ "\n" +#~ "Software updates correct errors, eliminate security vulnerabilities and " +#~ "provide new features." +#~ msgstr "" +#~ "<big><b>S'està comprovant el vostre sistema</b></big>\n" +#~ "\n" +#~ "L'actualització del programari corregeix errors, elimina problemes de " +#~ "seguretat i afegeix prestacions noves." + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "Paquets mantinguts oficialment (Main)" + #~ msgid "" #~ "Some updates require the removal of further software. Use the function " #~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " @@ -1961,9 +2000,6 @@ msgstr "Programari no compatible DFSG" #~ msgid "Updating package list..." #~ msgstr "S'està actualitzant la llista de paquets..." -#~ msgid "Checking for updates..." -#~ msgstr "S'estan comprovant les actualitzacions..." - #~ msgid "Installing updates..." #~ msgstr "S'estan instal·lant les actualitzacions..." @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-25 18:52+0000\n" "Last-Translator: Tomáš Hála <tomas@monty.cz>\n" "Language-Team: Czech <cs@li.org>\n" @@ -129,9 +129,9 @@ msgid "The key you selected could not be removed. Please report this as a bug." msgstr "Vybraný klíč nemohl být odstraněn. Prosím oznamte to jako chybu." #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"<big><b>Error scaning the CD</b></big>\n" +"<big><b>Error scanning the CD</b></big>\n" "\n" "%s" msgstr "" @@ -147,11 +147,11 @@ msgstr "Prosím zadejte jméno disku" msgid "Please insert a disc in the drive:" msgstr "Prosím vložte disk do mechaniky:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "Poškozené balíky" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -159,23 +159,23 @@ msgstr "" "Váš systém obsahuje poškozené balíky, které nemohou být tímto programem " "opraveny. Před pokračováním oje prosím pravte použitím synaptic nebo apt-get." -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Nemohu aktualizovat požadované meta-balíky" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "Základní balík by musel být odstraněn" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Nemohu vypočítat aktualizaci" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -184,11 +184,11 @@ msgstr "" "chybu. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "Chyba při ověření některých balíků" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -198,12 +198,12 @@ msgstr "" "problémem v síti. Možná to budete chtít zkusit později. Níže je uveden " "seznam neověřených balíků." -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "Nemohu nainstalovat '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -211,15 +211,16 @@ msgstr "" "Nebylo možné nainstalovat požadovaný balík. Prosím oznamte to jako chybu. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "Nemohu odhadnout meta-balík" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -228,12 +229,12 @@ msgstr "" " Před pokračováním si prosím nainstalujte si jeden z výše uvedených balíků " "pomocí synaptic nebo apt-get." -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "Chyba stahování" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -243,15 +244,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "Probíhá čtení cache" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -259,11 +260,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "Nenalezeno správné zrcadlo" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -276,11 +277,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "Vytvořit standardní zdroje?" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -289,11 +290,11 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "Neplatná informace zdroje" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -301,22 +302,22 @@ msgstr "" "Upgrade informací o úložišti vrátil neplatný soubor. Prosím oznamte to jako " "chybu." -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "Zdroje třetích stran vypnuté" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "Chyba během aktualizace" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -324,11 +325,11 @@ msgstr "" "Nastala chyba během aktualizace. Toto je obvykle způsobeno chybou síťového " "připojení. Prosím zkontrolujte své připojení a zkuste to znovu." -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "Nedostatek volného místa na disku" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -337,15 +338,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "Chcete spustit aktualizaci?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "Nelze nainstalovat aktualizace" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -358,11 +359,11 @@ msgstr "" "stavu. Zkuste ho prosím opravit pomocí 'sudo apt-get install -f' nebo " "Synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "Nelze stáhnout aktualizace" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -370,36 +371,36 @@ msgstr "" "Aktualizace byla předčasně ukončena. Prosím zkontrolujte si připojení k " "internetu nebo instalační médium a zkuste to znovu. " -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "Odebrat zastaralé balíky?" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "_Přeskočit tento krok" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "_Odebrat" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "Chyba při zaznamenávání" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -408,26 +409,31 @@ msgstr "" "prohléhněte níže uvedenou zprávu. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "Obnovuje se původní stav systému" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "Kontroluje se manažer balíků" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "Aktualizují se informace o úložišti" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -437,19 +443,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "Požaduje se potvrzení" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "Probíhá upgrade" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "Vyhledáván zastaralý software" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "Upgrade systému je dokončen." @@ -470,7 +476,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "Stahuji soubor %li z %li rychlostí %s/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, fuzzy, python-format msgid "About %s remaining" msgstr "Zhruba %li minut zbývá" @@ -500,23 +506,29 @@ msgstr "" #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, python-format +#, fuzzy, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" "Nahradit soubor s nastavením\n" "\"%s\"?" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "Příkaz \"diff\" nebyl nalezen" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "Nastala fatální chyba" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -531,31 +543,31 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "%s balík bude odstraněn." msgstr[1] "%s balíky budou odstraněny." msgstr[2] "%s balíků bude odstraněno." -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "%s nový balík bude nainstalován." msgstr[1] "%s nové balíky budou nainstalovány." msgstr[2] "%s nových balíků bude nainstalováno." -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "%s balík bude nahrazen vyšší verzí." msgstr[1] "%s balíky budou nahrazeny vyšší verzí." msgstr[2] "%s balíky bude nahrazeno vyšší verzí." -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -563,37 +575,40 @@ msgid "" "You have to download a total of %s. " msgstr "Bude staženo celkem %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "Upgrade může trvat několik hodin a nesmí být později přerušen." -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "Pro zamezení ztráty dat, uzavřete všechny aplikace a dokumenty." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "Žádné upgrady nebyly nalezeny." +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "Váš systém je aktuální" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "Váš systém byl již upgradován." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>Odstranit %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "Nainstalovat %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "Upgradovat %s" @@ -627,11 +642,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "Vyžadován restartovat" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -667,10 +682,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Spustit upgrade?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>" msgstr "" -"<span weight=\"bold\" size=\"x-large\">Přechází se na Ubuntu 6.06 LTS</span>" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -797,10 +810,13 @@ msgid "Verfication failed" msgstr "Ověření selhalo." #: ../UpdateManager/DistUpgradeFetcher.py:222 +#, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" +"Stažení nástroje pro přechod na novou verzi systému se nepodařilo. " +"Pravděpodobně je problém se sítí. " #: ../UpdateManager/DistUpgradeFetcher.py:228 msgid "Authentication failed" @@ -822,115 +838,101 @@ msgstr "Stahuji %li. soubor z %li rychlostí %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Stahuji %li. soubor z %li neznámou rychlostí" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "Seznam změn ještě není dostupný. Prosím, zkuste to později znovu." -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "Seznam změn ještě není dostupný. Prosím, zkuste to později znovu." -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" "Selhalo stažení seznamu změn. Prosím zkontrolujte své internetové připojení." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Ubuntu 5.10 Bezpečnostní Aktualizace" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "Instaluji aktualizace" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "Upgradovat na poslední verzi Ubuntu" +msgid "Normal updates" +msgstr "Instaluji aktualizace" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "Instaluji aktualizace" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "Nelze nainstalovat všechny dostupné aktualizace" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Verze %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "Stahuji seznam změn ..." -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "_Zkontrolovat" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "Stahovaná velikost: %s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "Váš systém je aktuální" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -938,35 +940,40 @@ msgstr[0] "Můžete instalovat %s aktualizaci" msgstr[1] "Můžete instalovat %s aktualizace" msgstr[2] "Můžete instalovat %s aktualizací" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "Prosím čekejte, může to nějakou dobu trvat." -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "Aktualizace je dokončena" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "Zkontrolovat dostupné aktualizace" + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Nová verze: %s (Velikost: %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Verze %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "Vaše distribude už není podporovaná" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -976,17 +983,17 @@ msgstr "" "Přejděte na další verzi Ubuntu Linuxu. Pro více informací o přechodu na " "vyšší verzi se podívejte na http://www.ubuntu.com." -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1006,58 +1013,67 @@ msgstr "" "v \"Systém\" -> \"Správa\" -> \"Vlastnosti Software\"" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"<big><b>Examining your system</b></big>\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "<big><b>Keep your system up-to-date</b></big>" +msgstr "<big><b>Udržujte Váš systém aktuální</b></big>" + +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "<big><b>Not all updates can be installed</b></big>" msgstr "" -"<big><b>Prozkoumává se systém</b></big>\n" +"<big><b>Chyba při načítání CD</b></big>\n" "\n" -"Aktualizace softwaru opravují chyby, eliminují bezpečnostní zranitelnosti a " -"poskytují nové funkce." +"%s" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "<big><b>Keep your system up-to-date</b></big>" -msgstr "<big><b>Udržujte Váš systém aktuální</b></big>" +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "<big><b>Starting update manager</b></big>" +msgstr "<b><big>Spustit upgrade?</big></b>" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "Přerušit _stahování" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Změny" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "Z_kontrolovat" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "Zkontrolovat dostupnost nových aktualizací v distribučních kanálech" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Popis" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "Poznámky k vydáni" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "Zobrazit průběh stahování jednotlivých souborů" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Aktualizace softwaru" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1065,32 +1081,37 @@ msgstr "" "Aktualizace softwaru opravuje chyby, eliminuje bezpečnostní zranitelnosti a " "poskytují nové vlastnosti." -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "U_pgrade" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "Upgradovat na poslední verzi Ubuntu" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "_Zkontrolovat" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "_Pokračovat v upgradu" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "_Nezobrazovat příště tyto informace" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "Na_instalovat Aktualizace" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Změny" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1201,11 +1222,12 @@ msgid "_Install security updates without confirmation" msgstr "_Instalovat bezpečnostní aktualizace bez potvrzení" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 +#, fuzzy msgid "" -"<b><big>The channel information is out-of-date</big></b>\n" +"<b><big>The information about available software is out-of-date</big></b>\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1239,10 +1261,10 @@ msgstr "<b>Adresa:</b>" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the source that you want to add</b></" -"big>\n" +"<big><b>Enter the complete APT line of the repository that you want to add " +"as source</b></big>\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>Zadejte úplný řádek pro cestu APT kanálu, který chcete přidat</b></" @@ -1300,8 +1322,9 @@ msgid "Check for new distribution releases" msgstr "Zkontrolovat nová vydání distribuce" #: ../data/update-manager.schemas.in.h:3 +#, fuzzy msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1323,7 +1346,7 @@ msgstr "Uchovává velikost dialogu update-manageru" #: ../data/update-manager.schemas.in.h:7 msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" @@ -1349,211 +1372,189 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 Aktualizace" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "Udržováno komunitou (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Nesvobodný (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 \"Dapper Drake\"" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "Udržováno komunitou (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "Udržováno komunitou (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Nesvobodný (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Nesvobodný (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 \"Dapper Drake\"" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Ubuntu 5.10 Bezpečnostní Aktualizace" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "Instaluji aktualizace" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "Oficiálně podporováno" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 Bezpečnostní Aktualizace" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 Aktualizace" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Backports" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -msgid "Oficially supported" -msgstr "Oficiálně podporované" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" +msgstr "Oficiálně podporováno" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 Bezpečnostní Aktualizace" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 Aktualizace" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 Backports" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Udržováno komunitou (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Nesvobodný (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "Oficiálně podporované" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Omezeno copyrightem" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 5.10 Bezpečnostní Aktualizace" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 5.10 Aktualizace" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 Backports" @@ -1604,6 +1605,44 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "Žádný DFSG kompatibilní Software" +#~ msgid "Could not find any upgrades" +#~ msgstr "Žádné upgrady nebyly nalezeny." + +#~ msgid "Your system has already been upgraded." +#~ msgstr "Váš systém byl již upgradován." + +#, fuzzy +#~ msgid "" +#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +#~ msgstr "" +#~ "<span weight=\"bold\" size=\"x-large\">Přechází se na Ubuntu 6.06 LTS</" +#~ "span>" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Ubuntu 5.10 Bezpečnostní Aktualizace" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "Upgradovat na poslední verzi Ubuntu" + +#~ msgid "Cannot install all available updates" +#~ msgstr "Nelze nainstalovat všechny dostupné aktualizace" + +#~ msgid "" +#~ "<big><b>Examining your system</b></big>\n" +#~ "\n" +#~ "Software updates correct errors, eliminate security vulnerabilities and " +#~ "provide new features." +#~ msgstr "" +#~ "<big><b>Prozkoumává se systém</b></big>\n" +#~ "\n" +#~ "Aktualizace softwaru opravují chyby, eliminují bezpečnostní zranitelnosti " +#~ "a poskytují nové funkce." + +#~ msgid "Oficially supported" +#~ msgstr "Oficiálně podporované" + #~ msgid "The following updates will be skipped:" #~ msgstr "Následující aktualizace budou přeskočeny:" @@ -1694,8 +1733,5 @@ msgstr "Žádný DFSG kompatibilní Software" #~ msgid "<b>Sections</b>" #~ msgstr "<b>Sekce</b>" -#~ msgid "Check for available updates" -#~ msgstr "Zkontrolovat dostupné aktualizace" - #~ msgid "<b>Sections:</b>" #~ msgstr "<b>Sekce:</b>" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-23 19:41+0000\n" "Last-Translator: Mathias-K <mathias@computergeil.dk>\n" "Language-Team: Danish <da@li.org>\n" @@ -129,9 +129,9 @@ msgstr "" "Den valgte nøgle kunne ikke fjernes. Rapporter venligst dette som en fejl." #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"<big><b>Error scaning the CD</b></big>\n" +"<big><b>Error scanning the CD</b></big>\n" "\n" "%s" msgstr "" @@ -147,11 +147,11 @@ msgstr "Indtast venligst et navn til disken" msgid "Please insert a disc in the drive:" msgstr "Indsæt venligst en disk i drevet:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "Ødelagte pakker" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -159,25 +159,25 @@ msgstr "" "Dit system indeholder ødelagte pakker som ikke kan repareres med dette " "program. Reparer dem venligst med synaptic eller apt-get før du fortsætter." -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Kan ikke opgradere de krævede meta-pakker" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 #, fuzzy msgid "A essential package would have to be removed" msgstr "Det ville være nødvendigt at fjerne en vigtig pakke" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 #, fuzzy msgid "Could not calculate the upgrade" msgstr "Kunne ikke udregne opgraderingen" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -186,11 +186,11 @@ msgstr "" "Rapportér venligst dette som en fejl. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "Fejl ved godkendelse af nogle pakker" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -200,12 +200,12 @@ msgstr "" "Det anbefales du prøver igen senere. Se længere nede for en liste over " "pakker som ikke kunne godkendes." -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "Kan ikke installere '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -214,16 +214,17 @@ msgstr "" "som en fejl. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 #, fuzzy msgid "Can't guess meta-package" msgstr "Kan ikke gætte meta-pakke" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -233,12 +234,12 @@ msgstr "" " Installer venligst en af pakkerne nævnt herover ved hjælp af Synaptic eller " "apt-get før du fortsætter." -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "Fejl ved hentning" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -248,15 +249,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "Læser cache-mellemlager" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -264,11 +265,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -281,11 +282,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -294,11 +295,11 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "Arkivinformation ugyldig." -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -306,22 +307,22 @@ msgstr "" "Opgradering af arkivet resulterede i en ødelagt fil. raporter venligst dette " "som en fejl." -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "Trediepartskilder er fravalgt" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "Fejl under opdatering" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -329,11 +330,11 @@ msgstr "" "En fejl forekom under opdateringen. Dette skyldes som regel et " "netværksproblem, tjek venligst din netværksforbindelse og prøv igen." -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "Der er ikke nok fri diskplads" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -345,15 +346,15 @@ msgstr "" "køre 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "Vil du starte opgraderingen?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "Kunne ikke installere opgraderingerne" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -365,11 +366,11 @@ msgstr "" "Upgraderingen afbrydes nu. Dit system kan forekomme ustabilt. En oprydning " "blev foretaget (dpkg --configura -a)." -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "Kunne ikke hente opgraderingerne" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -377,17 +378,18 @@ msgstr "" "Opgraderingen afbryder nu. Tjek venligst din internetforbindelse eller dit " "installationsmedie og prøv igen. " -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" -msgstr "Noget software er ikke længere officielt understøttet" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 +#, fuzzy msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" "Disse installerede pakker er ikke længere officielt understøttet, og er nu " "kun understøttet af brugerne ('universe').↵\n" @@ -395,25 +397,25 @@ msgstr "" "Hvis du ikke har slået 'universe' til, vil fjernelsen af disse pakker blive " "foreslået i det næste trin. " -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "Fjern forældede pakker?" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 #, fuzzy msgid "_Skip This Step" msgstr "_Spring dette trin over" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "_Fjern" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 #, fuzzy msgid "Error during commit" msgstr "Fejl under udførsel" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -422,26 +424,31 @@ msgstr "" "information. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "Genstarter oprindelig systemtilstand" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "Undersøger pakkehåndtering" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "Opdaterer arkivinformation" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -451,19 +458,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "Opgraderer" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "Søger efter forældet software" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "Systemopgradering er fuldført" @@ -484,7 +491,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "Henter fil %li af %li fra %s/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, fuzzy, python-format msgid "About %s remaining" msgstr "Tid tilbage(ca.): %li minutter" @@ -514,23 +521,29 @@ msgstr "" #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, python-format +#, fuzzy, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" "Udskift opsætningsfilen\n" "'%s'?" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "Kommandoen 'diff' blev ikke fundet" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "En alvorlig fejl opstod" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -545,28 +558,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "%s pakke vil blive fjernet." msgstr[1] "%s pakker vil blive fjernet." -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "%s ny pakke vil blive installeret." msgstr[1] "%s nye pakker vil blive installeret." -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "%s pakke vil blive opgraderet." msgstr[1] "%s pakker vil bliver opgraderet." -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -574,37 +587,40 @@ msgid "" "You have to download a total of %s. " msgstr "Der skal i alt hentes %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "Opgraderingen kan tage flere timer og kan ikke fortrydes senere." -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "Luk alle åbne programmer og dokumenter for at undgå tab af data." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "Kunne ikke finde nogen tilgængelige opgraderinger" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "Dit system er opdateret" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "Dit system er allerede opgraderet." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>Fjern %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "Installer %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "Opgrader %s" @@ -638,11 +654,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "Genstart af maskinen er påkrævet" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -679,10 +695,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Start opgraderinegn?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>" msgstr "" -"<span weight=\"bold\" size=\"x-large\">Opgraderer til Ubuntu 6.06 LTS</span>" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -808,9 +822,10 @@ msgid "Verfication failed" msgstr "Efterprøvning fejlede" #: ../UpdateManager/DistUpgradeFetcher.py:222 +#, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" "Efterprøvning af opgraderingen fejlede. Det er muligvis en fejl i netværket " "eller på serveren. " @@ -837,16 +852,16 @@ msgstr "Henter fil %li af %li med %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Henter fil %li af %li med ukendt hastighed" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "Listen med ændringer er ikke klar endnu. Prøv venligst igen senere." -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "Listen med ændringer er ikke klar endnu. Prøv venligst igen senere." -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " @@ -855,134 +870,125 @@ msgstr "" "Fejl ved hentning af ændringslisten. Undersøg venligst din " "internetforbindelse." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Ubuntu 5.10 Sikkerhedsopdateringer" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "_Installer Opdateringer" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "Opgrader til seneste version af Ubuntu" +msgid "Normal updates" +msgstr "_Installer Opdateringer" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "_Installer Opdateringer" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "Kan ikke installere alle tilgængelige opdateringer" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Version %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "Henter listen med ændringer..." -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "_Tjek" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "Overføringsstørelse: %s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "Dit system er opdateret" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Du kan installere %s opdatering" msgstr[1] "Du kan installere %s opdateringer" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "Vent venligst, dette kan tage et stykke tid." -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "Opdatering udført" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "_Installer Opdateringer" + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Ny version: %s (Size: %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Version %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "Din distribution understøtes ikke længere" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -992,17 +998,17 @@ msgstr "" "opdateringer. Opgrader til en senere version af Ubuntu Linux. Se http://www." "ubuntu.com (engalsk) for mere informaiton om opgradering." -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "Software indexet er i stykker" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1027,58 +1033,71 @@ msgstr "" "Properties\"." #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"<big><b>Examining your system</b></big>\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" - -#: ../data/glade/UpdateManager.glade.h:7 msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "<big><b>Hold dit system opdateret</b></big>" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "<big><b>Not all updates can be installed</b></big>" +msgstr "" +"<big><b>Fejl ved scanning af CD</b></big>\n" +"\n" +"%s" + +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "<big><b>Starting update manager</b></big>" +msgstr "<b><big>Start opgraderinegn?</big></b>" + +#: ../data/glade/UpdateManager.glade.h:7 #, fuzzy msgid "Cancel _Download" msgstr "Afbryd _Hentning" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Ændringer" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 #, fuzzy msgid "Chec_k" msgstr "_Tjek" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 #, fuzzy msgid "Check the software channels for new updates" msgstr "Undersøg softwarekanalerne for nye opdateringer" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Beskrivelse" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 #, fuzzy msgid "Release Notes" msgstr "Udgivelsesnoter" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "Vis fremgang for enkelte filer" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Opdateringer" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1086,32 +1105,37 @@ msgstr "" "Softwareopdateringer retter fejl, lukker sikkerhedshuller og gør nye " "funktioner tilgængelige." -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "_Opgrader" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "Opgrader til seneste version af Ubuntu" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "_Tjek" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "_Genoptag opgradering" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "_Skjul denne information for fremtiden" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "_Installer Opdateringer" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Ændringer" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1226,10 +1250,10 @@ msgstr "_Installer sikkerhedsopdateringer automatisk uden bekræftelse" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 #, fuzzy msgid "" -"<b><big>The channel information is out-of-date</big></b>\n" +"<b><big>The information about available software is out-of-date</big></b>\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1263,10 +1287,10 @@ msgstr "<b>URI:</b>" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 msgid "" -"<big><b>Enter the complete APT line of the source that you want to add</b></" -"big>\n" +"<big><b>Enter the complete APT line of the repository that you want to add " +"as source</b></big>\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" @@ -1324,7 +1348,7 @@ msgstr "Undersøg om der er en ny distributionsudgivelse" #: ../data/update-manager.schemas.in.h:3 #, fuzzy msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1348,7 +1372,7 @@ msgstr "Gemmer størrelsen på opdateringshåndteringens dialog" #: ../data/update-manager.schemas.in.h:7 #, fuzzy msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" "Gemmer tilstanden for udfolderen der indeholder listen med ændringer og " @@ -1377,215 +1401,192 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 Opdateringer" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "Vedligeholdt af fællesskabet (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Ikke frit programmel (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "Vedligeholdt af fællesskabet (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "Vedligeholdt af fællesskabet (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Ikke frit programmel (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Ikke frit programmel (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Ubuntu 5.10 Sikkerhedsopdateringer" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "_Installer Opdateringer" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -#, fuzzy -msgid "Officially supported" -msgstr "Officielt understøttet" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 Sikkerhedsopdateringer" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 Opdateringer" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Backports" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 #, fuzzy -msgid "Oficially supported" +msgid "Officially supported" msgstr "Officielt understøttet" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 Sikkerhedsopdateringer" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 Opdateringer" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 Backports" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Vedligeholdt af fællesskabet (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Ikke frit programmel (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "Noget software er ikke længere officielt understøttet" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 #, fuzzy msgid "Restricted copyright" msgstr "Begrænset copyright" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 5.10 Sikkerhedsopdateringer" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 5.10 Opdateringer" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 Backports" @@ -1636,6 +1637,37 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#~ msgid "Some software no longer officially supported" +#~ msgstr "Noget software er ikke længere officielt understøttet" + +#~ msgid "Could not find any upgrades" +#~ msgstr "Kunne ikke finde nogen tilgængelige opgraderinger" + +#~ msgid "Your system has already been upgraded." +#~ msgstr "Dit system er allerede opgraderet." + +#, fuzzy +#~ msgid "" +#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +#~ msgstr "" +#~ "<span weight=\"bold\" size=\"x-large\">Opgraderer til Ubuntu 6.06 LTS</" +#~ "span>" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Ubuntu 5.10 Sikkerhedsopdateringer" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "Opgrader til seneste version af Ubuntu" + +#~ msgid "Cannot install all available updates" +#~ msgstr "Kan ikke installere alle tilgængelige opdateringer" + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "Officielt understøttet" + #~ msgid "" #~ "Some updates require the removal of further software. Use the function " #~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-27 10:58+0000\n" "Last-Translator: Sebastian Heinlein <glatzor@gmx.de>\n" "Language-Team: German GNOME Translations <gnome-de@gnome.org>\n" @@ -135,9 +135,9 @@ msgstr "" "hierfür einen Fehlerbericht." #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"<big><b>Error scaning the CD</b></big>\n" +"<big><b>Error scanning the CD</b></big>\n" "\n" "%s" msgstr "" @@ -153,11 +153,11 @@ msgstr "Geben Sie einen Namen für das Medium ein" msgid "Please insert a disc in the drive:" msgstr "Bitte legen Sie ein Medium in das Laufwerk:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "Defekte Pakete" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -166,23 +166,23 @@ msgstr "" "werden können. Bitte reparieren Sie diese mit Synaptic oder apt-get, bevor " "Sie fortfahren." -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Die erforderlichen Metapakete können nicht aktualisiert werden" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "Ein grundlegendes Paket müsste entfernt werden" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Die Aktualisierung konnte nicht berechnet werden" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -191,11 +191,11 @@ msgstr "" "erstellen Sie hierfür einen Fehlerbericht. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "Fehler bei der Echtheitsbestätigung einiger Pakete" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -206,12 +206,12 @@ msgstr "" "später noch einmal. Die unten stehenden Pakete konnten nicht auf ihre " "Echtheit hin bestätigt werden:" -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "›%s‹ kann nicht installiert werden" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -220,15 +220,16 @@ msgstr "" "Sie hierfür einen Fehlerbericht. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "Metapaket konnte nicht bestimmt werden" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -238,12 +239,12 @@ msgstr "" " Bitte installieren Sie eines der obigen Pakete über Synaptic oder apt-get, " "bevor Sie fortfahren." -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "Herunterladen ist fehlgeschlagen" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -253,15 +254,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "Zwischenspeicher wird ausgelesen" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -269,11 +270,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "Kein gültiger Mirror gefunden" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -293,11 +294,11 @@ msgstr "" "Wenn Sie 'Nein' wählen, wird das Update abgebrochen." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "Standardquellen generieren?" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -311,11 +312,11 @@ msgstr "" "Sollen Standardeinträge für '%s' hinzugefügt werden? Wenn Sie 'Nein' " "auswählen, wird das Update abgebrochen." -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "Ungültige Kanalinformationen" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -323,13 +324,14 @@ msgstr "" "Die Aktualisierung der Quellen-Information ergab eine ungültige Datei. Bitte " "erstellen Sie einen Fehlerbericht." -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "Quellen von Drittanbietern deaktiviert" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#, fuzzy msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" @@ -337,11 +339,11 @@ msgstr "" "Sie können diese nach dem Upgrade mit dem 'software-properties'-Werkzeug " "oder mit Synaptic reaktivieren." -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "Fehler während der Aktualisierung" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -350,11 +352,11 @@ msgstr "" "Netzwerkprobleme zurückzuführen. Bitte überprüfen Sie Ihre " "Netzwerkverbindung und versuchen Sie es noch einmal." -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "Unzureichender freier Festplattenspeicher" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -366,15 +368,15 @@ msgstr "" "temporäre Pakete von frühreren Installation mit 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "Möchten Sie die Aktualisierung starten?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "Die Aktualisierungen konnten nicht installiert werden" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -387,11 +389,11 @@ msgstr "" "unbenutzbaren Zustand befinden. Eine Wiederherstellung wurde durchgeführt " "(dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "Die Aktualisierungen konnten nicht heruntergeladen werden" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -400,17 +402,18 @@ msgstr "" "Internet-Verbindung oder Ihr Installationsmedium und versuchen Sie es noch " "einmal. " -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" -msgstr "Einige Programme werden nicht mehr länger offiziell unterstützt" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 +#, fuzzy msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" "Die installierten Pakete werden nicht mehr länger offiziell unterstützt und " "werden jetzt nur mehr von der Gemeinschaft unterstützt ('universe').\n" @@ -418,23 +421,23 @@ msgstr "" "Wenn sie 'universe' nicht aktiviert haben, werden diese Pakete im nächsten " "Schritt zum Entfernen vorgeschlagen. " -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "Veraltete Pakete entfernen?" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "Ü_berspringen" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "_Entfernen" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "Fehler beim Anwenden" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -443,26 +446,31 @@ msgstr "" "Nachricht für nähere Informationen. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "Wiederherstellen des alten Systemzustandes" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "Paketverwaltung wird überprüft" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "Aktualisiere Quellen-Information" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "Ungültige Paketinformationen" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -476,19 +484,19 @@ msgstr "" "Dies deutet auf einen gravierenden Fehler hin, bitte erstellen Sie hierfür " "einen Fehlerbericht." -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "Nach Bestätigung fragen" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "Aktualisiere" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "Nach veralteter Software wird gesucht" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "Aktualisierung ist abgeschlossen." @@ -509,7 +517,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "Lade Datei %li von %li mit %s/s herunter" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, fuzzy, python-format msgid "About %s remaining" msgstr "Ungefähr %li Minute(n) verbleibend" @@ -539,23 +547,29 @@ msgstr "" #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, python-format +#, fuzzy, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" "Die Konfigurationsdatei\n" "»%s« ersetzen?" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "Das 'diff'-Kommando konnte nicht gefunden werden" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "Ein fataler Fehler ist aufgetreten" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -571,28 +585,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "%s Paket wird entfernt." msgstr[1] "%s Pakete werden entfernt." -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "%s neues Paket wird installiert." msgstr[1] "%s neue Pakete werden installiert." -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "%s Paket wird aktualisiert." msgstr[1] "%s Pakete werden aktualisiert." -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -600,7 +614,7 @@ msgid "" "You have to download a total of %s. " msgstr "Insgesamt müssen %s heruntergeladen werden." -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -609,32 +623,35 @@ msgstr "" "Die Aktualisierung kann mehrere Stunden dauern und zu keiner Zeit mehr " "abgebrochen werden." -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" "Um Datenverlust zu vermeiden, schließen Sie alle offenen Anwendungen und " "Dokumente." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "Es liegen keine Aktualisierungen vor" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "Ihr System ist auf dem aktuellen Stand" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "Ihr System wurde bereits aktualisiert." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>%s wird entfernt</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "%s wird installiert" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "%s wird aktualisiert" @@ -668,11 +685,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "Neustart erforderlich" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -710,11 +727,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Mit der Aktualisierung beginnen?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>" msgstr "" -"<span weight=\"bold\" size=\"x-large\">Auf Ubuntu 6.06 LTS aktualisieren</" -"span>" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -842,9 +856,10 @@ msgid "Verfication failed" msgstr "Verifikation fehlgeschlagen" #: ../UpdateManager/DistUpgradeFetcher.py:222 +#, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" "Die Prüfung der Aktualisierung ist fehlgeschlagen. Möglicherweise gibt es " "Probleme im Netzwerk oder am Server. " @@ -871,20 +886,20 @@ msgstr "Datei %li von %li wird mit %s/s heruntergeladen" msgid "Downloading file %li of %li with unknown speed" msgstr "Datei %li von %li wird mit unbekannter Geschwindigkeit heruntergeladen" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "" "Die Liste mit Aktualisierungen ist momentan nicht verfügbar. Bitte versuchen " "Sie es zu einem späteren Zeitpunkt erneut." -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" "Die Liste mit Aktualisierungen ist momentan nicht verfügbar. Bitte versuchen " "Sie es zu einem späteren Zeitpunkt erneut." -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -892,134 +907,125 @@ msgstr "" "Die Liste mit Änderungen konnte nicht heruntergeladen werden. Bitte " "überprüfen Sie Ihre Internet-Verbindung." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Ubuntu 5.10 Sicherheitsaktualisierungen" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "Aktualisierungen werden installiert" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "Aus die neueste Version von Ubuntu aktualisieren" +msgid "Normal updates" +msgstr "Aktualisierungen werden installiert" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "Aktualisierungen werden installiert" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "Nicht alle verfügbaren Aktualisierungen können installiert werden" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Version %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "Liste mit Änderungen wird heruntergeladen..." -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "_Prüfen" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "Download-Größe: %s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "Ihr System ist auf dem aktuellen Stand" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Sie können %s Aktualisierung installieren" msgstr[1] "Sie können %s Aktualisierungen installieren" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "Bitte warten Sie, dieser Vorgang kann etwas Zeit in Anspruch nehmen." -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "Aktualisierung ist abgeschlossen" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "Nach verfügbaren Aktualisierungen suchen" + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Neue Version: %s (Größe: %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Version %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "Ihre Distribution wird nicht länger unterstützt" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -1030,17 +1036,17 @@ msgstr "" "System auf eine neuere Version von Ubuntu Linux. Auf http://www.ubuntuusers." "de oder http://www.ubuntu.com finden Sie weitere Informationen hierzu." -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "<b>Neue Version '%s' der Distribution ist freigegeben</b>" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "Der Software-Index ist beschädigt" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1064,58 +1070,67 @@ msgstr "" "\" -> \"Software Eigenschaften\" ändern." #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"<big><b>Examining your system</b></big>\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "<big><b>Keep your system up-to-date</b></big>" +msgstr "<big><b>Halten Sie Ihr System aktuell</b></big>" + +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "<big><b>Not all updates can be installed</b></big>" msgstr "" -"<big><b>Ihr System wird überprüft</b></big>\n" +"<big><b>Fehler beim Lesen der CD</b></big>\n" "\n" -"Software-Aktualisierungen beheben Fehler, schließen Sicherheitslücken und " -"stellen neue Funktionen bereit." +"%s" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "<big><b>Keep your system up-to-date</b></big>" -msgstr "<big><b>Halten Sie Ihr System aktuell</b></big>" +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "<big><b>Starting update manager</b></big>" +msgstr "<b><big>Mit der Aktualisierung beginnen?</big></b>" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "_Herunterladen abbrechen" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Änderungen" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "_Prüfen" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "Software-Kanäle auf Aktualisierungen prüfen" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Beschreibung" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "Freigabemitteilung" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "Fortschritt der einzelnen Dateien anzeigen" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Software-Aktualisierungen" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1123,32 +1138,37 @@ msgstr "" "Software-Aktualisierungen beheben Fehler, schließen Sicherheitslücken und " "stellen neue Funktionen bereit." -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "_Aktualisieren" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "Aus die neueste Version von Ubuntu aktualisieren" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "_Prüfen" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "_Aktualisierung fortsetzen" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "Diese Information in Zukunft _nicht mehr anzeigen" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "Aktualisierungen _installieren" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Änderungen" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1262,11 +1282,12 @@ msgid "_Install security updates without confirmation" msgstr "Sicherheitsaktualisierungen _ohne Bestätigung installieren" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 +#, fuzzy msgid "" -"<b><big>The channel information is out-of-date</big></b>\n" +"<b><big>The information about available software is out-of-date</big></b>\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1300,10 +1321,10 @@ msgstr "<b>URI:</b>" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the source that you want to add</b></" -"big>\n" +"<big><b>Enter the complete APT line of the repository that you want to add " +"as source</b></big>\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>Geben Sie die vollständige APT-Zeile für den Kanal ein, den sie " @@ -1363,8 +1384,9 @@ msgid "Check for new distribution releases" msgstr "Auf neue Versionen der Distribution prüfen" #: ../data/update-manager.schemas.in.h:3 +#, fuzzy msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1385,8 +1407,9 @@ msgid "Stores the size of the update-manager dialog" msgstr "Speichert die Größe des Fensters der Aktualisierungsverwaltung" #: ../data/update-manager.schemas.in.h:7 +#, fuzzy msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" "Speichert den Zustand des Expanders, der die Liste der Änderungen und die " @@ -1414,212 +1437,190 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 Aktualisierungen" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "Von der Gemeinschaft betreut (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Contributed Software" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 \"Dapper Drake\"" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "Von der Gemeinschaft betreut (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "Von der Gemeinschaft betreut (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Unfrei (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Unfrei (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "By copyright or legal issues restricted software" msgstr "Software mit US-Exportbeschränkungen" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 \"Dapper Drake\"" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Ubuntu 5.10 Sicherheitsaktualisierungen" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "Aktualisierungen werden installiert" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 \"Breezy Badger\"" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "Offiziell unterstützt" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 \"Breezy Badger\"" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 Sicherheitsaktualisierungen" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 Aktualisierungen" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Backports" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 Sicherheitsaktualisierungen" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 Sicherheitsaktualisierungen" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "Offiziell unterstützt" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 Sicherheitsaktualisierungen" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 Aktualisierungen" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 Backports" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 \"Breezy Badger\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Von der Gemeinschaft betreut (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Unfrei (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "Einige Programme werden nicht mehr länger offiziell unterstützt" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Urheberrechtlich eingeschränkt" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 Sicherheitsaktualisierungen" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 5.10 Aktualisierungen" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 Backports" @@ -1670,6 +1671,47 @@ msgstr "DFSG-kompatible Software mit unfreien Abhängigkeiten" msgid "Non-DFSG-compatible Software" msgstr "Nicht DFSG-kompatible Software" +#~ msgid "Some software no longer officially supported" +#~ msgstr "Einige Programme werden nicht mehr länger offiziell unterstützt" + +#~ msgid "Could not find any upgrades" +#~ msgstr "Es liegen keine Aktualisierungen vor" + +#~ msgid "Your system has already been upgraded." +#~ msgstr "Ihr System wurde bereits aktualisiert." + +#, fuzzy +#~ msgid "" +#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +#~ msgstr "" +#~ "<span weight=\"bold\" size=\"x-large\">Auf Ubuntu 6.06 LTS aktualisieren</" +#~ "span>" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Ubuntu 5.10 Sicherheitsaktualisierungen" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "Aus die neueste Version von Ubuntu aktualisieren" + +#~ msgid "Cannot install all available updates" +#~ msgstr "Nicht alle verfügbaren Aktualisierungen können installiert werden" + +#~ msgid "" +#~ "<big><b>Examining your system</b></big>\n" +#~ "\n" +#~ "Software updates correct errors, eliminate security vulnerabilities and " +#~ "provide new features." +#~ msgstr "" +#~ "<big><b>Ihr System wird überprüft</b></big>\n" +#~ "\n" +#~ "Software-Aktualisierungen beheben Fehler, schließen Sicherheitslücken und " +#~ "stellen neue Funktionen bereit." + +#~ msgid "Oficially supported" +#~ msgstr "Offiziell unterstützt" + #~ msgid "" #~ "Some updates require the removal of further software. Use the function " #~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " @@ -1828,9 +1870,6 @@ msgstr "Nicht DFSG-kompatible Software" #~ msgid "<b>Sections</b>" #~ msgstr "<b>Sparten:</b>" -#~ msgid "Check for available updates" -#~ msgstr "Nach verfügbaren Aktualisierungen suchen" - #~ msgid "<b>Sections:</b>" #~ msgstr "<b>Sparten:</b>" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: el\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-25 15:39+0000\n" "Last-Translator: Kostas Papadimas <pkst@gmx.net>\n" "Language-Team: Greek <team@gnome.gr>\n" @@ -130,9 +130,9 @@ msgstr "" "σφάλμα." #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"<big><b>Error scaning the CD</b></big>\n" +"<big><b>Error scanning the CD</b></big>\n" "\n" "%s" msgstr "" @@ -148,11 +148,11 @@ msgstr "Παρακαλώ εισάγετε ένα όνομα για το δίσκ msgid "Please insert a disc in the drive:" msgstr "Παρακαλώ εισάγετε ένα δίσκο στον οδηγό:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "Κατεστραμμένα πακέτα" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -161,23 +161,23 @@ msgstr "" "διορθωθούν με αυτό το λογισμικό. Παρακαλώ διορθώστε τα μέσω synaptic ή apt-" "get για να συνεχίσετε." -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Αδυναμία αναβάθμισης απαιτούμενων μετα-πακέτων" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "Ένα απαραίτητο πακέτα θα πρέπει να απομακρυνθεί" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Αδυναμία υπολογισμού της αναβάθμισης" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -186,11 +186,11 @@ msgstr "" "Παρακαλώ αναφέρετε το ως σφάλμα. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "Σφάλμα πιστοποίησης κάποιων πακέτων" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -200,12 +200,12 @@ msgstr "" "σε ένα πρόβλημα δικτύου. Προσπαθήστε αργότερα. Δείτε παρακάτω τη λίστα των " "μη πιστοποιημένων πακέτων." -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "Αδυναμία εγκατάστασης '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -214,15 +214,16 @@ msgstr "" "ως σφάλμα. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "Αδυναμία εύρεσης μετα-πακέτου" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -232,12 +233,12 @@ msgstr "" "Εγκαταστήστε ένα από αυτά τα πακέτα πρώτα μέσω synaptic ή apt-get πριν να " "συνεχίσετε." -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "Αποτυχία λήψης" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -247,15 +248,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "Ανάγνωση λανθάνουσας μνήμης" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -263,11 +264,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "Δεν βρέθηκε έγκυρη εναλλακτική τοποθεσία αρχείων" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -288,11 +289,11 @@ msgstr "" " Αν επιλέξετε 'Όχι' η ενημέρωση θα ακυρωθεί." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "Δημιουργία προεπιλεγμένων πηγών;" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -306,11 +307,11 @@ msgstr "" "Να προστεθούν οι προεπιλεγμένες καταχωρίσεις για το '%s'; Αν απαντήσετε " "'Όχι' η ενημέρωση θα ακυρωθεί." -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "Μη έγκυρες πληροφορίες repository" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -318,13 +319,14 @@ msgstr "" "Η αναβάθμιση των πληροφοριών repository είχε σαν αποτέλεσμα ένα άκυρο " "αρχείο. Παρακαλώ αναφέρετε το ως σφάλμα." -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "Απενεργοποιήθηκαν πηγές τρίτων" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#, fuzzy msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" @@ -332,11 +334,11 @@ msgstr "" "Μπορείτε να τις ενεργοποιήσετε μετά την αναβάθμιση με το εργαλείο 'software-" "properties' ή με το synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "Σφάλμα κατά την ενημέρωση" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -344,11 +346,11 @@ msgstr "" "Δημιουργήθηκε ένα πρόβλημα κατά την αναβάθμιση. Αυτό συνήθως σημαίνει " "πρόβλημα δικτύου. Ελέγξτε τη σύνδεση δικτύου σας και προσπαθήστε ξανά." -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "Δεν υπάρχει αρκετός χώρος στο δίσκο" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -360,15 +362,15 @@ msgstr "" "προηγούμενων εγκαταστάσεων με την εντολή 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "Θέλετε να ξεκινήσετε την αναβάθμιση;" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "Αδυναμία εγκατάστασης των αναβαθμίσεων" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -380,11 +382,11 @@ msgstr "" "Η αναβάθμιση τώρα θα τερματιστεί. Το σύστημα σας μπορεί να γίνει ασταθές. " "Εκτελείται μια διεργασία ανάκτησης (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "Αδυναμία λήψης των αναβαθμίσεων" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -392,17 +394,18 @@ msgstr "" "Η αναβάθμιση τώρα θα τερματιστεί. Παρακαλώ ελέγξτε τη σύνδεση σας στο " "διαδίκτυο ή το μέσο εγκατάστασης και προσπαθήστε ξανά. " -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" -msgstr "Μερικά πακέτα λογισμικού δεν υποστηρίζονται πια επίσημα" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 +#, fuzzy msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" "Αυτά τα εγκατεστημένα πακέτα δεν υποστηρίζονται πια επίσημα, και τώρα " "ανήκουν στο community-supported ('universe').\n" @@ -410,23 +413,23 @@ msgstr "" "Αν δεν έχετε ενεργοποιημένο το 'universe' , θα γίνει πρόταση για απομάκρυνση " "αυτών των πακέτων στο επόμενο βήμα. " -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "Αφαίρεση παρωχημένων πακέτων;" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "Παράκα_μψη αυτου του βήματος" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "_Απομάκρυνση" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "Σφάλμα κατά την υποβολή" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -435,26 +438,31 @@ msgstr "" "παρακάτω μήνυμα για περισσότερες πληροφορίες. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "Γίνεται επαναφορά αρχικής κατάστασης συστήματος" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "Έλεγχος διαχειριστή πακέτων" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "Ενημέρωση πληροφοριών repository" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "Μη έγκυρες πληροφορίες πακέτου" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -467,19 +475,19 @@ msgstr "" "απαραίτητο πακέτο '%s'.\n" " Αυτό σημαίνει ότι πρόκειται για σημαντικό σφάλμα, παρακαλώ αναφέρετε το." -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "Ερώτηση για επιβεβαίωση" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "Γίνεται αναβάθμιση" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "Γίνεται αναζήτηση για παρωχημένο λογισμικό" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "Η αναβάθμιση συστήματος ολοκληρώθηκε." @@ -500,7 +508,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "Λήψη αρχείου %li από %li με %s/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, fuzzy, python-format msgid "About %s remaining" msgstr "Απομένουν περίπου %li λεπτά" @@ -530,23 +538,29 @@ msgstr "" #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, python-format +#, fuzzy, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" "Αντικατάσταση αρχείου ρύθμισης\n" "'%s';" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "Η εντολή 'diff' δεν βρέθηκε" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "Προέκυψε μοιραίο σφάλμα" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -562,28 +576,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "%s πακέτο πρόκειται να απομακρυνθεί." msgstr[1] "%s πακέτα πρόκειται να απομακρυνθούν." -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "%s νέο πακέτο πρόκειται να εγκατασταθεί." msgstr[1] "%s νέο πακέτα πρόκειται να εγκατασταθούν." -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "%s πακέτο πρόκειται να αναβαθμιστεί." msgstr[1] "%s πακέτα πρόκειται να αναβαθμιστούν." -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -591,7 +605,7 @@ msgid "" "You have to download a total of %s. " msgstr "Θα πρέπει να μεταφορτώσετε συνολικά %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -600,32 +614,35 @@ msgstr "" "Η αναβάθμιση μπορεί να διαρκέσει αρκετές ώρες και δεν είναι δυνατή η ακύρωση " "της αργότερα." -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" "Για να αποφύγετε απώλεια δεδομένων, κλείστε όλες τις ανοικτές εφαρμογές και " "έγγραφα." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "Δεν βρέθηκαν αναβαθμίσεις" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "Το σύστημα σας είναι ενημερωμένο" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "Το σύστημα σας έχει ήδη αναβαθμιστεί." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>Απομάκρυνση %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "Εγκατάσταση %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "Αναβάθμιση %s" @@ -659,11 +676,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "Απαιτείται επανεκκίνηση" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -701,10 +718,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Έναρξη της αναβάθμισης;</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>" msgstr "" -"<span weight=\"bold\" size=\"x-large\">Αναβάθμιση σε Ubuntu 6.06 LTS</span>" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -828,9 +843,10 @@ msgid "Verfication failed" msgstr "Αποτυχία επαλήθευσης" #: ../UpdateManager/DistUpgradeFetcher.py:222 +#, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" "Η επαλήθευση της αναβάθμισης απέτυχε. Πιθανόν να υπάρχει πρόβλημα δικτύου ή " "εξυπηρετητή. " @@ -857,18 +873,18 @@ msgstr "Λήψη αρχείου %li από %li με %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Λήψη αρχείου %li από %li με άγνωστη ταχύτητα" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "" "Η λίστα των αλλαγών δεν είναι ακόμα διαθέσιμη. Προσπαθήστε ξανά αργότερα." -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" "Η λίστα των αλλαγών δεν είναι ακόμα διαθέσιμη. Προσπαθήστε ξανά αργότερα." -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -876,134 +892,125 @@ msgstr "" "Αποτυχία λήψης της λίστας των αλλαγών. Παρακαλώ ελέγξτε τη σύνδεση σας στο " "διαδίκτυο." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.10" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "Εγκατάσταση ενημερώσεων" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "Αναβάθμιση στη τελευταία έκδοση του Ubuntu" +msgid "Normal updates" +msgstr "Εγκατάσταση ενημερώσεων" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "Εγκατάσταση ενημερώσεων" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "Αδυναμία εγκατάστασης όλων των διαθέσιμων ενημερώσεων" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Έκδοση%s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "Λήψη της λίστας των αλλαγών..." -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "Έλε_γχος" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "Μέγεθος λήψης: %s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "Το σύστημα σας είναι ενημερωμένο" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Μπορείτε να εγκαταστήσετε %s ενημέρωση" msgstr[1] "Μπορείτε να εγκαταστήσετε %s ενημερώσεις" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "Παρακαλώ περιμένετε, αυτό μπορεί να διαρκέσει λίγο χρόνο." -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "Η ενημέρωση ολοκληρώθηκε" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "Έλεγχος για διαθέσιμες ενημερώσεις" + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Νέα έκδοση: %s (Μέγεθος: %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Έκδοση%s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "Η διανομή σας δεν υποστηρίζεται πια" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -1014,17 +1021,17 @@ msgstr "" "Ubuntu Linux. Δείτε το http://www.ubuntu.com για περισσότερες πληροφορίες " "για την αναβάθμιση." -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "<b>Είναι διαθέσιμη νέα έκδοση διανομής '%s'</b>" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "Ο κατάλογος λογισμικού είναι κατεστραμμένος" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1048,58 +1055,67 @@ msgstr "" "συστήματος\" -> \"Ιδιότητες λογισμικού\"." #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"<big><b>Examining your system</b></big>\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "<big><b>Keep your system up-to-date</b></big>" +msgstr "<big><b>Διατηρήστε το σύστημα σας ενημερωμένο</b></big>" + +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "<big><b>Not all updates can be installed</b></big>" msgstr "" -"<big><b>Γίνεται ανάλυση του συστήματος σας</b></big>\n" +"<big><b>Σφάλμα ελέγχου του CD</b></big>\n" "\n" -"Οι ενημερώσεις λογισμικού μπορούν να διορθώνουν σφάλματα, κενά ασφαλείας και " -"να παρέχουν νέες λειτουργίες." +"%s" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "<big><b>Keep your system up-to-date</b></big>" -msgstr "<big><b>Διατηρήστε το σύστημα σας ενημερωμένο</b></big>" +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "<big><b>Starting update manager</b></big>" +msgstr "<b><big>Έναρξη της αναβάθμισης;</big></b>" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "Ακύρωση _λήψης αρχείων" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Αλλαγές" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "Ελε_γχος" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "Έλεγχος των καναλιών λογισμικού για ενημερώσεις" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Περιγραφή" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "Σημειώσεις έκδοσης" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "Εμφάνιση προόδου μοναδικών αρχείων" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Αναβαθμίσεις λογισμικού" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1107,32 +1123,37 @@ msgstr "" "Οι ενημερώσεις λογισμικού μπορούν να διορθώνουν σφάλματα, κενά ασφαλείας και " "να παρέχουν νέες λειτουργίες." -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "Ανα_βάθμιση" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "Αναβάθμιση στη τελευταία έκδοση του Ubuntu" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "Έλε_γχος" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "_Συνέχεια αναβάθμισης" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "Απόκρυ_ψη αυτής της πληροφορίας στο μέλλον" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "Ε_γκατάσταση ενημερώσεων" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Αλλαγές" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1242,11 +1263,12 @@ msgid "_Install security updates without confirmation" msgstr "Ε_γκατάσταση ενημερώσεων ασφαλείας χωρίς επιβεβαίωση" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 +#, fuzzy msgid "" -"<b><big>The channel information is out-of-date</big></b>\n" +"<b><big>The information about available software is out-of-date</big></b>\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1281,10 +1303,10 @@ msgstr "<b>URI:</b>" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the source that you want to add</b></" -"big>\n" +"<big><b>Enter the complete APT line of the repository that you want to add " +"as source</b></big>\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>Εισάγετε την πλήρη γραμμή APT του καναλιού που θέλετε να " @@ -1342,8 +1364,9 @@ msgid "Check for new distribution releases" msgstr "Έλεγχος για νέες εκδόσεις της διανομής" #: ../data/update-manager.schemas.in.h:3 +#, fuzzy msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1363,8 +1386,9 @@ msgid "Stores the size of the update-manager dialog" msgstr "Αποθηκεύει το μέγεθος του διαλόγου του update-manager" #: ../data/update-manager.schemas.in.h:7 +#, fuzzy msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" "Αποθηκεύει τη κατάσταση του expander που περιέχει τη λίστα των αλλαγών και " @@ -1392,211 +1416,189 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Αναβαθμίσεις Ubuntu 5.10" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "Community maintained (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Όχι-ελεύθερα (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "Community maintained (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "Community maintained (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Όχι-ελεύθερα (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Όχι-ελεύθερα (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.10" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "Εγκατάσταση ενημερώσεων" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "Με επίσημη υποστήριξη" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Αναβαθμίσεις Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Backports" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -msgid "Oficially supported" -msgstr "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" +msgstr "Με επίσημη υποστήριξη" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.04" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Αναβαθμίσεις Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 Backports" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Community maintained (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Όχι-ελεύθερα (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "Μερικά πακέτα λογισμικού δεν υποστηρίζονται πια επίσημα" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Περιορισμένα πνευματικά δικαιώματα" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Αναβαθμίσεις Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 Backports" @@ -1647,6 +1649,47 @@ msgstr "Λογισμικό συμβατό με DFSG με μη Ελεύθερες msgid "Non-DFSG-compatible Software" msgstr "Λογισμικό μη συμβατό με DFSG" +#~ msgid "Some software no longer officially supported" +#~ msgstr "Μερικά πακέτα λογισμικού δεν υποστηρίζονται πια επίσημα" + +#~ msgid "Could not find any upgrades" +#~ msgstr "Δεν βρέθηκαν αναβαθμίσεις" + +#~ msgid "Your system has already been upgraded." +#~ msgstr "Το σύστημα σας έχει ήδη αναβαθμιστεί." + +#, fuzzy +#~ msgid "" +#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +#~ msgstr "" +#~ "<span weight=\"bold\" size=\"x-large\">Αναβάθμιση σε Ubuntu 6.06 LTS</" +#~ "span>" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.10" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "Αναβάθμιση στη τελευταία έκδοση του Ubuntu" + +#~ msgid "Cannot install all available updates" +#~ msgstr "Αδυναμία εγκατάστασης όλων των διαθέσιμων ενημερώσεων" + +#~ msgid "" +#~ "<big><b>Examining your system</b></big>\n" +#~ "\n" +#~ "Software updates correct errors, eliminate security vulnerabilities and " +#~ "provide new features." +#~ msgstr "" +#~ "<big><b>Γίνεται ανάλυση του συστήματος σας</b></big>\n" +#~ "\n" +#~ "Οι ενημερώσεις λογισμικού μπορούν να διορθώνουν σφάλματα, κενά ασφαλείας " +#~ "και να παρέχουν νέες λειτουργίες." + +#~ msgid "Oficially supported" +#~ msgstr "Oficially supported" + #~ msgid "" #~ "Some updates require the removal of further software. Use the function " #~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " @@ -1755,9 +1798,6 @@ msgstr "Λογισμικό μη συμβατό με DFSG" #~ msgid "<b>Sections</b>" #~ msgstr "<b>Ενότητες</b>" -#~ msgid "Check for available updates" -#~ msgstr "Έλεγχος για διαθέσιμες ενημερώσεις" - #~ msgid "<b>Sections:</b>" #~ msgstr "<b>Ενότητες:</b>" diff --git a/po/en_AU.po b/po/en_AU.po index 9d153fcb..54dd3f08 100644 --- a/po/en_AU.po +++ b/po/en_AU.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-26 21:06+0000\n" "Last-Translator: David Symons <david.symons@liberatedcomputing.net>\n" "Language-Team: English (Australia) <en_AU@li.org>\n" @@ -129,9 +129,9 @@ msgstr "" "The key you selected could not be removed. Please report this as a bug." #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"<big><b>Error scaning the CD</b></big>\n" +"<big><b>Error scanning the CD</b></big>\n" "\n" "%s" msgstr "" @@ -147,11 +147,11 @@ msgstr "Please enter a name for the disc" msgid "Please insert a disc in the drive:" msgstr "Please insert a disc in the drive:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "Broken packages" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -159,23 +159,23 @@ msgstr "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Can't upgrade required meta-packages" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "An essential package would have to be removed" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Could not calculate the upgrade" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -184,11 +184,11 @@ msgstr "" "this as a bug. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "Error authenticating some packages" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -198,12 +198,12 @@ msgstr "" "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "Can't install '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -212,15 +212,16 @@ msgstr "" "bug. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "Can't guess meta-packag" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -230,12 +231,12 @@ msgstr "" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "Failed to fetch" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -245,15 +246,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "Reading cache" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -261,11 +262,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "No valid mirror found" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -285,11 +286,11 @@ msgstr "" "If you select 'no' the update will cancel." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "Generate default sources?" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -302,11 +303,11 @@ msgstr "" "Should default entries for '%s' be added? If you select 'No' the update will " "cancel." -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "Repository information invalid" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -314,13 +315,14 @@ msgstr "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "Third party sources disabled" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#, fuzzy msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" @@ -328,11 +330,11 @@ msgstr "" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "Error during update" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -340,11 +342,11 @@ msgstr "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "Not enough free disk space" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -356,15 +358,15 @@ msgstr "" "'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "Do you want to start the upgrade?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "Could not install the upgrades" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -376,11 +378,11 @@ msgstr "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " "was run (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "Could not download the upgrades" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -388,17 +390,18 @@ msgstr "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" -msgstr "Some software no longer officially supported" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 +#, fuzzy msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -406,23 +409,23 @@ msgstr "" "If you don't have 'universe' enabled these packages will be suggested for " "removal in the next step. " -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "Remove obsolete packages?" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "_Skip This Step" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "_Remove" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "Error during commit" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -431,26 +434,31 @@ msgstr "" "information. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "Restoring original system state" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "Checking package manager" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "Updating repository information" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "Invalid package information" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -463,19 +471,19 @@ msgstr "" "not be found anymore.\n" "This indicates a serious error, please report this as a bug." -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "Asking for confirmation" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "Upgrading" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "Searching for obsolete software" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "System upgrade is complete." @@ -496,7 +504,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "Downloading file %li of %li at %s/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, fuzzy, python-format msgid "About %s remaining" msgstr "About %li minutes remaining" @@ -526,24 +534,30 @@ msgstr "" #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, python-format +#, fuzzy, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" "Replace configuration file\n" "\n" "'%s'?" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "The 'diff' command was not found" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "A fatal error occured" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -558,28 +572,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "%s package is going to be removed." msgstr[1] "%s packages are going to be removed." -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "%s new package is going to be installed." msgstr[1] "%s new packages are going to be installed." -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "%s package is going to be upgraded." msgstr[1] "%s packages are going to be upgraded." -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -587,7 +601,7 @@ msgid "" "You have to download a total of %s. " msgstr "You have to download a total of %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -595,30 +609,33 @@ msgid "" msgstr "" "The upgrade can take several hours and cannot be canceled at any time later." -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "To prevent data loss close all open applications and documents." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "Could not find any upgrades" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "Your system is up-to-date" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "Your system has already been upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>Remove %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "Install %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "Upgrade %s" @@ -652,11 +669,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "Reboot required" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -693,10 +710,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Start the upgrade?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>" msgstr "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -819,9 +834,10 @@ msgid "Verfication failed" msgstr "Verfication failed" #: ../UpdateManager/DistUpgradeFetcher.py:222 +#, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " @@ -848,16 +864,16 @@ msgstr "Downloading file %li of %li with %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Downloading file %li of %li with unknown speed" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "The list of changes is not available yet. Please try again later." -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "The list of changes is not available yet. Please try again later." -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -865,134 +881,125 @@ msgstr "" "Failed to download the list of changes. Please check your Internet " "connection." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Ubuntu 5.10 Security Updates" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "_Install Updates" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "Upgrade to the latest version of Ubuntu" +msgid "Normal updates" +msgstr "_Install Updates" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "_Install Updates" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "Cannot install all available updates" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Version %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "Downloading the list of changes..." -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "_Check" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "Download size: %s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "Your system is up-to-date" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "You can install %s update" msgstr[1] "You can install %s updates" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "Please wait, this can take some time." -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "Update is complete" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "_Install Updates" + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "New version: %s (Size: %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Version %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "Your distribution is not supported anymore" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -1002,17 +1009,17 @@ msgstr "" "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "<b>New distribution release '%s' is available</b>" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "Software index is broken" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1036,59 +1043,67 @@ msgstr "" "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"<big><b>Examining your system</b></big>\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "<big><b>Keep your system up-to-date</b></big>" +msgstr "<big><b>Keep your system up-to-date</b></big>" + +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "<big><b>Not all updates can be installed</b></big>" msgstr "" -"<big><b>Examining your system</b></big>\n" -"\n" +"<big><b>Error scaning the CD</b></big>\n" "\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +"%s" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "<big><b>Keep your system up-to-date</b></big>" -msgstr "<big><b>Keep your system up-to-date</b></big>" +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "<big><b>Starting update manager</b></big>" +msgstr "<b><big>Start the upgrade?</big></b>" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "Cancel _Download" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Changes" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "Chec_k" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "Check the software channels for new updates" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Description" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "Release Notes" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "Show progress of single files" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Software Updates" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1096,32 +1111,37 @@ msgstr "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "U_pgrade" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "Upgrade to the latest version of Ubuntu" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "_Check" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "_Resume Upgrade" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "_Hide this information in the future" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "_Install Updates" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Changes" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1231,11 +1251,12 @@ msgid "_Install security updates without confirmation" msgstr "_Install security updates without confirmation" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 +#, fuzzy msgid "" -"<b><big>The channel information is out-of-date</big></b>\n" +"<b><big>The information about available software is out-of-date</big></b>\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1271,10 +1292,10 @@ msgstr "<b>URI:</b>" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the source that you want to add</b></" -"big>\n" +"<big><b>Enter the complete APT line of the repository that you want to add " +"as source</b></big>\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>Enter the complete APT line of the channel that you want to add</b></" @@ -1332,8 +1353,9 @@ msgid "Check for new distribution releases" msgstr "Check for new distribution releases" #: ../data/update-manager.schemas.in.h:3 +#, fuzzy msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1354,8 +1376,9 @@ msgid "Stores the size of the update-manager dialog" msgstr "Stores the size of the update-manager dialog" #: ../data/update-manager.schemas.in.h:7 +#, fuzzy msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" "Stores the state of the expander that contains the list of changes and the " @@ -1383,212 +1406,189 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 Updates" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "Community maintained (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Non-free (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "Community maintained (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "Community maintained (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Non-free (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Non-free (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Ubuntu 5.10 Security Updates" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "_Install Updates" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "Officially supported" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 Security Updates" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 Updates" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Backports" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -#, fuzzy -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "Officially supported" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 Security Updates" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 Updates" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 Backports" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Community maintained (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Non-free (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "Some software no longer officially supported" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Restricted copyright" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 5.10 Security Updates" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 5.10 Updates" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 Backports" @@ -1639,6 +1639,48 @@ msgstr "DFSG-compatible Software with Non-Free Dependencies" msgid "Non-DFSG-compatible Software" msgstr "Non-DFSG-compatible Software" +#~ msgid "Some software no longer officially supported" +#~ msgstr "Some software no longer officially supported" + +#~ msgid "Could not find any upgrades" +#~ msgstr "Could not find any upgrades" + +#~ msgid "Your system has already been upgraded." +#~ msgstr "Your system has already been upgraded." + +#, fuzzy +#~ msgid "" +#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +#~ msgstr "" +#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Ubuntu 5.10 Security Updates" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "Upgrade to the latest version of Ubuntu" + +#~ msgid "Cannot install all available updates" +#~ msgstr "Cannot install all available updates" + +#~ msgid "" +#~ "<big><b>Examining your system</b></big>\n" +#~ "\n" +#~ "Software updates correct errors, eliminate security vulnerabilities and " +#~ "provide new features." +#~ msgstr "" +#~ "<big><b>Examining your system</b></big>\n" +#~ "\n" +#~ "\n" +#~ "Software updates correct errors, eliminate security vulnerabilities and " +#~ "provide new features." + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "Officially supported" + #~ msgid "" #~ "Some updates require the removal of further software. Use the function " #~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " diff --git a/po/en_CA.po b/po/en_CA.po index decd0e07..b7a59cf9 100644 --- a/po/en_CA.po +++ b/po/en_CA.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-23 19:41+0000\n" "Last-Translator: Adam Weinberger <adamw@gnome.org>\n" "Language-Team: Canadian English <adamw@gnome.org>\n" @@ -134,7 +134,7 @@ msgstr "" #: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" -"<big><b>Error scaning the CD</b></big>\n" +"<big><b>Error scanning the CD</b></big>\n" "\n" "%s" msgstr "" @@ -147,33 +147,33 @@ msgstr "" msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -181,23 +181,23 @@ msgstr "" "The key you selected could not be removed. Please report this as a bug. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -206,24 +206,24 @@ msgstr "" "The key you selected could not be removed. Please report this as a bug. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -233,15 +233,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -249,11 +249,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -266,11 +266,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -279,43 +279,43 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 #, fuzzy msgid "Error during update" msgstr "Error removing the key" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -324,15 +324,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -341,73 +341,78 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 #, fuzzy msgid "Checking package manager" msgstr "Another package manager is running" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -417,20 +422,20 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 #, fuzzy msgid "Upgrading" msgstr "Upgrade finished" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "" @@ -450,7 +455,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, python-format msgid "About %s remaining" msgstr "" @@ -483,19 +488,25 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " @@ -505,28 +516,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 #, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 #, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, python-format msgid "" "\n" @@ -534,37 +545,40 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "" - -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 #, fuzzy -msgid "Your system has already been upgraded." -msgstr "Your system has broken packages!" +msgid "Your system is up-to-date" +msgstr "Your system is up-to-date!" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "" @@ -598,11 +612,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -633,7 +647,7 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -760,8 +774,8 @@ msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:222 msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -785,16 +799,16 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "There is a new release of Ubuntu available!" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " @@ -803,153 +817,143 @@ msgstr "" "Failed to download changes. Please check if there is an active internet " "connection." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Ubuntu 5.04 Security Updates" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "_Install" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 -msgid "Updates of Ubuntu" -msgstr "" +#: ../UpdateManager/UpdateManager.py:240 +#, fuzzy +msgid "Normal updates" +msgstr "_Install" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "_Install" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Version %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 #, fuzzy msgid "Downloading the list of changes..." msgstr "Cancel downloading the ChangeLog" -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" +#: ../UpdateManager/UpdateManager.py:551 +msgid "_Check All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:632 -#, fuzzy -msgid "Your system is up-to-date" -msgstr "Your system is up-to-date!" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, fuzzy, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Installing updates..." msgstr[1] "Installing updates..." -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "_Install" + +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Version %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "Your distribution is no longer supported" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -965,87 +969,100 @@ msgid "" msgstr "" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"<big><b>Examining your system</b></big>\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "<big><b>Keep your system up-to-date</b></big>" +#: ../data/glade/UpdateManager.glade.h:5 +msgid "<big><b>Not all updates can be installed</b></big>" msgstr "" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:6 +msgid "<big><b>Starting update manager</b></big>" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Changes" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Description" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Software Updates" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 #, fuzzy msgid "U_pgrade" msgstr "Upgrade finished" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "Upgrade finished" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "_Install Updates" msgstr "_Install" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Changes" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1158,10 +1175,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" -"<b><big>The channel information is out-of-date</big></b>\n" +"<b><big>The information about available software is out-of-date</big></b>\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1190,10 +1207,10 @@ msgstr "<b>URI:</b>" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the source that you want to add</b></" -"big>\n" +"<big><b>Enter the complete APT line of the repository that you want to add " +"as source</b></big>\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>Enter the complete APT line of the repository that you want to add</" @@ -1254,7 +1271,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:3 msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1273,7 +1290,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:7 msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" @@ -1298,218 +1315,195 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.04 Updates" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "Community maintained (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Contributed software" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 5.04 Security Updates" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "Community maintained (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "Community maintained (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Non-free (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Non-free (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "By copyright or legal issues restricted software" msgstr "US export restricted software" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 5.04 Security Updates" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Ubuntu 5.04 Security Updates" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "_Install" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 #, fuzzy msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.04 Security Updates" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -#, fuzzy -msgid "Officially supported" -msgstr "Officially supported" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.04 Security Updates" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 #, fuzzy msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.04 Security Updates" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 #, fuzzy msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.04 Updates" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.04 Updates" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 Security Updates" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 Security Updates" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 #, fuzzy -msgid "Oficially supported" +msgid "Officially supported" msgstr "Officially supported" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.04 Security Updates" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.04 Updates" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.04 Updates" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.04 Security Updates" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Community maintained (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Non-free (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "Officially supported" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Restricted copyright" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 Security Updates" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 5.04 Updates" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.04 Updates" @@ -1562,6 +1556,18 @@ msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Your system has already been upgraded." +#~ msgstr "Your system has broken packages!" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Ubuntu 5.04 Security Updates" + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "Officially supported" + +#, fuzzy #~ msgid "The following updates will be skipped:" #~ msgstr "The following packages are not upgraded:" diff --git a/po/en_GB.po b/po/en_GB.po index d0bab3cc..71e7ac0c 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-23 19:41+0000\n" "Last-Translator: Abigail Brady <morwen@evilmagic.org>\n" "Language-Team: \n" @@ -133,7 +133,7 @@ msgstr "" #: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" -"<big><b>Error scaning the CD</b></big>\n" +"<big><b>Error scanning the CD</b></big>\n" "\n" "%s" msgstr "" @@ -146,33 +146,33 @@ msgstr "" msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -180,23 +180,23 @@ msgstr "" "The key you selected could not be removed. Please report this as a bug. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -205,24 +205,24 @@ msgstr "" "The key you selected could not be removed. Please report this as a bug. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -232,15 +232,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -248,11 +248,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -265,11 +265,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -278,43 +278,43 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 #, fuzzy msgid "Error during update" msgstr "Error removing the key" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -323,15 +323,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -340,73 +340,78 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 #, fuzzy msgid "Checking package manager" msgstr "Another package manager is running" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -416,21 +421,21 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 #, fuzzy msgid "Asking for confirmation" msgstr "Checking system configuration" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 #, fuzzy msgid "Upgrading" msgstr "Upgrade finished" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "" @@ -450,7 +455,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, python-format msgid "About %s remaining" msgstr "" @@ -483,19 +488,25 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " @@ -505,28 +516,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 #, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 #, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, python-format msgid "" "\n" @@ -534,37 +545,40 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "" - -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 #, fuzzy -msgid "Your system has already been upgraded." -msgstr "Your system has broken packages!" +msgid "Your system is up-to-date" +msgstr "Your system is up-to-date!" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "" @@ -598,11 +612,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -633,7 +647,7 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -759,8 +773,8 @@ msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:222 msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -784,16 +798,16 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "There is a new release of Ubuntu available!" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " @@ -802,153 +816,143 @@ msgstr "" "Failed to download changes. Please check if there is an active internet " "connection." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Ubuntu 5.10 Security Updates" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "Installing updates..." -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 -msgid "Updates of Ubuntu" -msgstr "" +#: ../UpdateManager/UpdateManager.py:240 +#, fuzzy +msgid "Normal updates" +msgstr "Installing updates..." #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "Installing updates..." -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Version %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 #, fuzzy msgid "Downloading the list of changes..." msgstr "Downloading Changes" -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" +#: ../UpdateManager/UpdateManager.py:551 +msgid "_Check All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:632 -#, fuzzy -msgid "Your system is up-to-date" -msgstr "Your system is up-to-date!" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, fuzzy, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Installing updates..." msgstr[1] "Installing updates..." -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "Installing updates..." + +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Version %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "Your distribution is no longer supported" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -964,86 +968,98 @@ msgid "" msgstr "" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"<big><b>Examining your system</b></big>\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "<big><b>Keep your system up-to-date</b></big>" +#: ../data/glade/UpdateManager.glade.h:5 +msgid "<big><b>Not all updates can be installed</b></big>" msgstr "" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:6 +msgid "<big><b>Starting update manager</b></big>" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Changes" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Description" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Software Updates" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +msgid "_Distribution Upgrade" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "_Install Updates" msgstr "Installing updates..." -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Changes" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1158,10 +1174,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" -"<b><big>The channel information is out-of-date</big></b>\n" +"<b><big>The information about available software is out-of-date</big></b>\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1190,10 +1206,10 @@ msgstr "<b>URI:</b>" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the source that you want to add</b></" -"big>\n" +"<big><b>Enter the complete APT line of the repository that you want to add " +"as source</b></big>\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>Enter the complete APT line of the repository that you want to add</" @@ -1254,7 +1270,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:3 msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1273,7 +1289,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:7 msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" @@ -1298,217 +1314,194 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 Updates" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "Community maintained (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Contributed software" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 #, fuzzy msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "CD disk with Ubuntu 4.10 \"Warty Warthog\"" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 5.04 Updates" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "Community maintained (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "Community maintained (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Non-free (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Non-free (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "By copyright or legal issues restricted software" msgstr "US export restricted software" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 5.04 Updates" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Ubuntu 5.10 Security Updates" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "Installing updates..." - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 #, fuzzy msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "CD disk with Ubuntu 5.10 \"Breezy Badger\"" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -#, fuzzy -msgid "Officially supported" -msgstr "Officially supported" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "CD disk with Ubuntu 5.10 \"Breezy Badger\"" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 Security Updates" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 Updates" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Updates" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD disk with Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD disk with Ubuntu 5.04 \"Hoary Hedgehog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 #, fuzzy -msgid "Oficially supported" +msgid "Officially supported" msgstr "Officially supported" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 Security Updates" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 Updates" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 Updates" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "CD disk with Ubuntu 4.10 \"Warty Warthog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Community maintained (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Non-free (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 #, fuzzy msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "CD disk with Ubuntu 4.10 \"Warty Warthog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "Officially supported" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Restricted copyright" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 Security Updates" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 4.10 Updates" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 Updates" @@ -1563,6 +1556,18 @@ msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Your system has already been upgraded." +#~ msgstr "Your system has broken packages!" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Ubuntu 5.10 Security Updates" + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "Officially supported" + +#, fuzzy #~ msgid "The following updates will be skipped:" #~ msgstr "The following packages are not upgraded:" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-26 09:38+0000\n" "Last-Translator: Ricardo Pérez López <ricardo@iesdonana.org>\n" "Language-Team: Spanish <traductores@gnome.org>\n" @@ -136,9 +136,9 @@ msgstr "" "como un fallo." #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"<big><b>Error scaning the CD</b></big>\n" +"<big><b>Error scanning the CD</b></big>\n" "\n" "%s" msgstr "" @@ -154,11 +154,11 @@ msgstr "Por favor, introduzca un nombre para el disco" msgid "Please insert a disc in the drive:" msgstr "Por favor, inserte un disco en la unidad:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "Paquetes rotos" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -167,23 +167,23 @@ msgstr "" "software. Por favor, arréglelos primero usando Synaptic o apt-get antes de " "continuar." -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "No se han podido actualizar los meta-paquetes requeridos" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "Se ha tenido que desinstalar un paquete esencial" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "No se ha podido calcular la actualización" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -192,11 +192,11 @@ msgstr "" "actualización. Por favor, informe de ésto como un fallo. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "Error autenticando algunos paquetes" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -206,12 +206,12 @@ msgstr "" "problema transitorio en la red. Pruebe de nuevo más tarde. Vea abajo una " "lista de los paquetes no autenticados." -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "No se ha podido instalar «%s»" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -220,15 +220,16 @@ msgstr "" "como un fallo. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "No se ha podido determinar el meta-paquete" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -238,12 +239,12 @@ msgstr "" " Por favor, instale uno de los paquetes anteriores usando Synaptic o apt-get " "antes de proceder." -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "Error al descargar" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -253,15 +254,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "Leyendo caché" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -269,11 +270,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "No se ha encontrado un servidor espejo válido" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -294,11 +295,11 @@ msgstr "" "Si selecciona «No» se cancelará la actualización." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "¿Generar orígenes predeterminados?" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -312,11 +313,11 @@ msgstr "" "¿Deben añadirse entradas predeterminadas para «%s»? Si selecciona «No» se " "cancelará la actualización." -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "Información de repositorio no válida" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -324,13 +325,14 @@ msgstr "" "La actualización de la información del repositorio generó un archivo " "incorrecto. Por favor, informe de ésto como un error." -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "Orígenes de terceros desactivados" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#, fuzzy msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" @@ -338,11 +340,11 @@ msgstr "" "volver a activarlas tras la actualización con la herramienta «Propiedades " "del software», o con Synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "Error durante la actualización" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -351,11 +353,11 @@ msgstr "" "tipo de problema en la red, por lo que le recomendamos que compruebe su " "conexión de red y vuelva a intentarlo." -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "No hay espacio suficiente en el disco" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -367,15 +369,15 @@ msgstr "" "de instalaciones anteriores tecleando «sudo apt-get clean» en una terminal." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "¿Desea comenzar la actualización?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "No se han podido instalar las actualizaciones" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -388,11 +390,11 @@ msgstr "" "estado inutilizable. Se está llevando a cabo una recuperación (dpkg --" "configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "No se han podido descargar las actualizaciones" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -400,17 +402,18 @@ msgstr "" "La actualización se interrumpirá ahora. Por favor, compruebe su conexión a " "Internet (o su soporte de instalación) y vuelva a intentarlo. " -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" -msgstr "Algunos programas ya no están soportados oficialmente" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 +#, fuzzy msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" "Estos paquetes instalados ya no están soportados oficialmente, y desde ahora " "sólo están soportados por la comunidad («universe»).\n" @@ -418,23 +421,23 @@ msgstr "" "Si no tiene activado el «universe», se le sugerirá que desinstale estos " "paquetes en el siguiente paso. " -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "¿Desinstalar los paquetes obsoletos?" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "_Saltar este paso" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "_Quitar" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "Error durante la confirmación" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -443,26 +446,31 @@ msgstr "" "inferior para más información. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "Restaurando el estado original del sistema" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "Comprobando gestor de paquetes" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "Actualizando la información del repositorio" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "Información de paquete no válida" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -475,19 +483,19 @@ msgstr "" "posible encontrar el paquete esencial «%s».\n" "Esto indica un problema serio; por favor, informe de esto como un fallo." -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "Solicitando confirmación" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "Actualizando" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "Buscando paquetes obsoletos" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "La actualización del sistema se ha completado." @@ -508,7 +516,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "Descargando archivo %li de %li a %s/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, fuzzy, python-format msgid "About %s remaining" msgstr "Faltan %li minutos" @@ -538,23 +546,29 @@ msgstr "" #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, python-format +#, fuzzy, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" "¿Desea reemplazar el archivo de configuración\n" "«%s»?" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "No se ha encontrado el comando «diff»" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "Ha ocurrido un error fatal" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -570,28 +584,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "Se va a desinstalar %s paquete." msgstr[1] "Se van a desinstalar %s paquetes." -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "Se va a instalar %s paquete nuevo." msgstr[1] "Se van a instalar %s paquetes nuevos." -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "Se va a actualizar %s paquete." msgstr[1] "Se van a actualizar %s paquetes." -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -599,7 +613,7 @@ msgid "" "You have to download a total of %s. " msgstr "Debe descargar un total de %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -608,32 +622,35 @@ msgstr "" "La actualización puede durar varias horas, y no podrá ser cancelada después " "en ningún momento." -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" "Para prevenir la pérdida de datos, cierre todas las aplicaciones y " "documentos." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "No se ha podido encontrar ninguna actualización" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "Su sistema está actualizado" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "Su sistema ya ha sido actualizado." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>Desinstalar %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "Instalar %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "Actualizar %s" @@ -667,11 +684,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "Se requiere reiniciar el equipo" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -708,10 +725,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>¿Comenzar la actualización?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>" msgstr "" -"<span weight=\"bold\" size=\"x-large\">Actualizando a Ubuntu 6.06 LTS</span>" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -839,9 +854,10 @@ msgid "Verfication failed" msgstr "Error de verificación" #: ../UpdateManager/DistUpgradeFetcher.py:222 +#, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" "Ha fallado la verificación de la actualización. Puede haber un problema con " "la red o el servidor. " @@ -868,20 +884,20 @@ msgstr "Descargando archivo %li de %li a %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Descargando archivo %li de %li a velocidad desconocida" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "" "La lista de cambios no está disponible aún. Por favor, inténtelo de nuevo " "más tarde." -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" "La lista de cambios no está disponible aún. Por favor, inténtelo de nuevo " "más tarde." -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -889,134 +905,125 @@ msgstr "" "Hubo un fallo al descargar la lista de cambios. Por favor, compruebe su " "conexión a Internet." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Actualizaciones de seguridad de Ubuntu 5.10" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "Instalando actualizaciones" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "Actualizar a la última versión de Ubuntu" +msgid "Normal updates" +msgstr "Instalando actualizaciones" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "Instalando actualizaciones" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "No se han podido instalar todas las actualizaciones disponibles" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Versión %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "Descargando la lista de cambios..." -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "_Comprobar" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "Tamaño de descarga: %s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "Su sistema está actualizado" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Puede instalar %s actualización" msgstr[1] "Puede instalar %s actualizaciones" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "Por favor, espere; esto puede tardar un poco." -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "La actualización se ha completado" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "Comprobar las actualizaciones disponibles" + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Nueva versión: %s (Tamaño: %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Versión %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "Su distribución ya no está soportada" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -1026,17 +1033,17 @@ msgstr "" "críticas. Actualícese a una versión posterior de Ubuntu Linux. Visite http://" "www.ubuntu.com para más información sobre la actualización." -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "<b>Está disponible la nueva versión «%s» de la distribución</b>" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "El índice de software está dañado" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1060,58 +1067,67 @@ msgstr "" "software»." #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"<big><b>Examining your system</b></big>\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "<big><b>Keep your system up-to-date</b></big>" +msgstr "<big><b>Mantenga su sistema actualizado</b></big>" + +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "<big><b>Not all updates can be installed</b></big>" msgstr "" -"<big><b>Analizando su sistema</b></big>\n" +"<big><b>Error explorando el CD</b></big>\n" "\n" -"Las actualizaciones de software corrigen errores, eliminan fallos de " -"seguridad y proporcionan nuevas funcionalidades." +"%s" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "<big><b>Keep your system up-to-date</b></big>" -msgstr "<big><b>Mantenga su sistema actualizado</b></big>" +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "<big><b>Starting update manager</b></big>" +msgstr "<b><big>¿Comenzar la actualización?</big></b>" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "Cancelar _descarga" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Cambios" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "_Comprobar" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "Comprobar si hay nuevas actualizaciones en los canales de software" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Descripción" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "Notas de publicación" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "Mostrar el progreso de cada archivo individual" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Actualizaciones de software" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1119,32 +1135,37 @@ msgstr "" "Las actualizaciones de software corrigen errores, eliminan fallos de " "seguridad y proporcionan nuevas funcionalidades." -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "A_ctualizar" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "Actualizar a la última versión de Ubuntu" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "_Comprobar" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "_Continuar actualización" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "_Ocultar esta información en el futuro" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "_Instalar actualizaciones" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Cambios" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1255,11 +1276,12 @@ msgid "_Install security updates without confirmation" msgstr "_Instalar actualizaciones de seguridad sin requerir confirmación" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 +#, fuzzy msgid "" -"<b><big>The channel information is out-of-date</big></b>\n" +"<b><big>The information about available software is out-of-date</big></b>\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1294,10 +1316,10 @@ msgstr "<b>URI:</b>" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the source that you want to add</b></" -"big>\n" +"<big><b>Enter the complete APT line of the repository that you want to add " +"as source</b></big>\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>Introduzca la línea de APT completa del canal que quiera añadir</b></" @@ -1357,8 +1379,9 @@ msgid "Check for new distribution releases" msgstr "Comprobar si existen nuevas publicaciones de la distribución" #: ../data/update-manager.schemas.in.h:3 +#, fuzzy msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1379,8 +1402,9 @@ msgid "Stores the size of the update-manager dialog" msgstr "Almacena el tamaño de la ventana del gestor de actualizaciones" #: ../data/update-manager.schemas.in.h:7 +#, fuzzy msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" "Almacena el estado del expansor que contiene la lista de cambios y sus " @@ -1408,212 +1432,190 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Actualizaciones de Ubuntu 5.10" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "Mantenido por la comunidad (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Software contribuido" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 «Dapper Drake»" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "Mantenido por la comunidad (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "Mantenido por la comunidad (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Software no libre (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Software no libre (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "By copyright or legal issues restricted software" msgstr "Software con restricciones de exportación estadounidenses" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 «Dapper Drake»" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Actualizaciones de seguridad de Ubuntu 5.10" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "Instalando actualizaciones" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 «Breezy Badger»" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "Soportado oficialmente" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 «Breezy Badger»" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Actualizaciones de seguridad de Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Actualizaciones de Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "«Backports» de Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Actualizaciones de seguridad de Ubuntu 5.04" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Actualizaciones de seguridad de Ubuntu 5.04" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "Soportado oficialmente" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Actualizaciones de seguridad de Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Actualizaciones de Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "«Backports» de Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 «Breezy Badger»" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Mantenido por la comunidad (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Software no libre (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "Algunos programas ya no están soportados oficialmente" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Copyright restringido" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 Actualizaciones de seguridad" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Actualizaciones de Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "«Backports» de Ubuntu 5.10" @@ -1664,6 +1666,47 @@ msgstr "Software compatible con la DFSG con dependencias no libres" msgid "Non-DFSG-compatible Software" msgstr "Software no compatible con la DFSG" +#~ msgid "Some software no longer officially supported" +#~ msgstr "Algunos programas ya no están soportados oficialmente" + +#~ msgid "Could not find any upgrades" +#~ msgstr "No se ha podido encontrar ninguna actualización" + +#~ msgid "Your system has already been upgraded." +#~ msgstr "Su sistema ya ha sido actualizado." + +#, fuzzy +#~ msgid "" +#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +#~ msgstr "" +#~ "<span weight=\"bold\" size=\"x-large\">Actualizando a Ubuntu 6.06 LTS</" +#~ "span>" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Actualizaciones de seguridad de Ubuntu 5.10" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "Actualizar a la última versión de Ubuntu" + +#~ msgid "Cannot install all available updates" +#~ msgstr "No se han podido instalar todas las actualizaciones disponibles" + +#~ msgid "" +#~ "<big><b>Examining your system</b></big>\n" +#~ "\n" +#~ "Software updates correct errors, eliminate security vulnerabilities and " +#~ "provide new features." +#~ msgstr "" +#~ "<big><b>Analizando su sistema</b></big>\n" +#~ "\n" +#~ "Las actualizaciones de software corrigen errores, eliminan fallos de " +#~ "seguridad y proporcionan nuevas funcionalidades." + +#~ msgid "Oficially supported" +#~ msgstr "Soportado oficialmente" + #~ msgid "" #~ "Some updates require the removal of further software. Use the function " #~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " @@ -1777,9 +1820,6 @@ msgstr "Software no compatible con la DFSG" #~ msgid "<b>Sections</b>" #~ msgstr "<b>Secciones</b>" -#~ msgid "Check for available updates" -#~ msgstr "Comprobar las actualizaciones disponibles" - #~ msgid "<b>Sections:</b>" #~ msgstr "<b>Secciones:</b>" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-25 18:26+0000\n" "Last-Translator: Timo Jyrinki <timo.jyrinki@iki.fi>\n" "Language-Team: Finnish <ubuntu-fi@lists.ubuntu.com>\n" @@ -133,7 +133,7 @@ msgstr "" #: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" -"<big><b>Error scaning the CD</b></big>\n" +"<big><b>Error scanning the CD</b></big>\n" "\n" "%s" msgstr "" @@ -149,11 +149,11 @@ msgstr "Syötä nimi levylle" msgid "Please insert a disc in the drive:" msgstr "Aseta levy asemaan:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "Rikkinäisiä paketteja" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -162,23 +162,23 @@ msgstr "" "ohjelmalla. Korjaa ne käyttämällä synapticia tai apt-get-komentoa ennen " "jatkamista." -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Ei voida päivittää tarvittavia metapaketteja" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "Välttämätön paketti jouduttaisiin poistamaan" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Ei voitu tehdä tarvittavia päivitykseen liittyviä tarkistuksia" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -187,11 +187,11 @@ msgstr "" "korjata. Ilmoita tästä virheraportilla. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "Joitain paketteja todennettaessa tapahtui virhe" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -201,12 +201,12 @@ msgstr "" "Voit yrittää myöhemmin uudelleen. Alla on luettelo todentamattomista " "paketeista." -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "Ei voitu asentaa pakettia \"%s\"" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -214,15 +214,16 @@ msgstr "" "Pyydettyä pakettia ei voitu asentaa. Ole hyvä ja luo tästä virheraportti. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "Ei voitu arvata metapakettia" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -232,12 +233,12 @@ msgstr "" "Asenna jokin luetelluista paketeista synapticilla tai apt-get-ohjelmalla " "ennen jatkamista." -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "Ei voitu noutaa" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -247,15 +248,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "Luetaan kätköä" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -263,11 +264,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "Ei löytynyt sopivaa palvelinta" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -288,11 +289,11 @@ msgstr "" "Jos valitset \"Ei\", päivitys keskeytyy." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "Luo ja ota käyttöön oletusohjelmalähteet?" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -305,11 +306,11 @@ msgstr "" "Otetaanko käyttöön \"%s\":n oletuslähteet? Jos valitset \"Ei\", päivitys " "keskeytyy." -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "Virhe ohjelmavarastotiedoissa" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -317,13 +318,14 @@ msgstr "" "Ohjelmavarastotietojen päivittäminen johti epäkelpoon tiedostoon. Ilmoita " "tästä virheraportilla." -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "Kolmannen osapuolet ohjelmalähteet poissa käytöstä" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#, fuzzy msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" @@ -331,11 +333,11 @@ msgstr "" "käytöstä. Voit ottaa ne uudelleen käyttöön päivityksen jälkeen \"ohjelma-" "asetukset\"-työkalulla tai Synaptic-ohjelmalla." -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "Virhe päivitettäessä" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -343,11 +345,11 @@ msgstr "" "Päivitettäessä tapahtui virhe. Tämä on yleensä jonkinlainen verkko-ongelma. " "Tarkista verkkoyhteytesi toiminta ja yritä uudelleen." -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "Levytilaa ei ole riittävästi" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -359,15 +361,15 @@ msgstr "" "komentoa 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "Haluatko aloittaaa päivityksen?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "Ei voitu asentaa päivityksiä" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -379,11 +381,11 @@ msgstr "" "Päivitys keskeytyy. Järjestelmäsi voi olla käyttökelvottomassa tilassa. " "Korjaustoimenpiteet suoritettiin (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "Päivityksiä ei voitu noutaa" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -391,17 +393,18 @@ msgstr "" "Päivitys keskeytyy. Tarkista Internet-yhteytesi tai asennuslähteesi (esim. " "CD) toiminta ja yritä uudelleen. " -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" -msgstr "Jotkin ohjelmat eivät ole enää virallisesti tuettuja" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 +#, fuzzy msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" "Seuraavia paketteja ei enää tueta virallisesti, vaan ovat nyt yhteisön " "ylläpitämiä ('universe'-ohjelmat).\n" @@ -409,23 +412,23 @@ msgstr "" "Jos sinulla ei ole 'universe'-ohjelmakanavaa otettuna käyttöön, nämä paketit " "suositellaan poistettaviksi seuraavassa kohdassa. " -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "Poista vanhentuneet paketit?" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "_Ohita tämä kohta" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "_Poista" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "Virhe suoritettaesa" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -434,26 +437,31 @@ msgstr "" "lisätietoja. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "Palautetaan alkuperäistä järjestelmän tilaa" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "Tarkistetaan pakettienhallintaa" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "Päivitetään ohjelmavarastotietoja" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "Pakettitiedot viallisia" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -466,19 +474,19 @@ msgstr "" "enää löydetty.\n" "Tämä merkitsee vakavaa virhettä, ilmoita tästä virheraportilla." -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "Pyydetään vahvistusta" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "Päivitetään" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "Etsitään vanhetuneita ohjelmia" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "Järjestelmän päivitys on valmis." @@ -499,7 +507,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "Noudetaan tiedostoa %li/%li nopeudella %s/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, fuzzy, python-format msgid "About %s remaining" msgstr "Noin %li minuuttia jäljellä" @@ -529,23 +537,29 @@ msgstr "" #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, python-format +#, fuzzy, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" "Korvataanko asetustiedosto\n" "'%s'?" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "Komentoa 'diff' ei löytynyt" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "Vakava virhe tapahtui" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -558,28 +572,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "%s paketti poistetaan" msgstr[1] "%s pakettia poistetaan" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "%s uusi paketti asennetaan" msgstr[1] "%s uutta pakettia asennetaan" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "%s paketti päivitetään" msgstr[1] "%s pakettia päivitetään" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -587,7 +601,7 @@ msgid "" "You have to download a total of %s. " msgstr "Noudettavaa yhteensä %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -595,31 +609,34 @@ msgid "" msgstr "" "Päivitys voi kestää useita tunteja, eikä sitä voi keskeyttää enää myöhemmin." -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" "Jottei tietoja häviäisi, sulje kaikki avoinna olevat ohjelmat ja dokumentit." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "Päivityksiä ei löytynyt" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "Järjestelmäsi on ajan tasalla" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "Järjestelmäsi on jo päivitetty." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>Poista %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "Asenna %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "Päivitä %s" @@ -653,11 +670,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "Uudellenkäynnistys vaaditaan" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -695,11 +712,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Aloita päivitys?</big/</b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>" msgstr "" -"<span weight=\"bold\" size=\"x-large\">Päivitetään jakeluun: Ubuntu 6.06 " -"LTS</span>" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -824,9 +838,10 @@ msgid "Verfication failed" msgstr "Tarkistus epäonnistui" #: ../UpdateManager/DistUpgradeFetcher.py:222 +#, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" "Päivityksen tarkistaminen epäonnistui. Tämä voi johtua ongelmasta " "verkkoyhteydessä tai palvelimessa. " @@ -853,151 +868,142 @@ msgstr "Noudetaan tiedostoa %li/%li nopeudella %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Noudetaan tiedostoa %li/%li tuntemattomalla nopeudella" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "Muutosluettelo ei ole vielä saatavilla. Yritä myöhemmin uudelleen." -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "Muutosluettelo ei ole vielä saatavilla. Yritä myöhemmin uudelleen." -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" "Muutosluettelon nouto epäonnistui. Tarkista Internet-yhteytesi toimivuus." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Ubuntu 5.10 turvallisuuspäivitykset" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "Asennetaan päivityksiä" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "Päivitä Ubuntun viimeisimpään versioon" +msgid "Normal updates" +msgstr "Asennetaan päivityksiä" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "Asennetaan päivityksiä" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "Ei voida asentaa kaikkia saatavilla olevia päivityksiä" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Versio: %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "Noudetaan muutosluetteloa..." -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "_Tarkista" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 #, fuzzy msgid "None" msgstr "Ei-vapaa" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "%s täytyy noutaa" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "Järjestelmäsi on ajan tasalla" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Voit asentaa %s päivityksen" msgstr[1] "Voit asentaa %s päivitystä" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "Odota, tämä voi kestää jonkun aikaa." -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "Päivitys on valmis" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "Tarkista saatavilla olevat päivitykset" + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Uusi versio: %s (koko: %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Versio: %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "Jakeluasi ei enää tueta" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -1007,17 +1013,17 @@ msgstr "" "Päivitä uudempaan versioon Ubuntu Linuxista. Katso lisätietoja " "päivittämisestä osoitteesta http://www.ubuntu.com/" -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "<b>Uusi jakelujulkaisu \"%s\" on saatavilla</b>" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "Ohjelmaluettelo on rikkinäinen" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1040,58 +1046,67 @@ msgstr "" "\"." #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"<big><b>Examining your system</b></big>\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "<big><b>Keep your system up-to-date</b></big>" +msgstr "<big><b>Pidä järjestelmäsi ajan tasalla</b></big>" + +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "<big><b>Not all updates can be installed</b></big>" msgstr "" -"<big><b>Tarkistetaan järjestelmää</b></big>\n" +"<big><b>Virhe luettaessa CD-levyä</b></big>\n" "\n" -"Ohjelmapäivitykset korjaavat virheitä ja turva-aukkoja sekä tarjoavat uusia " -"ominaisuuksia." +"%s" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "<big><b>Keep your system up-to-date</b></big>" -msgstr "<big><b>Pidä järjestelmäsi ajan tasalla</b></big>" +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "<big><b>Starting update manager</b></big>" +msgstr "<b><big>Aloita päivitys?</big/</b>" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "Peruuta _nouto" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Muutokset" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "_Tarkista" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "Tarkista onko ohjelmakanavissa uusia päivityksiä" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Kuvaus" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "Julkaisutiedot" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "Näytä edistyminen yksittäisten tiedostojen osalta" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Ohjelmapäivitykset" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1099,32 +1114,37 @@ msgstr "" "Ohjelmapäivitykset korjaavat virheitä ja turva-aukkoja sekä tarjoavat uusia " "ominaisuuksia." -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "_Päivitä" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "Päivitä Ubuntun viimeisimpään versioon" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "_Tarkista" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "_Jatka päivitystä" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "P_iilota tämä tieto jatkossa" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "_Asenna päivitykset" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Muutokset" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1235,11 +1255,12 @@ msgid "_Install security updates without confirmation" msgstr "_Asenna turvallisuuspäivitykset kysymättä" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 +#, fuzzy msgid "" -"<b><big>The channel information is out-of-date</big></b>\n" +"<b><big>The information about available software is out-of-date</big></b>\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1273,10 +1294,10 @@ msgstr "<b>URI:</b>" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the source that you want to add</b></" -"big>\n" +"<big><b>Enter the complete APT line of the repository that you want to add " +"as source</b></big>\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>Kirjoita haluamasi kanavan koko APT-rivi</b></big>\n" @@ -1335,8 +1356,9 @@ msgid "Check for new distribution releases" msgstr "Tarkista onko uusia julkaisuja jakelusta" #: ../data/update-manager.schemas.in.h:3 +#, fuzzy msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1357,8 +1379,9 @@ msgid "Stores the size of the update-manager dialog" msgstr "Tallentaa päivitystenhallintaikkunan koon" #: ../data/update-manager.schemas.in.h:7 +#, fuzzy msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" "Tallentaa muutosluettelon ja kuvauksen näyttämän ikkunalaajennoksen tilan." @@ -1385,212 +1408,190 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 päivitykset" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "Yhteisön ylläpitämät (universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Muiden tarjoamat ohjelmat" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "Yhteisön ylläpitämät (universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "Yhteisön ylläpitämät (universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Ei-vapaat ohjelmat (multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Ei-vapaat ohjelmat (multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "By copyright or legal issues restricted software" msgstr "USA:sta vientirajoitetut ohjelmat" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Ubuntu 5.10 turvallisuuspäivitykset" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "Asennetaan päivityksiä" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "Virallisesti tuettu" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 turvallisuuspäivitykset" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 päivitykset" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 takaisinsovitukset" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "Virallisesti tuettu" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 turvallisuuspäivitykset" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 päivitykset" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 takaisinsovitukset" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Yhteisön ylläpitämät (universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Ei-vapaat ohjelmat (multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "Jotkin ohjelmat eivät ole enää virallisesti tuettuja" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Rajoitettu tekijänoikeus" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 turvallisuuspäivitykset" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 5.10 päivitykset" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 takaisinsovitukset" @@ -1642,6 +1643,47 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "DFSG-epäyhteensopivat ohjelmat" +#~ msgid "Some software no longer officially supported" +#~ msgstr "Jotkin ohjelmat eivät ole enää virallisesti tuettuja" + +#~ msgid "Could not find any upgrades" +#~ msgstr "Päivityksiä ei löytynyt" + +#~ msgid "Your system has already been upgraded." +#~ msgstr "Järjestelmäsi on jo päivitetty." + +#, fuzzy +#~ msgid "" +#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +#~ msgstr "" +#~ "<span weight=\"bold\" size=\"x-large\">Päivitetään jakeluun: Ubuntu 6.06 " +#~ "LTS</span>" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Ubuntu 5.10 turvallisuuspäivitykset" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "Päivitä Ubuntun viimeisimpään versioon" + +#~ msgid "Cannot install all available updates" +#~ msgstr "Ei voida asentaa kaikkia saatavilla olevia päivityksiä" + +#~ msgid "" +#~ "<big><b>Examining your system</b></big>\n" +#~ "\n" +#~ "Software updates correct errors, eliminate security vulnerabilities and " +#~ "provide new features." +#~ msgstr "" +#~ "<big><b>Tarkistetaan järjestelmää</b></big>\n" +#~ "\n" +#~ "Ohjelmapäivitykset korjaavat virheitä ja turva-aukkoja sekä tarjoavat " +#~ "uusia ominaisuuksia." + +#~ msgid "Oficially supported" +#~ msgstr "Virallisesti tuettu" + #~ msgid "" #~ "Some updates require the removal of further software. Use the function " #~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " @@ -1757,21 +1799,9 @@ msgstr "DFSG-epäyhteensopivat ohjelmat" #~ msgid "Remove obsolete Packages?" #~ msgstr "Poista vanhentuneet paketit?" -#~ msgid "Check for available updates" -#~ msgstr "Tarkista saatavilla olevat päivitykset" - #~ msgid "<b>Sections:</b>" #~ msgstr "<b>Osastot:</b>" -#~ msgid "" -#~ "<big><b>Error scanning the CD</b></big>\n" -#~ "\n" -#~ "%s" -#~ msgstr "" -#~ "<big><b>Virhe luettaessa CD-levyä</b></big>\n" -#~ "\n" -#~ "%s" - #~ msgid "Add Software Channels" #~ msgstr "Lisää ohjelmistokanavia" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager 0.37.2\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-26 21:09+0000\n" "Last-Translator: Claude Paroz <paroz@email.ch>\n" "Language-Team: French <gnomefr@traduc.org>\n" @@ -134,9 +134,9 @@ msgstr "" "ce bogue." #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"<big><b>Error scaning the CD</b></big>\n" +"<big><b>Error scanning the CD</b></big>\n" "\n" "%s" msgstr "" @@ -152,11 +152,11 @@ msgstr "Veuillez saisir un nom pour le disque" msgid "Please insert a disc in the drive:" msgstr "Veuillez insérer un disque dans le lecteur :" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "Paquets défectueux" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -165,23 +165,23 @@ msgstr "" "ce logiciel. Veuillez d'abord les réparer à l'aide de Synaptic ou d'apt-get " "avant de continuer." -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Les meta-paquets désirés n'ont pu être mis à jour" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "Un paquet essentiel devrait être enlevé" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Impossible de calculer la mise à jour" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -190,11 +190,11 @@ msgstr "" "rapporter ce bogue. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "Erreur lors de l'authentification de certains paquets" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -204,12 +204,12 @@ msgstr "" "problème temporaire du réseau. Vous voudrez sans doute réessayer plus tard. " "Vous trouverez ci-dessous une liste des paquets non authentifiés." -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "Impossible d'installer « %s »" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -218,15 +218,16 @@ msgstr "" "rapporter ce bogue. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "Impossible de déterminer le méta-paquet" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -236,12 +237,12 @@ msgstr "" " Veuillez d'abord installer l'un des paquets ci-dessus, en utilisant " "Synaptic ou apt-get, avant de continuer." -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "Impossible d'établir la connexion" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -251,15 +252,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "Lecture du cache" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -267,11 +268,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "Aucun mirroir valide n'a pu être trouvé" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -292,11 +293,11 @@ msgstr "" "Sinon, la mise à jour sera annulée." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "Générer les sources par défaut ?" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -310,11 +311,11 @@ msgstr "" "Les entrées par défaut pour « %s » doivent-elles être ajoutées ? Si vous " "sélectionnez « Non », la mise à jour sera annulée." -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "Informations sur le dépôt invalides" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -322,13 +323,14 @@ msgstr "" "La mise à jour des informations du dépôt a créé un fichier invalide. Merci " "de rapporter ce bogue." -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "Sources provenant de tiers désactivées" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#, fuzzy msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" @@ -336,11 +338,11 @@ msgstr "" "désactivées. Vous pouvez les réactiver après la mise à jour avec l'outil « " "Gestionnaire de canaux logiciels » ou avec Synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "Erreur lors de la mise à jour" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -349,11 +351,11 @@ msgstr "" "un problème de réseau. Veuillez vérifier votre connexion au réseau et " "réessayer." -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "Il n'y a pas assez d'espace libre sur le disque" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -366,15 +368,15 @@ msgstr "" "get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "Voulez-vous commencer la mise à jour ?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "Les mises à jour n'ont pu être installées" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -386,11 +388,11 @@ msgstr "" "Abandon de la mise à jour. Votre système est peut-être inutilisable. Une " "recupération a été lancée (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "Les mises à jour n'ont pu être téléchargées" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -398,17 +400,18 @@ msgstr "" "Abandon de la mise à jour. Veuillez vérifier votre connexion Internet ou " "votre médium d'installation puis réessayez. " -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" -msgstr "Certains logiciels ne sont plus supportés officiellement" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 +#, fuzzy msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" "Ces paquets installées ne sont plus supportés officiellement. Ils sont " "maintenant seulement supportées par la communauté ('universe').\n" @@ -416,23 +419,23 @@ msgstr "" "Si vous n'avez pas activé le dépot 'universe', la suppression de ces paquets " "vous sera suggérée lors de la prochaine étape. " -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "Enlever les paquets obsolètes ?" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "_Passer cette étape" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "_Supprimer" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "Erreur pendant la soumission" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -441,26 +444,31 @@ msgstr "" "ci-dessous pour plus d'informations. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "Restaurer le système dans son état d'origine" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "Vérification du gestionnaire de paquets" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "Mise à jour des informations sur les dépôts en cours" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "Information sur les paquet invalides" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -474,19 +482,19 @@ msgstr "" "Ceci est indique qu'une erreur important s'est produite, veuillez rapporter " "ce bogue." -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "Demande de confirmation" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "Mise à jour en cours" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "Recherche de logiciels obsolètes" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "La mise à jour du système est terminée." @@ -507,7 +515,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "Téléchargement du fichier %li sur %li à %s/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, fuzzy, python-format msgid "About %s remaining" msgstr "Environ %li minutes restantes" @@ -537,23 +545,29 @@ msgstr "" #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, python-format +#, fuzzy, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" "Remplacer le fichier de configuration\n" "« %s » ?" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "La commande « diff » n'a pu être trouvée" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "Une erreur fatale est survenue" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -569,28 +583,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "Le paquet %s va être supprimé." msgstr[1] "Les paquets %s vont être supprimés." -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "Le paquet %s va être installé." msgstr[1] "Les paquets %s vont être installés." -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "Le paquet %s va être mis à jour." msgstr[1] "Les paquets %s vont être mis à jour." -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -598,7 +612,7 @@ msgid "" "You have to download a total of %s. " msgstr "Vous devez télécharger un total de %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -607,32 +621,35 @@ msgstr "" "La mise à jour peut prendre plusieurs heures et ne peut être annulée " "ultérieurement." -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" "Pour éviter toute perte de données accidentelle, veuillez fermer toutes les " "applications et documents ouverts." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "Aucune mise à jour n'est disponible" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "Votre système est à jour" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "Votre système a déjà été mis à jour." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>Supprimer %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "Installer %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "Mettre à jour %s" @@ -666,11 +683,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "Redémarrage de l'ordinateur requis" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -708,11 +725,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Démarrer la mise à jour ?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>" msgstr "" -"<span weight=\"bold\" size=\"x-large\">Mise à jour vers Ubuntu 6.06 LTS</" -"span>" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -838,9 +852,10 @@ msgid "Verfication failed" msgstr "Échec de la vérification" #: ../UpdateManager/DistUpgradeFetcher.py:222 +#, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" "La vérification de la mise à jour à échoué. Il y a peut-être un problème " "avec le réseau ou avec le serveur. " @@ -867,20 +882,20 @@ msgstr "Téléchargement du fichier %li sur %li à %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Téléchargement du fichier %li sur %li à une vitesse inconnue" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "" "La liste des modifications n'est pas encore disponible. Veuillez réessayer " "plus tard." -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" "La liste des modifications n'est pas encore disponible. Veuillez réessayer " "plus tard." -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -888,134 +903,125 @@ msgstr "" "Échec du téléchargement de la liste des modifications. Veuillez vérifier que " "votre connexion Internet est activée." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Mises à jour de sécurité pour Ubuntu 5.10" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "Installation des mises à jour" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "Mettre à jour vers la version la plus récente d'Ubuntu" +msgid "Normal updates" +msgstr "Installation des mises à jour" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "Installation des mises à jour" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "Impossible d'installer toutes les mises à jour disponibles" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Version %s : \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "Téléchargement de la liste des nouveautés…" -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "_Vérifier" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "Taille du téléchargement : %s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "Votre système est à jour" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Vous pouvez installer %s mise à jour" msgstr[1] "Vous pouvez installer %s mises à jour" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "Veuillez patienter, cela peut prendre du temps." -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "La mise à jour est terminée" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "Rechercher les mises à jour disponibles" + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Nouvelle version : %s (taille : %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Version %s : \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "Votre distribution n'est plus supportée" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -1025,17 +1031,17 @@ msgstr "" "devez passer à une version plus récente d'Ubuntu Linux. Rendez-vous sur " "http://www.ubuntu.com pour de plus amples informations à ce sujet." -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "<b>Une nouvelle version « %s » est disponible</b>" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "La liste des logiciels est corrompue" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1060,58 +1066,67 @@ msgstr "" "Gestionnaire de canaux logiciels »" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"<big><b>Examining your system</b></big>\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "<big><b>Keep your system up-to-date</b></big>" +msgstr "<big><b>Maintenir votre système à jour</b></big>" + +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "<big><b>Not all updates can be installed</b></big>" msgstr "" -"<big><b>Recherche de mises à jour pour votre système</b></big>\n" +"<big><b>Erreur lors de l'analyse du CD</b></big>\n" "\n" -"Les mises à jour de logiciels peuvent corriger des erreurs, éliminer des " -"problèmes de sécurité et apporter de nouvelles fonctionalités." +"%s" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "<big><b>Keep your system up-to-date</b></big>" -msgstr "<big><b>Maintenir votre système à jour</b></big>" +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "<big><b>Starting update manager</b></big>" +msgstr "<b><big>Démarrer la mise à jour ?</big></b>" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "_Annuler le téléchargement" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Changements" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "_Vérifier" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "Vérifier les canaux logiciels pour de nouvelles mises à jour" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Description" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "Notes de publication" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "Afficher l'avancement des fichiers individuels" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Mises à jour des logiciels" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1119,32 +1134,37 @@ msgstr "" "Les mises à jour de logiciels peuvent corriger des erreurs, éliminer des " "problèmes de sécurité et apporter de nouvelles fonctionalités." -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "Mettre à _jour" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "Mettre à jour vers la version la plus récente d'Ubuntu" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "_Vérifier" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "_Reprendre la mise à jour" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "_Masquer ces informations à l'avenir" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "_Installer les mises à jour" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Changements" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1257,11 +1277,12 @@ msgid "_Install security updates without confirmation" msgstr "_Installer les mises à jour de sécurité sans confirmation" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 +#, fuzzy msgid "" -"<b><big>The channel information is out-of-date</big></b>\n" +"<b><big>The information about available software is out-of-date</big></b>\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1297,10 +1318,10 @@ msgstr "<b>URI :</b>" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the source that you want to add</b></" -"big>\n" +"<big><b>Enter the complete APT line of the repository that you want to add " +"as source</b></big>\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>Saisissez la ligne APT complète du canal logiciel que vous souhaitez " @@ -1360,8 +1381,9 @@ msgid "Check for new distribution releases" msgstr "Vérifier les nouvelles versions de la distribution" #: ../data/update-manager.schemas.in.h:3 +#, fuzzy msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1382,8 +1404,9 @@ msgid "Stores the size of the update-manager dialog" msgstr "Enregistre la taille de la fenêtre du gestionnaire de mises à jour" #: ../data/update-manager.schemas.in.h:7 +#, fuzzy msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" "Enregistre l'état de développement de la liste des changements et des " @@ -1411,212 +1434,190 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Mises à jour pour Ubuntu 5.10" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "Maintenu par la communauté (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Logiciel contribué" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu Dapper Drake 6.06" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "Maintenu par la communauté (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "Maintenu par la communauté (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Non-libre (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Non-libre (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "By copyright or legal issues restricted software" msgstr "Logiciel restreint à l'export (USA)" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu Dapper Drake 6.06" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Mises à jour de sécurité pour Ubuntu 5.10" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "Installation des mises à jour" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu Breezy Badger 5.10" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "Supportés officiellement" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu Breezy Badger 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Mises à jour de sécurité pour Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Mises à jour pour Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "« Backports » pour Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 Mises à jour de sécurité" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 Mises à jour de sécurité" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -msgid "Oficially supported" -msgstr "Supporté officiellement" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" +msgstr "Supportés officiellement" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Mises à jour de sécurité pour Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Mises à jour pour Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "« Backports » pour Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu Breezy Badger 5.10" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Maintenu par la communauté (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Non-libre (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "Certains logiciels ne sont plus supportés officiellement" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Copyright restreint" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 Mises à jour de sécurité" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Mises à jour pour Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "« Backports » pour Ubuntu 5.10" @@ -1669,6 +1670,47 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "Logiciel non libre (selon les lignes directrices du projet Debian)" +#~ msgid "Some software no longer officially supported" +#~ msgstr "Certains logiciels ne sont plus supportés officiellement" + +#~ msgid "Could not find any upgrades" +#~ msgstr "Aucune mise à jour n'est disponible" + +#~ msgid "Your system has already been upgraded." +#~ msgstr "Votre système a déjà été mis à jour." + +#, fuzzy +#~ msgid "" +#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +#~ msgstr "" +#~ "<span weight=\"bold\" size=\"x-large\">Mise à jour vers Ubuntu 6.06 LTS</" +#~ "span>" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Mises à jour de sécurité pour Ubuntu 5.10" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "Mettre à jour vers la version la plus récente d'Ubuntu" + +#~ msgid "Cannot install all available updates" +#~ msgstr "Impossible d'installer toutes les mises à jour disponibles" + +#~ msgid "" +#~ "<big><b>Examining your system</b></big>\n" +#~ "\n" +#~ "Software updates correct errors, eliminate security vulnerabilities and " +#~ "provide new features." +#~ msgstr "" +#~ "<big><b>Recherche de mises à jour pour votre système</b></big>\n" +#~ "\n" +#~ "Les mises à jour de logiciels peuvent corriger des erreurs, éliminer des " +#~ "problèmes de sécurité et apporter de nouvelles fonctionalités." + +#~ msgid "Oficially supported" +#~ msgstr "Supporté officiellement" + #~ msgid "" #~ "Some updates require the removal of further software. Use the function " #~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " @@ -1779,9 +1821,6 @@ msgstr "Logiciel non libre (selon les lignes directrices du projet Debian)" #~ msgid "<b>Sections</b>" #~ msgstr "<b>Catégories :</b>" -#~ msgid "Check for available updates" -#~ msgstr "Rechercher les mises à jour disponibles" - #~ msgid "<b>Sections:</b>" #~ msgstr "<b>Sections :</b>" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-30 14:37+0000\n" "Last-Translator: marcuz <marcuz@linux.it>\n" "Language-Team: Friulian <fur@li.org>\n" @@ -129,7 +129,7 @@ msgstr "" #: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" -"<big><b>Error scaning the CD</b></big>\n" +"<big><b>Error scanning the CD</b></big>\n" "\n" "%s" msgstr "" @@ -142,79 +142,79 @@ msgstr "" msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -224,15 +224,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -240,11 +240,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -257,11 +257,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -270,42 +270,42 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -314,15 +314,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -331,72 +331,77 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -406,19 +411,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "" @@ -438,7 +443,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, python-format msgid "About %s remaining" msgstr "" @@ -470,19 +475,25 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " @@ -492,28 +503,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 #, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 #, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, python-format msgid "" "\n" @@ -521,36 +532,39 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "" @@ -584,11 +598,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -619,7 +633,7 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -740,8 +754,8 @@ msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:222 msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -764,162 +778,150 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 msgid "The list of changes is not available" msgstr "" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" -#: ../UpdateManager/UpdateManager.py:228 -msgid "Important security updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 +msgid "Important security updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +msgid "Proposed updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 -msgid "Updates of Ubuntu" +#: ../UpdateManager/UpdateManager.py:240 +msgid "Normal updates" msgstr "" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 msgid "Other updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" +#: ../UpdateManager/UpdateManager.py:551 +msgid "_Check All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +msgid "Checking for updates" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -935,84 +937,96 @@ msgid "" msgstr "" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"<big><b>Examining your system</b></big>\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "<big><b>Keep your system up-to-date</b></big>" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:5 +msgid "<big><b>Not all updates can be installed</b></big>" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:6 +msgid "<big><b>Starting update manager</b></big>" msgstr "" #: ../data/glade/UpdateManager.glade.h:7 -msgid "<big><b>Keep your system up-to-date</b></big>" +msgid "Cancel _Download" msgstr "" #: ../data/glade/UpdateManager.glade.h:8 -msgid "Cancel _Download" +msgid "Changes" msgstr "" #: ../data/glade/UpdateManager.glade.h:9 -msgid "Changes" +msgid "Changes and description of the update" msgstr "" #: ../data/glade/UpdateManager.glade.h:10 -msgid "Changes and description of the update" +msgid "Chec_k" msgstr "" #: ../data/glade/UpdateManager.glade.h:11 -msgid "Chec_k" +msgid "Check the software channels for new updates" msgstr "" #: ../data/glade/UpdateManager.glade.h:12 -msgid "Check the software channels for new updates" +msgid "Description" msgstr "" #: ../data/glade/UpdateManager.glade.h:13 -msgid "Description" +msgid "Release Notes" msgstr "" #: ../data/glade/UpdateManager.glade.h:14 -msgid "Release Notes" +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +msgid "_Distribution Upgrade" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 msgid "changes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1116,10 +1130,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" -"<b><big>The channel information is out-of-date</big></b>\n" +"<b><big>The information about available software is out-of-date</big></b>\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1146,10 +1160,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 msgid "" -"<big><b>Enter the complete APT line of the source that you want to add</b></" -"big>\n" +"<big><b>Enter the complete APT line of the repository that you want to add " +"as source</b></big>\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" @@ -1199,7 +1213,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:3 msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1218,7 +1232,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:7 msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" @@ -1242,192 +1256,172 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:106 -msgid "Important security updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -msgid "Proposed updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 -msgid "No longer oficially supported" +#: ../data/channels/Ubuntu.info.in:209 +msgid "No longer officially supported" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gl\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-23 19:42+0000\n" "Last-Translator: Ignacio Casal Quinteiro <nacho.resa@gmail.com>\n" "Language-Team: Galego\n" @@ -137,7 +137,7 @@ msgstr "" #: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" -"<big><b>Error scaning the CD</b></big>\n" +"<big><b>Error scanning the CD</b></big>\n" "\n" "%s" msgstr "" @@ -150,33 +150,33 @@ msgstr "" msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -185,23 +185,23 @@ msgstr "" "erro. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -211,24 +211,24 @@ msgstr "" "erro. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -238,15 +238,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -254,11 +254,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -271,11 +271,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -284,43 +284,43 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 #, fuzzy msgid "Error during update" msgstr "Erro ao quitar a clave" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -329,15 +329,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -346,73 +346,78 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 #, fuzzy msgid "Checking package manager" msgstr "Xa hai outro xestor de paquetes en execución" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -422,20 +427,20 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 #, fuzzy msgid "Upgrading" msgstr "Actualización rematada" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "" @@ -455,7 +460,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, python-format msgid "About %s remaining" msgstr "" @@ -488,19 +493,25 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " @@ -510,28 +521,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 #, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 #, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, python-format msgid "" "\n" @@ -539,36 +550,40 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +#, fuzzy +msgid "Your system is up-to-date" +msgstr "O seu sistema está actualizado!" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "" @@ -602,11 +617,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -637,7 +652,7 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -764,8 +779,8 @@ msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:222 msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -789,16 +804,16 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "Hai unha versión nova de Ubuntu dispoñible!" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " @@ -807,154 +822,143 @@ msgstr "" "Fallou ao descargar o informe de cambios. Comprobe se ten algunha conexión " "activa." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Actualizacións de seguranza de Ubuntu 5.10" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "Instalando actualizacións..." -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 -msgid "Updates of Ubuntu" -msgstr "" +#: ../UpdateManager/UpdateManager.py:240 +#, fuzzy +msgid "Normal updates" +msgstr "Instalando actualizacións..." #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "Instalando actualizacións..." -#: ../UpdateManager/UpdateManager.py:276 -#, fuzzy -msgid "Cannot install all available updates" -msgstr "Comprobando se hai actualizacións..." - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Versión %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 #, fuzzy msgid "Downloading the list of changes..." msgstr "Descargando cambios" -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" +#: ../UpdateManager/UpdateManager.py:551 +msgid "_Check All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:632 -#, fuzzy -msgid "Your system is up-to-date" -msgstr "O seu sistema está actualizado!" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, fuzzy, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Instalando actualizacións..." msgstr[1] "Instalando actualizacións..." -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "Instalando actualizacións..." + +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Versión %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "A súa distribución xa non está soportada" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -970,86 +974,98 @@ msgid "" msgstr "" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"<big><b>Examining your system</b></big>\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "<big><b>Keep your system up-to-date</b></big>" +#: ../data/glade/UpdateManager.glade.h:5 +msgid "<big><b>Not all updates can be installed</b></big>" msgstr "" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:6 +msgid "<big><b>Starting update manager</b></big>" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Cambios" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Descrición" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Actualizacións de software" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +msgid "_Distribution Upgrade" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "_Install Updates" msgstr "Instalando actualizacións..." -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Cambios" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1163,10 +1179,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" -"<b><big>The channel information is out-of-date</big></b>\n" +"<b><big>The information about available software is out-of-date</big></b>\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1195,10 +1211,10 @@ msgstr "<b>URI:</b>" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the source that you want to add</b></" -"big>\n" +"<big><b>Enter the complete APT line of the repository that you want to add " +"as source</b></big>\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>Introduza a liña completa do repositorio APT que quere engadir</b></" @@ -1259,7 +1275,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:3 msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1278,7 +1294,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:7 msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" @@ -1303,217 +1319,194 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Actualizacións de Ubuntu 5.10" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "Mantido pola comunidade (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Software contribuido" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 #, fuzzy msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "CD con Ubuntu 4.10 \"Warty Warthog\"" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Actualizacións de Ubuntu 5.04" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "Mantido pola comunidade (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "Mantido pola comunidade (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Non libre (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Non libre (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "By copyright or legal issues restricted software" msgstr "Software con restriccións de exportación estadounidense" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Actualizacións de Ubuntu 5.04" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Actualizacións de seguranza de Ubuntu 5.10" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "Instalando actualizacións..." - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 #, fuzzy msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "CD con Ubuntu 5.10 \"Breezy Badger\"" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -#, fuzzy -msgid "Officially supported" -msgstr "Soporte oficial" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "CD con Ubuntu 5.10 \"Breezy Badger\"" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Actualizacións de seguranza de Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Actualizacións de Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Actualizacións de Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD con Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD con Ubuntu 5.04 \"Hoary Hedgehog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 #, fuzzy -msgid "Oficially supported" +msgid "Officially supported" msgstr "Soporte oficial" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Actualizacións de seguranza de Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Actualizacións de Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Actualizacións de Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "CD con Ubuntu 4.10 \"Warty Warthog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Mantido pola comunidade (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Non libre (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 #, fuzzy msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "CD con Ubuntu 4.10 \"Warty Warthog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "Soporte oficial" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Dereito de copia restrinxido" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Actualizacións de seguranza de Ubuntu 4.10" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "Actualizacións de Ubuntu 4.10" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Actualizacións de Ubuntu 5.10" @@ -1568,6 +1561,18 @@ msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Actualizacións de seguranza de Ubuntu 5.10" + +#, fuzzy +#~ msgid "Cannot install all available updates" +#~ msgstr "Comprobando se hai actualizacións..." + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "Soporte oficial" + +#, fuzzy #~ msgid "The upgrade aborts now. Please report this bug." #~ msgstr "" #~ "Non se pode quitar a clave que seleccionou. Por favor, reporte isto coma " @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager.HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-30 11:15+0000\n" "Last-Translator: Yaniv Abir <yanivabir@gmail.com>\n" "Language-Team: Hebrew <he@li.org>\n" @@ -134,9 +134,9 @@ msgid "The key you selected could not be removed. Please report this as a bug." msgstr "לא ניתן להסיר את המפתח שבחרת. אנא דווח על זה כבאג." #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"<big><b>Error scaning the CD</b></big>\n" +"<big><b>Error scanning the CD</b></big>\n" "\n" "%s" msgstr "" @@ -152,11 +152,11 @@ msgstr "" msgid "Please insert a disc in the drive:" msgstr "אנא הכניסו תקליטור לכונן:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "חבילות פגומות" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -164,69 +164,75 @@ msgstr "" "במערכת שלך נמצאות חבילות פגומות שתוכנה זו לא יכולה לתקן. אנא תקן אותן " "באמצעות synaptic או apt-get לפני שתמשיך." -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "חבילה חיונית תוסר בלית ברירה" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 +#, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" +"לאחר שהמידע על החבילות עודכן החבילה ההכרחית \"%s\" לא נמצא.\n" +"כנראה שחלה שגיאה חמורה, אנא דווחו על הדבר כבאג." #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "לא ניתן להתקין את \"%s\"" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "לא ניתן להתקין חבילה הכרחית. אנא דווחו על זה כבאג. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" +"במערכת שלך נמצאות חבילות פגומות שתוכנה זו לא יכולה לתקן. אנא תקן אותן " +"באמצעות synaptic או apt-get לפני שתמשיך." -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -236,15 +242,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -252,11 +258,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -269,11 +275,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -282,32 +288,32 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "שגיאה במהלך העדכון" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -315,11 +321,11 @@ msgstr "" "הייתה בעיה בתהליך העידכון. בדרך כלל זוהי בעיית רשת, אנא בדקו את חיבור הרשת " "שלכם ונסו שנית." -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "אין מספיק שטח בדיסק הקשיח" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -328,15 +334,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "האם ברצונך להתחיל את השדרוג?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "לא ניתן להתקין את השדרוג" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -345,74 +351,79 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "לא ניתן להוריד את השדרוג" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" "השדרוג בוטל. אנא בדקו את החיבור לאינטרנט או את מדיית ההתקנה ונסו שנית. " -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "_דלג על השלב" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "_הסר" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 #, fuzzy msgid "Restoring original system state" msgstr "מאתחל את המערכת" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -424,19 +435,19 @@ msgstr "" "לאחר שהמידע על החבילות עודכן החבילה ההכרחית \"%s\" לא נמצא.\n" "כנראה שחלה שגיאה חמורה, אנא דווחו על הדבר כבאג." -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "משדרג" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "שדרוג המערכת הושלם." @@ -457,7 +468,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "מוריד קובץ %li מתוך %li ב-%s לשנייה." #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, fuzzy, python-format msgid "About %s remaining" msgstr "נותרו %li דקות." @@ -490,19 +501,25 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " @@ -512,28 +529,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." -msgstr[0] "" -msgstr[1] "" +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." +msgstr[0] "חבילה %s תשודרג." +msgstr[1] "%s חבילות ישודרגו." -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "חבילה חדשה %s תותקן." msgstr[1] "%s חבילות חדשות יותקנו." -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "חבילה %s תשודרג." msgstr[1] "%s חבילות ישודרגו." -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -541,37 +558,41 @@ msgid "" "You have to download a total of %s. " msgstr "יש להוריד %s בסה\"כ." -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "השדרוג עשוי לקחת מספר שעות, ולא ניתן לבטלו בשלב מאוחר יותר." -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "כדי למנוע אובדן מידע אנא סגרו על תוכנית או מסמך פתוחים." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "לא ניתן למצוא שדרוג זמין" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +#, fuzzy +msgid "Your system is up-to-date" +msgstr "המערכת שלך מעודכנת!" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "המערכת כבר שודרגה." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>הסר %s </b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "התקן %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "שדרג %s" @@ -605,11 +626,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -640,7 +661,7 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -764,10 +785,11 @@ msgid "Verfication failed" msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:222 +#, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " -msgstr "" +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " +msgstr "אימות השדרוג נכשל. עלולה להיות בעיה עם הרשת או עם השרת. " #: ../UpdateManager/DistUpgradeFetcher.py:228 msgid "Authentication failed" @@ -789,171 +811,160 @@ msgstr "מוריד קובץ %li מתוך %li ב-%s לשנייה" msgid "Downloading file %li of %li with unknown speed" msgstr "מוריד קובץ %li מתוך %li במהירות לא ידועה" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "גרסה חדשה של אובונטו זמינה!" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "נכשל בהורדת השינויים. אנא בדוק אם החיבור לאינטרנט עובד." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "עדכוני אבטחה - אובונטו 5.10" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "מתקין עדכונים..." -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "משדרג את אובונטו" +msgid "Normal updates" +msgstr "מתקין עדכונים..." #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "מתקין עדכונים..." -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "לא ניתן להתקין את כל העדכונים הזמינים" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "גרסה %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 #, fuzzy msgid "Downloading the list of changes..." msgstr "מוריד שינוייים" -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" +#: ../UpdateManager/UpdateManager.py:551 +msgid "_Check All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:632 -#, fuzzy -msgid "Your system is up-to-date" -msgstr "המערכת שלך מעודכנת!" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, fuzzy, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "מתקין עדכונים..." msgstr[1] "מתקין עדכונים..." -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 #, fuzzy msgid "Update is complete" msgstr "ההורדה הושלמה" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "מתקין עדכונים..." + +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "גרסה %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "ההפצה שלך כבר לא נתמכת, סליחה." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -969,86 +980,107 @@ msgid "" msgstr "" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"<big><b>Examining your system</b></big>\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "<big><b>Keep your system up-to-date</b></big>" +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "<big><b>Not all updates can be installed</b></big>" msgstr "" +"<big><b>שגיאה בסריקת התקליטור</b></big>\n" +"\n" +"%s" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "<big><b>Starting update manager</b></big>" +msgstr "" +"<big><b>שגיאה בסריקת התקליטור</b></big>\n" +"\n" +"%s" + +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "שינויים" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "תיאור" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "עדכוני תוכנה" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "_המשך בשידרוג" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "_Install Updates" msgstr "מתקין עדכונים..." -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "שינויים" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1163,10 +1195,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" -"<b><big>The channel information is out-of-date</big></b>\n" +"<b><big>The information about available software is out-of-date</big></b>\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1195,10 +1227,10 @@ msgstr "<b>כתובת:</b>" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the source that you want to add</b></" -"big>\n" +"<big><b>Enter the complete APT line of the repository that you want to add " +"as source</b></big>\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>הכנס את שורת APT השלמה של המאגר שברצונך להוסיף</b></big>\n" @@ -1258,7 +1290,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:3 msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1277,7 +1309,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:7 msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" @@ -1302,217 +1334,194 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "עדכונים - אובונטו 5.10" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "מתוחזק ע\"י קהילה (Universe(" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "תוכנה שנתרמה" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 #, fuzzy msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "תקליטור עם אובונטו 4.10 \"Warty Warthog\"" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "עדכונים - אובונטו 5.04" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "מתוחזק ע\"י קהילה (Universe(" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "מתוחזק ע\"י קהילה (Universe(" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "לא-חופשי (Multiverse(" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "לא-חופשי (Multiverse(" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "By copyright or legal issues restricted software" msgstr "תוכנה מוגבלת בארה\"ב" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "עדכונים - אובונטו 5.04" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "עדכוני אבטחה - אובונטו 5.10" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "מתקין עדכונים..." - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 #, fuzzy msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "תקליטור עם אובונטו 5.10 \"Breezy Badger\"" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -#, fuzzy -msgid "Officially supported" -msgstr "נתמך רשמית" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "תקליטור עם אובונטו 5.10 \"Breezy Badger\"" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "עדכוני אבטחה - אובונטו 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "עדכונים - אובונטו 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "עדכונים - אובונטו 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "תקליטור עם אובונטו 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "תקליטור עם אובונטו 5.04 \"Hoary Hedgehog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 #, fuzzy -msgid "Oficially supported" +msgid "Officially supported" msgstr "נתמך רשמית" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "עדכוני אבטחה - אובונטו 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "עדכונים - אובונטו 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "עדכונים - אובונטו 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "תקליטור עם אובונטו 4.10 \"Warty Warthog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "מתוחזק ע\"י קהילה (Universe(" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "לא-חופשי (Multiverse(" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 #, fuzzy msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "תקליטור עם אובונטו 4.10 \"Warty Warthog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "נתמך רשמית" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "זכויות יוצרים מגבילות" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "עדכוני אבטחה - אובונטו 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "עדכונים - אובונטו 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "עדכונים - אובונטו 5.10" @@ -1566,6 +1575,27 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#~ msgid "Could not find any upgrades" +#~ msgstr "לא ניתן למצוא שדרוג זמין" + +#~ msgid "Your system has already been upgraded." +#~ msgstr "המערכת כבר שודרגה." + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "עדכוני אבטחה - אובונטו 5.10" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "משדרג את אובונטו" + +#~ msgid "Cannot install all available updates" +#~ msgstr "לא ניתן להתקין את כל העדכונים הזמינים" + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "נתמך רשמית" + #~ msgid "About %li seconds remaining" #~ msgstr "נותרו %li שניות." @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-23 19:46+0000\n" "Last-Translator: Rosetta Administrators <rosetta@launchpad.net>\n" "Language-Team: Hindi <hi@li.org>\n" @@ -129,7 +129,7 @@ msgstr "" #: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" -"<big><b>Error scaning the CD</b></big>\n" +"<big><b>Error scanning the CD</b></big>\n" "\n" "%s" msgstr "" @@ -142,79 +142,79 @@ msgstr "" msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -224,15 +224,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -240,11 +240,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -257,11 +257,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -270,42 +270,42 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -314,15 +314,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -331,72 +331,77 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -406,19 +411,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "" @@ -438,7 +443,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, python-format msgid "About %s remaining" msgstr "" @@ -470,19 +475,25 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " @@ -492,28 +503,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 #, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 #, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, python-format msgid "" "\n" @@ -521,36 +532,39 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "" @@ -584,11 +598,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -619,7 +633,7 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -740,8 +754,8 @@ msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:222 msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -764,162 +778,150 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 msgid "The list of changes is not available" msgstr "" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" -#: ../UpdateManager/UpdateManager.py:228 -msgid "Important security updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 +msgid "Important security updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +msgid "Proposed updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 -msgid "Updates of Ubuntu" +#: ../UpdateManager/UpdateManager.py:240 +msgid "Normal updates" msgstr "" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 msgid "Other updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" +#: ../UpdateManager/UpdateManager.py:551 +msgid "_Check All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +msgid "Checking for updates" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -935,84 +937,96 @@ msgid "" msgstr "" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"<big><b>Examining your system</b></big>\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "<big><b>Keep your system up-to-date</b></big>" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:5 +msgid "<big><b>Not all updates can be installed</b></big>" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:6 +msgid "<big><b>Starting update manager</b></big>" msgstr "" #: ../data/glade/UpdateManager.glade.h:7 -msgid "<big><b>Keep your system up-to-date</b></big>" +msgid "Cancel _Download" msgstr "" #: ../data/glade/UpdateManager.glade.h:8 -msgid "Cancel _Download" +msgid "Changes" msgstr "" #: ../data/glade/UpdateManager.glade.h:9 -msgid "Changes" +msgid "Changes and description of the update" msgstr "" #: ../data/glade/UpdateManager.glade.h:10 -msgid "Changes and description of the update" +msgid "Chec_k" msgstr "" #: ../data/glade/UpdateManager.glade.h:11 -msgid "Chec_k" +msgid "Check the software channels for new updates" msgstr "" #: ../data/glade/UpdateManager.glade.h:12 -msgid "Check the software channels for new updates" +msgid "Description" msgstr "" #: ../data/glade/UpdateManager.glade.h:13 -msgid "Description" +msgid "Release Notes" msgstr "" #: ../data/glade/UpdateManager.glade.h:14 -msgid "Release Notes" +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +msgid "_Distribution Upgrade" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 msgid "changes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1116,10 +1130,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" -"<b><big>The channel information is out-of-date</big></b>\n" +"<b><big>The information about available software is out-of-date</big></b>\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1146,10 +1160,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 msgid "" -"<big><b>Enter the complete APT line of the source that you want to add</b></" -"big>\n" +"<big><b>Enter the complete APT line of the repository that you want to add " +"as source</b></big>\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" @@ -1199,7 +1213,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:3 msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1218,7 +1232,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:7 msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" @@ -1242,192 +1256,172 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:106 -msgid "Important security updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -msgid "Proposed updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 -msgid "No longer oficially supported" +#: ../data/channels/Ubuntu.info.in:209 +msgid "No longer officially supported" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-24 20:54+0000\n" "Last-Translator: Ante Karamatić <ivoks@ubuntu.com>\n" "Language-Team: Croatian <hr@li.org>\n" @@ -130,9 +130,9 @@ msgstr "" "Ključ koji ste odabrali se ne može obrisati. Molimo prijavite ovu grešku." #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"<big><b>Error scaning the CD</b></big>\n" +"<big><b>Error scanning the CD</b></big>\n" "\n" "%s" msgstr "" @@ -148,11 +148,11 @@ msgstr "Upišite ime za disk" msgid "Please insert a disc in the drive:" msgstr "Ubacite CD u uređaj:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "Pokvareni paketi" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -160,23 +160,23 @@ msgstr "" "Vaš sistem sadrži pokvarene pakete koji nisu mogli biti popravljeni sa ovim " "programom. Popravite ih koristeći synaptic ili apt-get prije nastavljanja." -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Ne mogu nadograditi potrebne meta-pakete" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "Bitan paket bi morao biti uklonjen" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Nisam mogao riješiti nadogradnju" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -185,11 +185,11 @@ msgstr "" "prijavite ovo kao grešku. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "Greška prilikom identificiranja nekih paketa" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -199,12 +199,12 @@ msgstr "" "problem sa mrežom i trebali biste kasnije pokušati ponovo. Pogledajte popis " "neidentificiranih paketa." -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "Ne mogu instalirati '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -213,15 +213,16 @@ msgstr "" "grešku. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "Nisam mogao odrediti meta-paket" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -230,12 +231,12 @@ msgstr "" " Prije nastavljanja, molim instalirajte jedan od gore navedenih paketa " "koristeći synaptic ili apt-get." -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "Preuzimanje nije uspjelo" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -245,15 +246,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "Čitam spremnik" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -261,11 +262,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "Nisam našao ispravan zrcalni poslužitelj" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -285,11 +286,11 @@ msgstr "" "Ako odaberete 'ne' nadogradnja će se prekinuti." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "Kreirati uobičajene izvore?" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -302,11 +303,11 @@ msgstr "" "Treba li dodati uobičajene unose za '%s' ? Ako odaberete 'Ne' nadogradnja će " "prekinuti." -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "Podaci repozitorija neispravni" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -314,13 +315,14 @@ msgstr "" "Nadogradnja podataka repozitorija je rezultirala neispravnom datotekom. " "Molim, prijavite ovo kao bug." -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "Izvori trećih strana su isključeni" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#, fuzzy msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" @@ -328,11 +330,11 @@ msgstr "" "ih uključiti nakon nadogradnje sa 'software-properties' alatom ili sa " "synapticom." -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "Greška prilikom nadogradnje" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -340,11 +342,11 @@ msgstr "" "Pojavio se problem prilikom nadogradnje. Obično se radi o mrežnom problemu, " "pa vas molim da provjerite vašu mrežu i pokušate ponovo." -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "Nema dovoljno praznog mjesta na disku" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -356,15 +358,15 @@ msgstr "" "koristeći 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "Želite li pokrenuti nadogradnju?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "Nisam mogao instalirati nadogradnje" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -376,11 +378,11 @@ msgstr "" "Nadogradnja se prekida. Vaš sistem bi mogao biti u neupotrebljivom stanju. " "Obnavljanje je pokrenuto (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "Nisam mogao preuzeti nadogradnje" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -388,17 +390,18 @@ msgstr "" "Nadogradnja se prekida. Molim provjerite vašu internet vezu ili " "instalacijski medij i pokušajte ponovo. " -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" -msgstr "Neki paketi više nisu službeno podržani" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 +#, fuzzy msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" "Ovi instalirani paketi više nisu službeno podržani i sada se nalaze u " "repozitoriju kojeg održava zajednica ('Universe').\n" @@ -406,23 +409,23 @@ msgstr "" "Ako nemate omogućen 'universe' repozitorij, ovi paketi biti će predloženi za " "uklanjanje. " -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "Ukloniti zastarjele pakete?" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "_Preskoči ovaj korak" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "_Ukloni" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "Greška prilikom čina" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -431,26 +434,31 @@ msgstr "" "više informacija. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "Vraćam u početno stanje" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "Provjeravam upravitelja paketima" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "Nadograđujem podatke repozitorija" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "Neispravni podaci paketa" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -463,19 +471,19 @@ msgstr "" "naći.\n" "Ovo upućuje na ozbiljnu grešku, molim prijavite ovo kao bug." -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "Pitam za potvrdu" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "Nadograđujem" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "Tražim zastarjele programe" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "Nadogradnja sustava je završena." @@ -496,7 +504,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "Preuzimam datoteku %li od %li pri %s/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, fuzzy, python-format msgid "About %s remaining" msgstr "Otprilike je ostalo %li minuta" @@ -526,23 +534,29 @@ msgstr "" #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, python-format +#, fuzzy, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" "Zamijeniti konfiguracijsku datoteku\n" "'%s'?" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "Nisam našao naredbu 'diff'" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "Pojavila se ozbiljna greška" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -558,31 +572,31 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "%s paket će biti uklonjen." msgstr[1] "%s paketa će biti uklonjena." msgstr[2] "%s paketa će biti uklonjeno." -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "%s novi paket će biti instaliran." msgstr[1] "%s nova paketa će biti instalirana." msgstr[2] "%s novih paketa će biti instalirano." -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "%s paket će biti nadograđen." msgstr[1] "%s paketa će biti nadograđena." msgstr[2] "%s paketa će biti nadograđeno." -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -590,7 +604,7 @@ msgid "" "You have to download a total of %s. " msgstr "Morate preuzeti ukupno %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -599,30 +613,33 @@ msgstr "" "Nadogradnja može potrajati nekoliko sati i ne može biti prekinuta niti u " "jednom trenutku." -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "Da spriječite gubitak podataka zatvorite sve programe i datoteke." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "Nisam mogao naći niti jednu nadogradnju" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "Vaš sustav sadrži posljednje nadogradnje" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "Vaš sustav je već nadograđen." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>Ukloni %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "Instaliraj %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "Nadogradi %s" @@ -656,11 +673,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "Potrebno je ponovno pokretanje računala" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -699,10 +716,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Pokrenuti nadogradnju?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>" msgstr "" -"<span weight=\"bold\" size=\"x-large\">Nadograđujem na Ubuntu 6.06 LTS</span>" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -826,9 +841,10 @@ msgid "Verfication failed" msgstr "Provjera nije uspjela" #: ../UpdateManager/DistUpgradeFetcher.py:222 +#, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" "Provjera nadogradnje nije uspjela. Vjerovatno je problem u mreži ili sa " "poslužiteljem. " @@ -855,18 +871,18 @@ msgstr "Preuzimam datoteku %li od %li pri %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Preuzimam datoteku %li od %li nepoznatom brzinom" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "" "Popis promjena trenutačno nije dostupan. Molim, pokušajte ponovno kasnije." -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" "Popis promjena trenutačno nije dostupan. Molim, pokušajte ponovno kasnije." -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -874,99 +890,85 @@ msgstr "" "Preuzimanje popisa promjena nije uspjelo. Molim, provjerite svoju internet " "vezu." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Ubuntu 5.10 sigurnosne nadogradnje" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "_Instaliraj nadogradnje" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "Nadogradi na zadnju verziju Ubuntua" +msgid "Normal updates" +msgstr "_Instaliraj nadogradnje" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "_Instaliraj nadogradnje" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "Ne mogu instalirati sve dostupne nadogradnje" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Verzija %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "Preuzimam popis promjena..." -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "Pro_vjeri" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "Veličina preuzimanja: %s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "Vaš sustav sadrži posljednje nadogradnje" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -974,35 +976,40 @@ msgstr[0] "Možete instalirati %s nadogradnju" msgstr[1] "Možete instalirati %s nadogradnje" msgstr[2] "Možete instalirati %s nadogradnji" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "Molim pričekajte, ovo može potrajati." -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "Nadogradnja je gotova" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "_Instaliraj nadogradnje" + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Nova verzija: %s (Veličina: %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Verzija %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "Vaša distibucija više nije podržana" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -1012,17 +1019,17 @@ msgstr "" "na noviju verziju Ubuntu Linuxa. Pogledajte na http://www.ubuntu.com za više " "detalja o nadogradnji." -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "Popis programa je oštećen" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1045,58 +1052,67 @@ msgstr "" "ovo ponašanje u \"Sustav\" -> \"Administacija\" -> \"Postavke nadogradnje\"." #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"<big><b>Examining your system</b></big>\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "<big><b>Keep your system up-to-date</b></big>" +msgstr "<big><b>Održavajte vaš sustav nadograđenim</b></big>" + +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "<big><b>Not all updates can be installed</b></big>" msgstr "" -"<big><b>Ispitujem vaš sustav</b></big>\n" +"<big><b>Greška prilikom očitavanja CD-a</b></big>\n" "\n" -"Nadogradnje programa popravljaju greške, uklanjaju sigurnosne propuste i " -"donose nove mogućnosti." +"%s" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "<big><b>Keep your system up-to-date</b></big>" -msgstr "<big><b>Održavajte vaš sustav nadograđenim</b></big>" +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "<big><b>Starting update manager</b></big>" +msgstr "<b><big>Pokrenuti nadogradnju?</big></b>" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "Prekini _preuzimanje" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Promjene" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "P_rovjeri" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "Provjeri repozitorije za nove nadogradnje" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Opis" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "Bilješke izdanja" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "Prikaži napredak pojedinih datoteka" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Nadogradnje programa" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1104,32 +1120,37 @@ msgstr "" "Nadogradnje programa popravljaju greške, uklanjaju sigurnosne propuste i " "donose nove mogućnosti." -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "Na_dogradnja" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "Nadogradi na zadnju verziju Ubuntua" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "Pro_vjeri" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "_Nastavi nadogradnju" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "Ubuduće _sakrij ovu informaciju" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "_Instaliraj nadogradnje" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Promjene" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1239,11 +1260,12 @@ msgid "_Install security updates without confirmation" msgstr "_Instaliraj sigurnosne nadogradnje bez potvrde" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 +#, fuzzy msgid "" -"<b><big>The channel information is out-of-date</big></b>\n" +"<b><big>The information about available software is out-of-date</big></b>\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1277,10 +1299,10 @@ msgstr "<b>URI:</b>" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the source that you want to add</b></" -"big>\n" +"<big><b>Enter the complete APT line of the repository that you want to add " +"as source</b></big>\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>Unesite kompletnu APT liniju repozitorija koji želite dodati</b></" @@ -1338,8 +1360,9 @@ msgid "Check for new distribution releases" msgstr "Provjeri za nova izdanja distribucije" #: ../data/update-manager.schemas.in.h:3 +#, fuzzy msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1360,8 +1383,9 @@ msgid "Stores the size of the update-manager dialog" msgstr "Sprema veličinu prozora upravitelja nadogradnji" #: ../data/update-manager.schemas.in.h:7 +#, fuzzy msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "Sprema status programa koji sadrži popis promjena i opise" @@ -1387,212 +1411,189 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 osvježenja" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "Održavani od strane zajednice (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Neslobodni (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "Održavani od strane zajednice (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "Održavani od strane zajednice (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Neslobodni (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Neslobodni (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Ubuntu 5.10 sigurnosne nadogradnje" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "_Instaliraj nadogradnje" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "Službeno podržani" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 sigurnosne nadogradnje" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 osvježenja" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 backporti" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -#, fuzzy -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "Službeno podržani" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 sigurnosne nadogradnje" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 osvježenja" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 backporti" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Održavani od strane zajednice (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Neslobodni (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "Neki paketi više nisu službeno podržani" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Ograničeno autorsko pravo" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 5.10 sigurnosne nadogradnje" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 5.10 osvježenja" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 backporti" @@ -1643,6 +1644,48 @@ msgstr "DFSG-kompatibilni programi sa neslobodnim ovisnostima" msgid "Non-DFSG-compatible Software" msgstr "DFSG-nekompatibilni programi" +#~ msgid "Some software no longer officially supported" +#~ msgstr "Neki paketi više nisu službeno podržani" + +#~ msgid "Could not find any upgrades" +#~ msgstr "Nisam mogao naći niti jednu nadogradnju" + +#~ msgid "Your system has already been upgraded." +#~ msgstr "Vaš sustav je već nadograđen." + +#, fuzzy +#~ msgid "" +#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +#~ msgstr "" +#~ "<span weight=\"bold\" size=\"x-large\">Nadograđujem na Ubuntu 6.06 LTS</" +#~ "span>" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Ubuntu 5.10 sigurnosne nadogradnje" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "Nadogradi na zadnju verziju Ubuntua" + +#~ msgid "Cannot install all available updates" +#~ msgstr "Ne mogu instalirati sve dostupne nadogradnje" + +#~ msgid "" +#~ "<big><b>Examining your system</b></big>\n" +#~ "\n" +#~ "Software updates correct errors, eliminate security vulnerabilities and " +#~ "provide new features." +#~ msgstr "" +#~ "<big><b>Ispitujem vaš sustav</b></big>\n" +#~ "\n" +#~ "Nadogradnje programa popravljaju greške, uklanjaju sigurnosne propuste i " +#~ "donose nove mogućnosti." + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "Službeno podržani" + #~ msgid "" #~ "Some updates require the removal of further software. Use the function " #~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager.HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-28 21:22+0000\n" "Last-Translator: Gabor Kelemen <kelemengabor@linuxforum.hu>\n" "Language-Team: Hungarian <gnome@gnome.hu>\n" @@ -129,9 +129,9 @@ msgstr "" "Az Ön által kijelölt kulcs nem távolítható el. Kérem, jelentse ezt hibaként." #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"<big><b>Error scaning the CD</b></big>\n" +"<big><b>Error scanning the CD</b></big>\n" "\n" "%s" msgstr "" @@ -147,11 +147,11 @@ msgstr "Kérem, adja meg a lemez nevét" msgid "Please insert a disc in the drive:" msgstr "Kérem, helyezzen be egy lemezt a meghajtóba:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "Törött csomagok" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -160,23 +160,23 @@ msgstr "" "javíthatóak. Kérem, először javítsa ki őket a synaptic vagy az apt-get " "segítségével." -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "A szükséges meta-csomagok nem frissíthetőek" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "Egy alapvető csomag eltávolításra kerülne" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Nem tudom megtervezni a frissítés menetét" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -185,11 +185,11 @@ msgstr "" "jelentse ezt hibaként. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "Hiba történt néhány csomag hitelesítése közben" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -199,27 +199,28 @@ msgstr "" "hálózati probléma okozza, ezért érdemes később újra megpróbálni. Az alábbi " "lista a hitelesíthetetlen csomagokat tartalmazza." -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "'%s' nem telepíthető" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "Egy szükséges csomag nem telepíthető. Kérem, jelentse ezt hibaként. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "Nem tudom megállapítani a meta-csomagot" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -229,12 +230,12 @@ msgstr "" " Kérem, előbb telepítse a fenti csomagok egyikét a synaptic vagy az apt-get " "használatával." -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "A letöltés meghiúsult" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -244,15 +245,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "Gyorsítótár beolvasása" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -260,11 +261,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "nem található érvényes tükör" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -285,11 +286,11 @@ msgstr "" "A \"Nem\" kiválasztása megszakítja a frissítést." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "Alapértelmezett források ismételt előállítása?" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -303,11 +304,11 @@ msgstr "" "Kíván alapértelmezett bejegyzéseket adni a következőhöz: %s? Ha a Nem " "gombott választja, a frissítés félbeszakad." -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "Érvénytelen csomagtároló információ" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -315,13 +316,14 @@ msgstr "" "A csomagtároló információ frissítése hibás fájlt eredményezett. Kérem, " "jelentse ezt hibaként." -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "A külső források letiltva" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#, fuzzy msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" @@ -329,11 +331,11 @@ msgstr "" "a frissítés után a Szoftvertulajdonságok eszközzel, vagy a Synaptic " "csomagkezelővel." -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "Hiba történt a frissítés közben" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -341,11 +343,11 @@ msgstr "" "Hiba lépett fel a frissítés közben. Ez többnyire hálózati problémára utal. " "Kérem, ellenőrizze a hálózati kapcsolatot és próbálja újra." -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "Nincs elég szabad hely a merevlemezen" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -357,15 +359,15 @@ msgstr "" "fájljait a \"sudo apt-get clean\" parancs kiadásával." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "Biztosan el szeretné kezdeni a frissítést?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "A frissítések nem telepíthetők" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -377,11 +379,11 @@ msgstr "" "A frissítés most félbeszakad. Előfordulhat, hogy a rendszer használhatatlan " "állapotban van. Egy helyreállítás került futtatásra (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "A frissítések nem tölthetők le" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -389,17 +391,18 @@ msgstr "" "A frissítés most félbeszakad. Kérem, ellenőrizze a hálózati kapcsolatot vagy " "a telepítő médiát és próbálja újra. " -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" -msgstr "Néhány szoftver már nincs hivatalosan támogatva" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 +#, fuzzy msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" "Ezek a telepített csomagok már nincsenek hivatalosan támogatva, csak a " "közösség által (\"universe\").\n" @@ -407,23 +410,23 @@ msgstr "" "Ha nincs engedélyezve a \"universe\" tároló, akkor ezek a csomagok a " "következő lépésben ki lesznek jelölve eltávolításra. " -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "Eltávolítja az elavult csomagokat?" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "Ezen lé_pés kihagyása" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "_Eltávolítás" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "Hiba a módosítások rögzítése közben" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -432,26 +435,31 @@ msgstr "" "információkat tartalmaz a hibára vonatkozóan. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "A rendszer eredeti állapotának helyreállítása" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "Csomagkezelő ellenőrzése" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "Csomagtároló információ frissítése" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "Érvénytelen csomaginformációk" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -464,19 +472,19 @@ msgstr "" "található többé.\n" "Ez egy komoly problémát jelez, jelentse hibaként." -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "Megerősítés kérése" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "Frissítés folyamatban" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "Elavult szoftverek keresése" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "A rendszer frissítése befejeződött." @@ -497,7 +505,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "Fájlok letöltése (%li, összesen: %li), sebesség: %s/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, fuzzy, python-format msgid "About %s remaining" msgstr "Kb. %li perc van hátra" @@ -527,24 +535,30 @@ msgstr "" #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, python-format +#, fuzzy, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" "Lecseréli a(z)\n" "\"%s\"\n" "konfigurációs fájlt?" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "A 'diff' parancs nem található" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "Végzetes hiba történt" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -560,25 +574,25 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "%s csomag el lesz távolítva." -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "%s új csomag kerül telepítésre." -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "%s csomag frissítve lesz." -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -586,7 +600,7 @@ msgid "" "You have to download a total of %s. " msgstr "Összes letöltendő adatmennyiség: %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -595,32 +609,35 @@ msgstr "" "A frissítés több órát is igénybe vehet és a későbbiek során nem lehet " "bármikor megszakítani." -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" "Az esetleges adatvesztés elkerülése érdekében zárjon be minden nyitott " "alkalmazást és dokumentumot." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "Nincs elérhető frissítés" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "A rendszere naprakész" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "Az Ön rendszere már frissítve lett." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>%s eltávolítása</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "%s telepítése" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "%s frissítése" @@ -654,11 +671,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "Újraindítás szükséges" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -695,11 +712,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Megkezdi a frissítést?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>" msgstr "" -"<span weight=\"bold\" size=\"x-large\">Frissítés az Ubuntu 6.06 LTS " -"változatra</span>" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -824,9 +838,10 @@ msgid "Verfication failed" msgstr "Az ellenőrzés meghiúsult" #: ../UpdateManager/DistUpgradeFetcher.py:222 +#, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" "A frissítés ellenőrzése meghiúsult. Probléma lehet a hálózattal vagy a " "kiszolgálóval. " @@ -853,16 +868,16 @@ msgstr "%li. fájl letöltése, összesen: %li, sebesség: %s/mp" msgid "Downloading file %li of %li with unknown speed" msgstr "%li. fájl letöltése, összesen: %li, ismeretlen sebességgel" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "A módosítások listája még nem érhető el. Próbálkozzon később." -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "A módosítások listája még nem érhető el. Próbálkozzon később." -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -870,133 +885,124 @@ msgstr "" "A módosítások listájának letöltése meghiúsult. Ellenőrizze az " "internetkapcsolatát." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Ubuntu 5.10 biztonsági frissítések" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "_Telepítés" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "Frissítés az Ubuntu legújabb változatára" +msgid "Normal updates" +msgstr "_Telepítés" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "_Telepítés" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "Nem telepíthető minden rendelkezésre álló frissítés" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "%s verzió: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "Módosítások listájának letöltése..." -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "_Ellenőrzés" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "Letöltés mérete: %s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "A rendszere naprakész" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "%s frissítést telepíthet" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "Kis türelmet, ez eltarthat egy ideig." -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "A frissítés befejeződött" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "_Telepítés" + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Új verzió: %s (Méret: %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "%s verzió: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "A terjesztés már nem támogatott" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -1006,17 +1012,17 @@ msgstr "" "Frissítsen az Ubuntu Linux egy újabb változatára. A frissítéssel kapcsolatos " "információkat az http://www.ubuntu.com weboldalon talál." -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "<b>A disztribúció új \"%s\" kiadása elérhető</b>" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "A szoftverindex sérült" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1041,58 +1047,67 @@ msgstr "" "menüpont alatt változtathatja meg." #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"<big><b>Examining your system</b></big>\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "<big><b>Keep your system up-to-date</b></big>" +msgstr "<big><b>Tartsa naprakészen a rendszerét</b></big>" + +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "<big><b>Not all updates can be installed</b></big>" msgstr "" -"<big><b>A rendszer elemzése</b></big>\n" +"<big><b>Hiba történt a CD beolvasása közben</b></big>\n" "\n" -"A szoftverfrissítések programhibákat javítanak, megszüntetik a biztonsági " -"sebezhetőségeket és új szolgáltatásokat biztosítanak." +"%s" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "<big><b>Keep your system up-to-date</b></big>" -msgstr "<big><b>Tartsa naprakészen a rendszerét</b></big>" +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "<big><b>Starting update manager</b></big>" +msgstr "<b><big>Megkezdi a frissítést?</big></b>" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "Letöltés _megszakítása" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Módosítások" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "_Ellenőrzés" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "Frissítések keresése a szoftvercsatornákon" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Leírás" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "Kiadási megjegyzések" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "Egyes fájlok állapotának mutatása" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Szoftverfrissítések" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1100,32 +1115,37 @@ msgstr "" "A szoftverfrissítések kijavítják a programhibákat, biztonsági " "sebezhetőségeket és új szolgáltatásokat biztosítanak." -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "_Frissítés" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "Frissítés az Ubuntu legújabb változatára" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "_Ellenőrzés" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "Frissítés _folytatása" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "_A jövőben ne mutassa ezt az információt" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "_Telepítés" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Módosítások" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1235,11 +1255,12 @@ msgid "_Install security updates without confirmation" msgstr "_Biztonsági frissítések telepítése megerősítés nélkül" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 +#, fuzzy msgid "" -"<b><big>The channel information is out-of-date</big></b>\n" +"<b><big>The information about available software is out-of-date</big></b>\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1273,10 +1294,10 @@ msgstr "<b>URI:</b>" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the source that you want to add</b></" -"big>\n" +"<big><b>Enter the complete APT line of the repository that you want to add " +"as source</b></big>\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>Adja meg a felvenni kívánt csatorna teljes APT sorát</b></big>\n" @@ -1333,8 +1354,9 @@ msgid "Check for new distribution releases" msgstr "Új disztribúciókiadások keresése" #: ../data/update-manager.schemas.in.h:3 +#, fuzzy msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1355,8 +1377,9 @@ msgid "Stores the size of the update-manager dialog" msgstr "A frissítéskezelő ablak méretének tárolása" #: ../data/update-manager.schemas.in.h:7 +#, fuzzy msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" "Eltárolja a változások listáját és a megnevezéseket tartalmazó lista " @@ -1384,212 +1407,189 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 frissítések" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "Közösségi karbantartású (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Nem-szabad (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 \"Dapper Drake\"" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "Közösségi karbantartású (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "Közösségi karbantartású (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Nem-szabad (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Nem-szabad (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 \"Dapper Drake\"" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Ubuntu 5.10 biztonsági frissítések" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "_Telepítés" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "Hivatalosan támogatott" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 biztonsági frissítések" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 frissítések" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 visszaportolt csomagok" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -#, fuzzy -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "Hivatalosan támogatott" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 biztonsági frissítések" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 frissítések" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 visszaportolt csomagok" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Közösségi karbantartású (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Nem-szabad (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "Néhány szoftver már nincs hivatalosan támogatva" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Szerzői jogi korlátozás alatt" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 5.10 biztonsági frissítések" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 5.10 frissítések" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 visszaportolt csomagok" @@ -1640,6 +1640,48 @@ msgstr "DFSG-kompatibilis szoftver nem-szabad függőségekkel" msgid "Non-DFSG-compatible Software" msgstr "Nem DFSG-kompatibilis szoftver" +#~ msgid "Some software no longer officially supported" +#~ msgstr "Néhány szoftver már nincs hivatalosan támogatva" + +#~ msgid "Could not find any upgrades" +#~ msgstr "Nincs elérhető frissítés" + +#~ msgid "Your system has already been upgraded." +#~ msgstr "Az Ön rendszere már frissítve lett." + +#, fuzzy +#~ msgid "" +#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +#~ msgstr "" +#~ "<span weight=\"bold\" size=\"x-large\">Frissítés az Ubuntu 6.06 LTS " +#~ "változatra</span>" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Ubuntu 5.10 biztonsági frissítések" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "Frissítés az Ubuntu legújabb változatára" + +#~ msgid "Cannot install all available updates" +#~ msgstr "Nem telepíthető minden rendelkezésre álló frissítés" + +#~ msgid "" +#~ "<big><b>Examining your system</b></big>\n" +#~ "\n" +#~ "Software updates correct errors, eliminate security vulnerabilities and " +#~ "provide new features." +#~ msgstr "" +#~ "<big><b>A rendszer elemzése</b></big>\n" +#~ "\n" +#~ "A szoftverfrissítések programhibákat javítanak, megszüntetik a biztonsági " +#~ "sebezhetőségeket és új szolgáltatásokat biztosítanak." + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "Hivatalosan támogatott" + #~ msgid "" #~ "Some updates require the removal of further software. Use the function " #~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-28 18:46+0000\n" "Last-Translator: Andy Apdhani <imtheface@gmail.com>\n" "Language-Team: Indonesian <id@li.org>\n" @@ -129,9 +129,9 @@ msgstr "" "Berkas yang anda pilih tidak dapat dihapus. Silakan laporkan ini sebagai bug." #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"<big><b>Error scaning the CD</b></big>\n" +"<big><b>Error scanning the CD</b></big>\n" "\n" "%s" msgstr "" @@ -147,11 +147,11 @@ msgstr "Silakan masukkan nama untuk cakram" msgid "Please insert a disc in the drive:" msgstr "Silakan masukan cakram ke dalam penggerak" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "Paket rusak" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -160,23 +160,23 @@ msgstr "" "perangkat lunak ini. Silakan perbaiki terlebih dahulu dengan menggunakan " "synaptic atau apt-get sebelum melanjutkan hal ini." -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Tidak dapat memutakhirkan meta-paket yang dibutuhkan" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "Paket esensial akan dihapus" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Tidak dapat menghitung pemutakhiran" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -185,11 +185,11 @@ msgstr "" "bug. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "Kesalahan membuktikan keabsahan beberapa paket" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -199,12 +199,12 @@ msgstr "" "mungkin karena masalah pada jaringan. Anda dapat mencobanya beberapa saat " "lagi. Lihat senarai dari paket yang belum terbukti keabsahnya dibawah ini." -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "Tidak dapat menginstal '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -213,15 +213,16 @@ msgstr "" "ini sebagai bug. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "Tidak dapat menebak meta-paket" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -231,12 +232,12 @@ msgstr "" " Silakan instal dahulu salah satu paket di atas dengan menggunakan synaptic " "atau apt-get sebelum melanjutkan." -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "Gagal untuk fetch" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -246,15 +247,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "Membaca cache" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -262,11 +263,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "Tidak menemukan mirror yang valid" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -286,11 +287,11 @@ msgstr "" "Jika anda pilih 'no' pemutakhiran akan dibatalkan." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "Membuat sumber baku?" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -303,11 +304,11 @@ msgstr "" "Haruskah entri baku untuk '%s' ditambahkan? Jika anda pilih 'No' " "pemutakhiran akan dibatalkan." -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "Informasi gudang tidak valid" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -315,13 +316,14 @@ msgstr "" "Meng-upgrade informasi gudang berakhir di dalam berkas yang tidak benar. " "Silakan laporkan ini sebagai bug." -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "Sumber dari pihak ketiga dilumpukan" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#, fuzzy msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" @@ -329,11 +331,11 @@ msgstr "" "dapat mengaktifkan kembali setelah upgrade dengan alat 'software-properties' " "atau dengan synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "Kesalahan pada waktu pemutakhiran" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -341,11 +343,11 @@ msgstr "" "Terjadi masalah pada waktu pemutakhiran. Ini biasanya karena masalah " "jaringan, silakan periksa koneksi jaringan anda dan ulangi." -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "Kapasitas cakram tidak mencukupi" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -357,15 +359,15 @@ msgstr "" "instalasi terdahulu dengan menggunakan 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "Apakah anda ingin memulai pemutakhiran?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "Tidak dapat menginstal pemutakhiran" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -377,11 +379,11 @@ msgstr "" "Upgrade dibatalkan sekarang. Sistem anda dapat menjadi tidak dapat " "digunakan. Perbaikan sedang berjalan (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "Tidak dapat mengunduh pemutakhiran" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -389,17 +391,18 @@ msgstr "" "Upgrade dibatalkan sekarang. Silakan periksa koneksi internet anda atau " "media instalasi dan coba lagi nanti. " -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" -msgstr "Beberapa perangkat lunak tidak lagi resmi disokong" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 +#, fuzzy msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" "Paket terinstal ini tidak lagi mendapat sokongan resmi, dan sekarang hanya " "disokong melalui komunitas ('universe').\n" @@ -407,23 +410,23 @@ msgstr "" "Jika anda tidak mengaktifkan komponen 'universe' paket ini akan diajurkan " "untuk penghapusan dalam langkah selanjutnya. " -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "Hapus paket usang?" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "_Lewati Langkah Ini" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "_Hapus" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "Kesalahan pada waktu commit" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -432,26 +435,31 @@ msgstr "" "bawah untuk informasi lebih lanjut. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "Sistem dikembalikan ke keadaan awal" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "Memeriksa manajer paket" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "Memutakhirkan informasi gudang" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "Informasi paket tidak valid" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -465,19 +473,19 @@ msgstr "" "Ini mengindikasikan adanya kesalahan serius, silakan laporkan ini sebagai " "bug." -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "Menanyakan konfigurasi" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "Meng-upgrade" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "Mencari perangkat lunak usang" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "Upgrade sistem telah selesai." @@ -498,7 +506,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "Mengunduh berkas %li dari %li pada %s/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, fuzzy, python-format msgid "About %s remaining" msgstr "Sekitar %li menit lagi" @@ -528,23 +536,29 @@ msgstr "" #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, python-format +#, fuzzy, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" "Mengganti berkas konfigurasi\n" "'%s'?" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "Perintah 'diff' tidak dapat ditemukan" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "Terjadi kesalahan fatal" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -559,25 +573,25 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "%s paket akan dihapus." -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "%s paket baru akan diinstal." -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "%s paket akan diupgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -585,7 +599,7 @@ msgid "" "You have to download a total of %s. " msgstr "Anda harus mengunduh sebanyak %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -594,31 +608,34 @@ msgstr "" "Upgrade membutuhkan waktu beberapa jam dan tidak dapat dibatalkan setelah " "itu." -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" "Untuk mencegah kehilangan data silakan tutup seluruh aplikasi dan dokumen." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "Tidak dapat menemukan upgrade apapun" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "Sistem anda telah up-to-date" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "Sistem anda telah diupgrade" +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>Hapus %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "Instal %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "Upgrade %s" @@ -652,11 +669,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "Diperlukan reboot" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -693,10 +710,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Mulai upgrade?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>" msgstr "" -"<span weight=\"bold\" size=\"x-large\">Mengupgrade ke Ubuntu 6.06 LTS</span>" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -819,9 +834,10 @@ msgid "Verfication failed" msgstr "Verifikasi gagal" #: ../UpdateManager/DistUpgradeFetcher.py:222 +#, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" "Gagal memeriksa upgrade. Mungkin terjadi masalah dengan jaringan atau dengan " "server. " @@ -848,16 +864,16 @@ msgstr "Mengunduh berkas %li dari %li dengan %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Kecepatan mengunduh berkas %li dari %li tidak diketahui" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "Senarai dari perubahan belum tersedia. Silakan coba lagi nanti." -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "Senarai dari perubahan belum tersedia. Silakan coba lagi nanti." -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -865,133 +881,124 @@ msgstr "" "Gagal mengunduh senarai dari perubahan. Silakan periksa koneksi Internet " "anda." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Pemutakhiran lewat Internet" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "_Instal Update" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "Upgrade ke versi Ubuntu terakhir" +msgid "Normal updates" +msgstr "_Instal Update" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "_Instal Update" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "Tidak dapat menginstal semua pemutakhiran yang tersedia" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Versi %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "Mengunduh senarai dari perubahan..." -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "_Periksa" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "Ukuran unduh: %s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "Sistem anda telah up-to-date" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Anda dapat instal %s pemutakhiran" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "Silakan tunggu, hal ini membutuhkan beberapa waktu." -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "Pemutakhiran selesai" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "_Instal Update" + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Versi baru: %s (Ukuran: %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Versi %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "Distribusi anda tidak disokong lagi" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -1001,17 +1008,17 @@ msgstr "" "lebih lanjut. Upgrade ke versi berikut dari Ubuntu Linux. Lihat http://www." "ubuntu.com untuk informasi lebih lanjut." -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "<b>Luncuran distribusi baru '%s' telah tersedia</b>" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "Indeks perangkat lunak telah rusak" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1035,58 +1042,67 @@ msgstr "" "Properties\"." #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"<big><b>Examining your system</b></big>\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "<big><b>Keep your system up-to-date</b></big>" +msgstr "<big><b>Memelihara sistem anda up-to-date</b></big>" + +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "<big><b>Not all updates can be installed</b></big>" msgstr "" -"<big><b>Menguji sistem anda</b></big>\n" +"<big><b>Kesalahan memindai CD</b></big>\n" "\n" -"Pemutakhiran perangkat lunak memperbaiki kesalahan, melenyapkan kelemahan " -"keamanan dan menyediakan fitur baru." +"%s" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "<big><b>Keep your system up-to-date</b></big>" -msgstr "<big><b>Memelihara sistem anda up-to-date</b></big>" +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "<big><b>Starting update manager</b></big>" +msgstr "<b><big>Mulai upgrade?</big></b>" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "Batalkan _Unduh" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Perubahan" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "Peri_ksa" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "Periksa kanal perangkal lunak untuk pemutakhiran terbaru" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Deskripsi" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "Catatan Luncuran" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "Tampilkan kemajuan dari berkas tunggal" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Perangkat Lunak Mutakhir" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1094,32 +1110,37 @@ msgstr "" "Perangkat lunak nutakhir memperbaiki kesalahan, menyingkirkan kelemahan " "keamanan dan menyediakan fitur baru." -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "U_pgrade" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "Upgrade ke versi Ubuntu terakhir" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "_Periksa" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "_Lanjutkan Upgrade" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "_Sembunyikan informasi ini di masa depan" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "_Instal Update" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Perubahan" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1229,11 +1250,12 @@ msgid "_Install security updates without confirmation" msgstr "_Instal pemutakhiran keamanan tanpa perlu konfirmasi" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 +#, fuzzy msgid "" -"<b><big>The channel information is out-of-date</big></b>\n" +"<b><big>The information about available software is out-of-date</big></b>\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1267,10 +1289,10 @@ msgstr "<b>URI:</b>" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the source that you want to add</b></" -"big>\n" +"<big><b>Enter the complete APT line of the repository that you want to add " +"as source</b></big>\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>Masukkan baris lengkap APT dari kanal yang ingin anda tambah </b></" @@ -1328,8 +1350,9 @@ msgid "Check for new distribution releases" msgstr "Periksa untuk luncuran distribusi baru" #: ../data/update-manager.schemas.in.h:3 +#, fuzzy msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1350,8 +1373,9 @@ msgid "Stores the size of the update-manager dialog" msgstr "Menyimpan ukuran dari dialog update-manager" #: ../data/update-manager.schemas.in.h:7 +#, fuzzy msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" "Simpan keadaan expander yang memuat senarai dari perubahan dan deskripsi" @@ -1377,211 +1401,188 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "Dikelola oleh komunitas (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Tidak-bebas (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 LTS Updates" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "Dikelola oleh komunitas (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "Dikelola oleh komunitas (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Tidak-bebas (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Tidak-bebas (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Pemutakhiran lewat Internet" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "_Instal Update" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "Resmi disokong" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 #, fuzzy msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 6.06 LTS Security Updates" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 #, fuzzy msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 6.06 LTS Updates" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 6.06 LTS Backports" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -#, fuzzy -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "Resmi disokong" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 6.06 LTS Security Updates" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 6.06 LTS Updates" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 6.06 LTS Backports" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Dikelola oleh komunitas (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Tidak-bebas (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "Beberapa perangkat lunak tidak lagi resmi disokong" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Hak cipta terlarang" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 6.06 LTS Security Updates" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 6.06 LTS Updates" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 6.06 LTS Backports" @@ -1634,6 +1635,48 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "Perangkat Lunak yang tidak sesuai dengan DFSG" +#~ msgid "Some software no longer officially supported" +#~ msgstr "Beberapa perangkat lunak tidak lagi resmi disokong" + +#~ msgid "Could not find any upgrades" +#~ msgstr "Tidak dapat menemukan upgrade apapun" + +#~ msgid "Your system has already been upgraded." +#~ msgstr "Sistem anda telah diupgrade" + +#, fuzzy +#~ msgid "" +#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +#~ msgstr "" +#~ "<span weight=\"bold\" size=\"x-large\">Mengupgrade ke Ubuntu 6.06 LTS</" +#~ "span>" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Pemutakhiran lewat Internet" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "Upgrade ke versi Ubuntu terakhir" + +#~ msgid "Cannot install all available updates" +#~ msgstr "Tidak dapat menginstal semua pemutakhiran yang tersedia" + +#~ msgid "" +#~ "<big><b>Examining your system</b></big>\n" +#~ "\n" +#~ "Software updates correct errors, eliminate security vulnerabilities and " +#~ "provide new features." +#~ msgstr "" +#~ "<big><b>Menguji sistem anda</b></big>\n" +#~ "\n" +#~ "Pemutakhiran perangkat lunak memperbaiki kesalahan, melenyapkan kelemahan " +#~ "keamanan dan menyediakan fitur baru." + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "Resmi disokong" + #~ msgid "" #~ "Some updates require the removal of further software. Use the function " #~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-24 14:01+0000\n" "Last-Translator: Luca Ferretti <elle.uca@libero.it>\n" "Language-Team: Italian <it@li.org>\n" @@ -135,9 +135,9 @@ msgstr "" "bug." #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"<big><b>Error scaning the CD</b></big>\n" +"<big><b>Error scanning the CD</b></big>\n" "\n" "%s" msgstr "" @@ -153,11 +153,11 @@ msgstr "Inserire un nome per il disco" msgid "Please insert a disc in the drive:" msgstr "Inserire un disco nell'unità:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "Pacchetti non integri" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -166,23 +166,23 @@ msgstr "" "con questo software. Prima di procedere, utilizzare \"synaptic\" o \"apt-get" "\" per risolvere il probelma." -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Impossibile aggiornare i meta-pacchetti richiesti" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "Un pacchetto essenziale dovrebbe essere rimosso" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Impossibile calcolare l'aggiornamento" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -191,11 +191,11 @@ msgstr "" "dell'aggiornamento. Notificare questo evento come bug. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "Errore nell'autenticare alcuni pacchetti" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -205,12 +205,12 @@ msgstr "" "un problema di rete passeggero, riprovare più tardi. Segue una lista di " "pacchetti non autenticati." -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "Impossibile installare \"%s\"" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -219,15 +219,16 @@ msgstr "" "evento come bug. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "Impossibile indovinare il meta-pacchetto" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -237,12 +238,12 @@ msgstr "" " Prima di procedere, usare synaptic o apt-get per installare uno dei " "pacchetti sopra menzionati." -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "Prelievo fallito" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -252,15 +253,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "Lettura della cache" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -268,11 +269,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "Non è stato trovato alcun mirror valido" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -293,11 +294,11 @@ msgstr "" "Scegliendo di no, l'aggiornamento verrà annullato." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "Generare le sorgenti predefinite?" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -311,11 +312,11 @@ msgstr "" "Aggiungere le voci predefinite per «%s»? Selezionando «No», l'aggiornamento " "verrà annullato." -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "Informazioni sul repository non valide" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -323,13 +324,14 @@ msgstr "" "L'aggiornamento delle informazioni sul repository ha generato un file non " "valido. Notificare questo evento come bug." -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "Sorgenti di terze parti disabilitate" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#, fuzzy msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" @@ -337,11 +339,11 @@ msgstr "" "list». È possibilie abilitarle di nuovo dopo l'aggiornamento con lo " "strumento «software-properties» o con synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "Errore durante l'aggiornamento" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -349,11 +351,11 @@ msgstr "" "Si è verificato un problema durante l'aggiornamento. Solitamente si tratta " "di problemi di rete, controllare la connessione di rete e riprovare." -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "Spazio libero su disco insufficiente" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -365,15 +367,15 @@ msgstr "" "usando \"sudo apt-get clean\"." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "Iniziare l'aggiornamento?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "Impossibile installare gli aggiornamenti" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -386,11 +388,11 @@ msgstr "" "uno stato inutilizzabile. È stato eseguito un ripristino (dpkg --configure -" "a)." -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "Impossibile scaricare gli aggiornamenti" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -398,17 +400,18 @@ msgstr "" "Interruzione immediata dell'aggiornamento. Controllare la connessione a " "internet o il supporto di installazione e riprovare. " -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" -msgstr "Software non più supportato ufficialmente" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 +#, fuzzy msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" "Questi pacchetti, pur essendo installati, non sono più supportati " "ufficialmente; ora sono semplicemente mantenuti dalla comunità " @@ -417,23 +420,23 @@ msgstr "" "Se non è abilitato il repository «universe», verrà suggerita la rimozione di " "questi pacchetti al prossimo passo. " -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "Rimuovere i pacchetti obsoleti?" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "_Salta questo passo" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "_Rimuovi" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "Errore durante il commit" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -442,26 +445,31 @@ msgstr "" "seguente per maggiori informazioni. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "Ripristino stato originale del sistema" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "Controllo gestore dei pacchetti" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "Aggiornamento delle informazione sui repository" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "Informazioni di pacchetto non valide" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -474,19 +482,19 @@ msgstr "" "trovare il pacchetto essenziale «%s».\n" "Ciò indica un errore grave, segnalare questo evento come un bug." -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "Richiesta di conferma" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "Aggiornamento" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "Ricerca di software obsoleto" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "L'aggiornamento del sistema è stato completato." @@ -507,7 +515,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "Scaricamento del file %li di %li a %s/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, fuzzy, python-format msgid "About %s remaining" msgstr "Circa %li minuti rimanenti" @@ -537,23 +545,29 @@ msgstr "" #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, python-format +#, fuzzy, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" "Sostituire il file di configurazione\n" "\"%s\"?" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "Il comando \"diff\" non è stato trovato" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "Si è verificato un errore fatale" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -569,28 +583,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "%s pacchetto sta per essere rimosso." msgstr[1] "%s pacchetti stanno per essere rimossi." -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "%s nuovo pacchetto sta per essere installato." msgstr[1] "%s nuovi pacchetti stanno per essere installati." -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "%s pacchetto sta per essere aggiornato." msgstr[1] "%s pacchetti stanno per essere aggiornati." -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -598,7 +612,7 @@ msgid "" "You have to download a total of %s. " msgstr "È necessario scaricare un totale di %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -607,32 +621,35 @@ msgstr "" "L'aggiornamento può richiedere diverse ore e non può essere annullato in " "nessun momento successivo." -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" "Chiudere tutte le applicazioni e i documenti aperti per prevenire la perdita " "di dati." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "Impossibile trovare aggiornamenti" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "Il sistema è aggiornato!" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "Il sistema è già stato aggiornato." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>Rimuovere %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "Installare %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "Aggiornare %s" @@ -666,11 +683,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "Riavvio richiesto" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "L'aggiornamento è finito ed è richiesto un riavvio. Riavviare ora?" @@ -705,10 +722,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Avviare l'aggiornamento?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>" msgstr "" -"<span weight=\"bold\" size=\"x-large\">Aggiornamento a Ubuntu 6.06 LTS</span>" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -836,9 +851,10 @@ msgid "Verfication failed" msgstr "Verifica fallita" #: ../UpdateManager/DistUpgradeFetcher.py:222 +#, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" "Fallita la verifica dell'aggiornamento. Potrebbe dipendere da un problema " "con la connessione di rete o con il server. " @@ -865,18 +881,18 @@ msgstr "Scaricamento del file %li di %li a %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Scaricamento del file %li di %li a velocità sconosciuta" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "" "L'elenco dei cambiamenti non è ancora disponibile. Riprovare più tardi." -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" "L'elenco dei cambiamenti non è ancora disponibile. Riprovare più tardi." -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -884,134 +900,125 @@ msgstr "" "Fallito lo scaricamento dell'elenco dei cambiamenti. Verificare la " "connessione ad Internet." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Aggiornamenti di sicurezza per Ubuntu 5.10" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "Installazione degli aggiornamenti" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "Aggiorna all'ultima versione di Ubuntu" +msgid "Normal updates" +msgstr "Installazione degli aggiornamenti" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "Installazione degli aggiornamenti" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "Impossibile installare tutti gli aggiornamenti disponibili" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Versione %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "Scaricamento dell'elenco dei cambiamenti..." -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "_Verifica" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "Dati da scaricare: %s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "Il sistema è aggiornato!" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "È possibile installare %s aggiornamento" msgstr[1] "È possibile installare %s aggiornamenti" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "Attendere, l'operazione potrebbere richiedere del tempo." -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "Aggiornamento completato" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "Verifica degli aggiornamenti..." + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Nuova versione: %s (Dimensione: %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Versione %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "La distribuzione in uso non è più supportata" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -1021,17 +1028,17 @@ msgstr "" "versione più aggiornata di Ubuntu Linux. Per maggiori informazioni " "consultare http://www.ubuntu.com" -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "L'indice dei programmi è rovinato" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1055,58 +1062,67 @@ msgstr "" "\"Amministrazione\" -> \"Proprietà software\"." #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"<big><b>Examining your system</b></big>\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "<big><b>Keep your system up-to-date</b></big>" +msgstr "<big><b>Mantenere aggiornato il sistema</b></big>" + +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "<big><b>Not all updates can be installed</b></big>" msgstr "" -"<big><b>Esame del sistema</b></big>\n" +"<big><b>Errore nella scansione del CD</b></big>\n" "\n" -"Gli aggiornamenti software correggono errori, eliminano vulnerabilità di " -"sicurezza ed aggiungono nuove funzionalità." +"%s" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "<big><b>Keep your system up-to-date</b></big>" -msgstr "<big><b>Mantenere aggiornato il sistema</b></big>" +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "<big><b>Starting update manager</b></big>" +msgstr "<b><big>Avviare l'aggiornamento?</big></b>" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "Annulla _scaricamento" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Cambiamenti" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "_Verifica" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "Verifica la presenza di nuovi aggiornamenti nei canali software" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Descrizione" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "Note di rilascio" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "Mostra l'avanzamento dei singoli file" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Aggiornamenti software" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1114,32 +1130,37 @@ msgstr "" "Gli aggiornamenti software correggono errori, eliminano vulnerabilità di " "sicurezza ed aggiungono nuove funzionalità." -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "A_ggiorna" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "Aggiorna all'ultima versione di Ubuntu" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "_Verifica" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "_Riprendi aggiornamento" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "_Non mostrare più queste informazioni" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "I_nstalla aggiornamenti" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Cambiamenti" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1250,11 +1271,12 @@ msgid "_Install security updates without confirmation" msgstr "I_nstallare gli aggiornamenti di sicurezza senza richiedere conferma" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 +#, fuzzy msgid "" -"<b><big>The channel information is out-of-date</big></b>\n" +"<b><big>The information about available software is out-of-date</big></b>\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1288,10 +1310,10 @@ msgstr "<b>URI:</b>" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the source that you want to add</b></" -"big>\n" +"<big><b>Enter the complete APT line of the repository that you want to add " +"as source</b></big>\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>Inserire la riga APT completa del canale che si vuole aggiungere</" @@ -1352,8 +1374,9 @@ msgid "Check for new distribution releases" msgstr "Controlla nuovi rilasci della distribuzione" #: ../data/update-manager.schemas.in.h:3 +#, fuzzy msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1374,8 +1397,9 @@ msgid "Stores the size of the update-manager dialog" msgstr "Salva la dimensione della finestra dell'update-manager" #: ../data/update-manager.schemas.in.h:7 +#, fuzzy msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" "Salva lo stato dell'espansore che contiene l'elenco dei cambiamenti e la " @@ -1403,213 +1427,191 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Aggiornamenti di Ubuntu 5.10" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "Mantenuto dalla comunità (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Software contribuito" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 #, fuzzy msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "CD con Ubuntu·4.10·\"Warty·Warthog\"" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 \"Dapper Drake\"" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "Mantenuto dalla comunità (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "Mantenuto dalla comunità (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Non libero (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Non libero (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "By copyright or legal issues restricted software" msgstr "Software non esportabile dagli USA" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 \"Dapper Drake\"" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Aggiornamenti di sicurezza per Ubuntu 5.10" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "Installazione degli aggiornamenti" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 \"Breezy Badger\"" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "Supportato ufficialmente" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 \"Breezy Badger\"" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Aggiornamenti di sicurezza per Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Aggiornamenti di Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Backport di Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD con Ubuntu·5.04·\"Hoary·Hedgehog\"" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD con Ubuntu·5.04·\"Hoary·Hedgehog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "Supportato ufficialmente" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Aggiornamenti di sicurezza per Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Aggiornamenti di Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Backport di Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "CD con Ubuntu·4.10·\"Warty·Warthog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Mantenuto dalla comunità (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Non libero (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 #, fuzzy msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "CD con Ubuntu·4.10·\"Warty·Warthog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "Software non più supportato ufficialmente" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Copyright con restrizioni" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Aggiornamenti di sicurezza per Ubuntu 4.10" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "Aggiornamenti di Ubuntu 4.10" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Backport di Ubuntu 5.10" @@ -1660,6 +1662,47 @@ msgstr "Software compatibile con le DFSG con dipendenze non libere" msgid "Non-DFSG-compatible Software" msgstr "Software non compatibile con le DFSG" +#~ msgid "Some software no longer officially supported" +#~ msgstr "Software non più supportato ufficialmente" + +#~ msgid "Could not find any upgrades" +#~ msgstr "Impossibile trovare aggiornamenti" + +#~ msgid "Your system has already been upgraded." +#~ msgstr "Il sistema è già stato aggiornato." + +#, fuzzy +#~ msgid "" +#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +#~ msgstr "" +#~ "<span weight=\"bold\" size=\"x-large\">Aggiornamento a Ubuntu 6.06 LTS</" +#~ "span>" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Aggiornamenti di sicurezza per Ubuntu 5.10" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "Aggiorna all'ultima versione di Ubuntu" + +#~ msgid "Cannot install all available updates" +#~ msgstr "Impossibile installare tutti gli aggiornamenti disponibili" + +#~ msgid "" +#~ "<big><b>Examining your system</b></big>\n" +#~ "\n" +#~ "Software updates correct errors, eliminate security vulnerabilities and " +#~ "provide new features." +#~ msgstr "" +#~ "<big><b>Esame del sistema</b></big>\n" +#~ "\n" +#~ "Gli aggiornamenti software correggono errori, eliminano vulnerabilità di " +#~ "sicurezza ed aggiungono nuove funzionalità." + +#~ msgid "Oficially supported" +#~ msgstr "Supportato ufficialmente" + #~ msgid "" #~ "Some updates require the removal of further software. Use the function " #~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " @@ -1837,10 +1880,6 @@ msgstr "Software non compatibile con le DFSG" #~ msgid "<b>Sections</b>" #~ msgstr "<b>Sezioni</b>" -#, fuzzy -#~ msgid "Check for available updates" -#~ msgstr "Verifica degli aggiornamenti..." - #~ msgid "<b>Sections:</b>" #~ msgstr "<b>Sezioni:</b>" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager 0.42.4\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-24 07:06+0000\n" "Last-Translator: Ikuya Awashiro <ikuya@fruitsbasket.info>\n" "Language-Team: Ubuntu Japanese Team <ubuntu-ja-users@freeml.com>\n" @@ -132,9 +132,9 @@ msgid "The key you selected could not be removed. Please report this as a bug." msgstr "選択した鍵を削除できませんでした。バグとして報告してください。" #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"<big><b>Error scaning the CD</b></big>\n" +"<big><b>Error scanning the CD</b></big>\n" "\n" "%s" msgstr "" @@ -150,11 +150,11 @@ msgstr "ディスク名を入力してください" msgid "Please insert a disc in the drive:" msgstr "ディスクをドライブに挿入してください:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "壊れたパッケージ" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -162,34 +162,34 @@ msgstr "" "システムにはこのソフトウェアでは修復できない壊れたパッケージが含まれていま" "す。 Synaptic や apt-get を使って最初に修正してください。" -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "要求されたメタパッケージがアップグレードできません" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "必須パッケージが削除されます" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "アップグレードが算定できません" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." msgstr "算定中に解決できない問題がおきました。バグとして報告してください。 " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "いくつかのパッケージが認証されませんでした" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -199,12 +199,12 @@ msgstr "" "クの問題でしょう。あとで再び試してみてください。下に認証できなかったパッケー" "ジが表示されます。" -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "'%s' がインストールできません" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -212,15 +212,16 @@ msgstr "" "要求されたパッケージのインストールができません。バグとして報告してください。 " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "メタパッケージを推測できません" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -230,12 +231,12 @@ msgstr "" "開始前に Synaptic や apt-get を使用して上記のパッケージのうちのひとつをインス" "トールしてください。" -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "取得に失敗しました" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -245,15 +246,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "キャッシュを読み込み中" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -261,11 +262,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "正しいミラーが見つかりません" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -284,11 +285,11 @@ msgstr "" "キャンセルします。" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "標準のソースを生成しますか？" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -301,11 +302,11 @@ msgstr "" "'%s' のデフォルトエントリを追加しますか？ 'いいえ' を選択するとアップデートを" "キャンセルします。" -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "リポジトリ情報が無効です" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -313,13 +314,14 @@ msgstr "" "リポジトリ情報をアップグレード中に無効なファイルを生成しました。バグとして報" "告してください。" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "公式ではないソースが無効になりました" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#, fuzzy msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" @@ -327,11 +329,11 @@ msgstr "" "アップグレード後に 'ソフトウェアのプロパティ' ツールか Synaptic を使用してく" "ださい。" -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "アップデート中にエラー発生" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -339,11 +341,11 @@ msgstr "" "アップデート中に問題が発生しました。おそらくある種のネットワークの問題です。" "ネットワーク接続をチェックし、再びアップデートしてください。" -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "ディスクの空き領域が足りません" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -355,15 +357,15 @@ msgstr "" "た一時パッケージを削除してください。" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "アップグレードを開始しますか？" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "アップグレードをインストールできません" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -375,11 +377,11 @@ msgstr "" "アップグレードを中断しました。システムが使用できない状態になっている可能性が" "あります。ただいま修正を実行中です (dpkg --configure -a)。" -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "アップグレードをダウンロードできません" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -387,17 +389,18 @@ msgstr "" "アップグレードを中断しました。インターネット接続またはインストールメディア" "(CD-ROMなど)をチェックし。再試行してください。 " -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" -msgstr "いくつかのソフトウェアはもう公式にサポートされません" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 +#, fuzzy msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" "インストールされているこれらのパッケージは、もう公式にサポートされておらず、" "コミュニティサポートになっています('universe')。\n" @@ -405,23 +408,23 @@ msgstr "" "'universe' を有効にしないと、これらのパッケージは次のステップで削除することを" "提案します。 " -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "不要なパッケージを削除しますか？" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "このステップをスキップ(_S)" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "削除(_R)" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "コミット中にエラー" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -430,26 +433,31 @@ msgstr "" "ください。 " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "システムを元に戻し中" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "パッケージマネージャをチェック中" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "リポジトリ情報をアップデート" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "無効なパッケージ情報" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -461,19 +469,19 @@ msgstr "" "パッケージ情報のアップデートのあと、重要パッケージ '%s' が見つかりません。\n" "このメッセージは深刻なエラーです。バグとして報告してください。" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "確認する" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "アップグレード中" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "古いソフトウェアを検索する" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "システムのアップグレードが完了しました。" @@ -494,7 +502,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "ダウンロード中: %li のうち %li 速度 %s/秒" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, fuzzy, python-format msgid "About %s remaining" msgstr "およそ残り %li 分" @@ -524,23 +532,29 @@ msgstr "" #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, python-format +#, fuzzy, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" "設定ファイル %s\n" "を置き換えますか？" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "'diff' コマンドが見つかりません" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "重大なエラーが発生しました" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -555,25 +569,25 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "%s つのパッケージが削除されます。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "%s·つのパッケージがインストールされます。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "%s·つのパッケージがアップグレードされます。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -581,39 +595,42 @@ msgid "" "You have to download a total of %s. " msgstr "全部で %s つのパッケージをダウンロードする必要があります。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "アップグレードには数時間かかり、今後一切キャンセルはできません。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" "データの損失を避けるため、すべてのアプリケーションとドキュメントを閉じてくだ" "さい。" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "アップグレードが見つかりません" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "システムは最新の状態です!" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "システムはすでに最新の状態です。" +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>削除されるパッケージ: %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "インストール %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "アップグレード %s" @@ -647,11 +664,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "再起動してください" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "アップグレードが終了しました。再起動が必要ですが、すぐに実行しますか？" @@ -687,11 +704,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>アップグレードを開始しますか？</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>" msgstr "" -"<span weight=\"bold\" size=\"x-large\">Ubuntu 6.06 LTS にアップデート中</" -"span>" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -813,9 +827,10 @@ msgid "Verfication failed" msgstr "検証に失敗しました" #: ../UpdateManager/DistUpgradeFetcher.py:222 +#, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" "アップグレードの検証に失敗しました。おそらくネットワークまたはサーバの問題で" "す。 " @@ -842,16 +857,16 @@ msgstr "ダウンロード中: %li のうち %li 速度 %s/秒" msgid "Downloading file %li of %li with unknown speed" msgstr "ダウンロード中: 速度不明で %li のうち %li" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "変更点がまだ取得できません。あとで試してください。" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "変更点がまだ取得できません。あとで試してください。" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -859,133 +874,124 @@ msgstr "" "変更点の取得に失敗しました。インターネットに接続されているか確認してくださ" "い。" -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Ubuntu 5.10 セキュリティアップデート" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "アップデートをインストール中" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "Ubuntu の最新バージョンにアップグレード" +msgid "Normal updates" +msgstr "アップデートをインストール中" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "アップデートをインストール中" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "すべてのアップデートをインストールすることができません" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "バージョン %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "変更点を取得中..." -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "チェック(_C)" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "ダウンロードサイズ: %s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "システムは最新の状態です!" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "%s 個のアップデートがインストールされます" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "しばらくお待ちください。少々時間がかかります。" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "アップデートが完了しました" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "インストールできるアップデートをチェック" + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "新しいバージョン: %s (サイズ: %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "バージョン %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "このディストリビューションはすでにサポート対象外です" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -995,17 +1001,17 @@ msgstr "" "Ubuntu Linux にアップグレードしてください。\r\n" "アップグレードに関する詳細な情報は http://www.ubuntu.com をご覧ください。" -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "ソフトウェアのインデックスが壊れています" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1029,58 +1035,67 @@ msgstr "" "Properties)\" で行います。" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"<big><b>Examining your system</b></big>\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "<big><b>Keep your system up-to-date</b></big>" +msgstr "<big><b>システムを最新の状態にする</b></big>" + +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "<big><b>Not all updates can be installed</b></big>" msgstr "" -"<big><b>システムを解析中です</b></big>\n" +"<big><b>CDスキャン中のエラー</b></big>\n" "\n" -"ソフトウェアアップデートはエラーを修正し、セキュリティホールを修正し、新機能" -"を提供します。" +"%s" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "<big><b>Keep your system up-to-date</b></big>" -msgstr "<big><b>システムを最新の状態にする</b></big>" +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "<big><b>Starting update manager</b></big>" +msgstr "<b><big>アップグレードを開始しますか？</big></b>" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "ダウンロードをキャンセル(_D)" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "変更点" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "再チェック(_K)" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "新しいアップデートの調査のためにソフトウェアチャンネルをチェックします" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "説明" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "リリースノート" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "個々のファイルの進捗を表示" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "ソフトウェアのアップデート" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1088,32 +1103,37 @@ msgstr "" "ソフトウェアアップデートはエラーを訂正し、セキュリティホールを修正し、新機能" "を提供します。" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "アップグレード(_P)" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "Ubuntu の最新バージョンにアップグレード" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "チェック(_C)" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "アップグレードを再開する(_R)" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "今後この情報を隠す(_H)" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "アップデートをインストール(_I)" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "変更点" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1224,11 +1244,12 @@ msgid "_Install security updates without confirmation" msgstr "確認せずにセキュリティアップデートをインストール(_I)" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 +#, fuzzy msgid "" -"<b><big>The channel information is out-of-date</big></b>\n" +"<b><big>The information about available software is out-of-date</big></b>\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1262,10 +1283,10 @@ msgstr "<b>URI:</b>" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the source that you want to add</b></" -"big>\n" +"<big><b>Enter the complete APT line of the repository that you want to add " +"as source</b></big>\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>追加したい完全な APT line を入力してください。</b></big>\n" @@ -1324,8 +1345,9 @@ msgid "Check for new distribution releases" msgstr "新しいディストリビューションのリリースをチェックする" #: ../data/update-manager.schemas.in.h:3 +#, fuzzy msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1345,8 +1367,9 @@ msgid "Stores the size of the update-manager dialog" msgstr "アップデートマネージャのダイアログサイズを復元" #: ../data/update-manager.schemas.in.h:7 +#, fuzzy msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "変更点と概要のリストを含んだ欄の状態を復元する" @@ -1372,212 +1395,190 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 アップデート" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "コミュニティによるメンテナンス (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "寄贈ソフトウェア" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "コミュニティによるメンテナンス (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "コミュニティによるメンテナンス (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "非フリー (Multiuniverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "非フリー (Multiuniverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "By copyright or legal issues restricted software" msgstr "アメリカ合衆国外への輸出が禁止されているソフトウェア" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Ubuntu 5.10 セキュリティアップデート" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "アップデートをインストール中" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu·5.10·'Breezy·Badger'" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "公式サポート" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu·5.10·'Breezy·Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 セキュリティアップデート" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 アップデート" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 バックポート" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu·5.04·\"Hoary·Hedgehog\"" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu·5.04·\"Hoary·Hedgehog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "公式サポート" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 セキュリティアップデート" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 アップデート" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 バックポート" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu·5.10·'Breezy·Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "コミュニティによるメンテナンス (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "非フリー (Multiuniverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "いくつかのソフトウェアはもう公式にサポートされません" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "限定的な著作権(Restricted)" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 セキュリティアップデート" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 5.10 アップデート" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 バックポート" @@ -1628,6 +1629,47 @@ msgstr "非フリーな依存関係のあるDFSG適合ソフトウェア" msgid "Non-DFSG-compatible Software" msgstr "DFSGに適合しないソフトウェア" +#~ msgid "Some software no longer officially supported" +#~ msgstr "いくつかのソフトウェアはもう公式にサポートされません" + +#~ msgid "Could not find any upgrades" +#~ msgstr "アップグレードが見つかりません" + +#~ msgid "Your system has already been upgraded." +#~ msgstr "システムはすでに最新の状態です。" + +#, fuzzy +#~ msgid "" +#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +#~ msgstr "" +#~ "<span weight=\"bold\" size=\"x-large\">Ubuntu 6.06 LTS にアップデート中</" +#~ "span>" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Ubuntu 5.10 セキュリティアップデート" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "Ubuntu の最新バージョンにアップグレード" + +#~ msgid "Cannot install all available updates" +#~ msgstr "すべてのアップデートをインストールすることができません" + +#~ msgid "" +#~ "<big><b>Examining your system</b></big>\n" +#~ "\n" +#~ "Software updates correct errors, eliminate security vulnerabilities and " +#~ "provide new features." +#~ msgstr "" +#~ "<big><b>システムを解析中です</b></big>\n" +#~ "\n" +#~ "ソフトウェアアップデートはエラーを修正し、セキュリティホールを修正し、新機" +#~ "能を提供します。" + +#~ msgid "Oficially supported" +#~ msgstr "公式サポート" + #~ msgid "" #~ "Some updates require the removal of further software. Use the function " #~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " @@ -1769,9 +1811,6 @@ msgstr "DFSGに適合しないソフトウェア" #~ "アップデートによってソフトウェアの問題を修正し、セキュリティホールを除去" #~ "し、新機能を追加します。" -#~ msgid "Check for available updates" -#~ msgstr "インストールできるアップデートをチェック" - #~ msgid "<b>Sections:</b>" #~ msgstr "<b>セクション:</b>" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-23 19:19+0000\n" "Last-Translator: Vladimer Sichinava <alinux@siena.linux.it>\n" "Language-Team: Georgian <geognome@googlegroups.com>\n" @@ -133,9 +133,9 @@ msgstr "" "ამორჩეული გასაღების წაშლა ვე რმოხერხდა. გთხოვთ აცნობოთ ეს როგორც ხარვეზი." #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"<big><b>Error scaning the CD</b></big>\n" +"<big><b>Error scanning the CD</b></big>\n" "\n" "%s" msgstr "" @@ -151,11 +151,11 @@ msgstr "შეიყვანეთ დისკის სახელი" msgid "Please insert a disc in the drive:" msgstr "მოათავსეთ დისკი დისკწამყვანში:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "გაფუჭებული პაკეტები" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -164,25 +164,25 @@ msgstr "" "პროგრამით. ჯერ გამართეთ გაფუჭებული პაკეტები synaptic ან apt-get პროგრამით და " "შემდეგ გააგრძელეთ." -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "საჭჳრო მეტა-პაკეტების განახლება ვერ მოხერხდა" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 #, fuzzy msgid "A essential package would have to be removed" msgstr "A არსებითი -სკენ" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 #, fuzzy msgid "Could not calculate the upgrade" msgstr "არა" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -191,11 +191,11 @@ msgstr "" "ხარვეზი. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "ზოგიერთი პაკეტის ავთენთიფიკაციის შეცდომა" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -205,40 +205,40 @@ msgstr "" "ბრაკი. იქნებ მოგვიანბით კიდევ ერთხელ სცადოთ. ქვევით იხილეთ არა-" "ავთენთიფიცერული პაკეტების სია." -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "'%s' ვერ დაყენდა" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "საჭირო პაკეტის დაყენება ვერ მოხერხდა. შეატყობინეთ ეს როგორხ ხარვეზი. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "მეტა-პაკეტი ვერ გამოვიცანით" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" "არა შეიცავს a ან და არა -სკენ ვერსია ის\n" " ის ან." -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "ვერ განხორციელდა -სკენ" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -248,15 +248,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "მიმდინარეობს ქეშის წაკითხვა" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -264,11 +264,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "არავითარი გამოსადეგი სერვერის ანარეკლი" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -281,12 +281,12 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 #, fuzzy msgid "Generate default sources?" msgstr "გენერაცია ნაგულისხმევი?" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -295,11 +295,11 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "რეპოზიტორიების ინფორმაცია არასწორეა" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -307,24 +307,24 @@ msgstr "" "რეპოზიტორიების განახლების შედეგად დაზიანდა ფაილი. შეატყობინეთ ეს როგორხ " "ხარვეზი." -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 #, fuzzy msgid "Third party sources disabled" msgstr "გამორთული" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 #, fuzzy msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "-ში სია გამორთული თქვენ პარამეტრები ან." -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "განახლებისას მოხდა შეცდომა" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -332,11 +332,11 @@ msgstr "" "განახლებისას მოხდა შეცდომა. ეს როგროც წესი არის კავშირის პრობლემა, შეამოწმეთ " "თქვენი კავშირი და ცადეთ კიდევ ერთხელ." -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "დისკზე არ არის საკმარისი თავისუფალი ადგილი" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -345,16 +345,16 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "გნებავთ განახლების დაწყება?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 #, fuzzy msgid "Could not install the upgrades" msgstr "არა" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -364,51 +364,50 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "ახლა -ში A a." -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 #, fuzzy msgid "Could not download the upgrades" msgstr "არა" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 #, fuzzy msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "ახლა ან და " -#: ../DistUpgrade/DistUpgradeControler.py:488 -#, fuzzy -msgid "Some software no longer officially supported" -msgstr "არა" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 #, fuzzy msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "არა და ახლა n t ჩართული -თვის -ში ნაბიჯი " -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "წავშალო მოძველებული პაკეტები?" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "ნაბიჯის გა_მოტოვება" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "_წაშლა" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 #, fuzzy msgid "Error during commit" msgstr "შეცდომა" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 #, fuzzy msgid "" "Some problem occured during the clean-up. Please see the below message for " @@ -416,26 +415,31 @@ msgid "" msgstr "-თვის ინფორმაცია " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "ვამოწმებ პროგრამულ მენეჯერს" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "რეპოზტორიის ინფორმაციის განახლება" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "გაფუჭებული პაკეტის შესახებ ინფორმაცია" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -445,21 +449,21 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 #, fuzzy msgid "Asking for confirmation" msgstr "-თვის" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "მიმდინარეობს განახლებების ჩაყენება" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 #, fuzzy msgid "Searching for obsolete software" msgstr "ვეძებ -თვის" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 #, fuzzy msgid "System upgrade is complete." msgstr "სისტემა ტოლია სრული." @@ -481,7 +485,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, python-format msgid "About %s remaining" msgstr "" @@ -513,21 +517,27 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 #, fuzzy msgid "The 'diff' command was not found" msgstr "არა" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 #, fuzzy msgid "A fatal error occured" msgstr "A შეცდომა" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -538,25 +548,25 @@ msgstr "a და შემცველობა და -ში ახლა თ #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." -msgstr[0] "" +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." +msgstr[0] "A არსებითი -სკენ" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 #, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 #, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, python-format msgid "" "\n" @@ -564,38 +574,41 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "საათი და ნებისმიერი დრო." -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 #, fuzzy msgid "To prevent data loss close all open applications and documents." msgstr "ვის დახურვა ყველა გახსნა და დოკუმენტები." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "ვერ ვპოულობ განახლებებს" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "თქვენი სისტემა განახლებულია" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "თქვენი სისტემა სულ ახლახანს განახლდა." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "<b>Remove %s</b>" msgstr "<b> ამოშლა %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "დაყენება %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "ჩასაყენებელი განახლება %s" @@ -629,11 +642,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "საჭიროა გადატვირთვა" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 #, fuzzy msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" @@ -668,9 +681,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big> გაშვება</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" -msgstr "<span weight=\"bold\" size=\"x-large\"> -სკენ</span>" +msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>" +msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -801,8 +813,8 @@ msgstr "ვერ შედგა" #: ../UpdateManager/DistUpgradeFetcher.py:222 #, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "ვერ შედგა a ან " #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -827,152 +839,143 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "" "ცვლილებების სია ჯერ-ჯერობით არ არის ხელმისაწვდომი. გთხოვთ სცადოთ მოგვიანებით." -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" "ცვლილებების სია ჯერ-ჯერობით არ არის ხელმისაწვდომი. გთხოვთ სცადოთ მოგვიანებით." -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "ვერ განხორციელდა -სკენ სია ის ინტერნეტი." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Ubuntu 5.10 უსაფრთხოების განახლება" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "განახლებების _დაყენება" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "განახლება -სკენ ვერსია ის" +msgid "Normal updates" +msgstr "განახლებების _დაყენება" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "განახლებების _დაყენება" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "შეუძლებელია ყველა არსებული განახლების ჩაყენება" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "ვერსია %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 #, fuzzy msgid "Downloading the list of changes..." msgstr "მიმდინარეობს ჩამოქაჩვა სია ის." -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "შ_ემოწმება" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "ჩამოსატვირთის ზომა: %s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "თქვენი სისტემა განახლებულია" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "თქვენ შეგიძლიათ %s განახლების ჩადგმა" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "გთხოვთ მოითმინოთ, მიმდინარე პროცესს საკმაო დრო ესაჭიორება." -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "განახლება გასრულებულია" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "განახლებების _დაყენება" + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "ახალი ვერსია: %s (ზომა: %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "ვერსია %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "თქვენი დისტრიბუტივს აღარ გააჩნია მხარდაჭერა" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 #, fuzzy msgid "" "You will not get any further security fixes or critical updates. Upgrade to " @@ -982,17 +985,17 @@ msgstr "" "თქვენ არა ნებისმიერი ან კრიტიკული განახლება -სკენ a ვერსია ის ლინუქსი " "იხილეთhttp://www.ubuntu.com -თვის ინფორმაცია ჩართულია." -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "პროგრამების სიის ინდექსი დაზიანებულია" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 #, fuzzy msgid "" "It is impossible to install or remove any software. Please use the package " @@ -1013,94 +1016,108 @@ msgstr "" "პროგრამა პარამეტრები." #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"<big><b>Examining your system</b></big>\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +#, fuzzy +msgid "<big><b>Keep your system up-to-date</b></big>" +msgstr "<big><b> დატოვება -სკენ თარიღი</b></big>" + +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "<big><b>Not all updates can be installed</b></big>" msgstr "" -"<big><b>ვამოწმებ თქვენს სისტემას</b></big>\n" +"<big><b>ვერ მოხერხდა CD-ს წაკითხვა</b></big>\n" "\n" -"მოცემული პროგრამა გიჩვენებთ განახლებებს, გაასწორებს სისტემურ შეცდომებს და " -"წარმოგიდგენთ ახალ შესაძლებლობებს." +"%s" -#: ../data/glade/UpdateManager.glade.h:7 +#: ../data/glade/UpdateManager.glade.h:6 #, fuzzy -msgid "<big><b>Keep your system up-to-date</b></big>" -msgstr "<big><b> დატოვება -სკენ თარიღი</b></big>" +msgid "<big><b>Starting update manager</b></big>" +msgstr "<b><big> გაშვება</big></b>" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "ჩამოტვირთვის _გაუქმება" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "ცვლილებები" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "შე_მოწმება" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 #, fuzzy msgid "Check the software channels for new updates" msgstr "შემოწმება -თვის ახალი" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "აღწერილობა" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "ვერსიის მონაცემები" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 #, fuzzy msgid "Show progress of single files" msgstr "ჩვენება მიმდინარეობა ის ცალი" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "პროგრამული განახლებები" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 #, fuzzy msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "პროგრამა სწორეა და ახალი." -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 #, fuzzy msgid "Upgrade to the latest version of Ubuntu" msgstr "განახლება -სკენ ვერსია ის" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "შ_ემოწმება" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "განახლება _გაგრძელება" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "_დამალე მომავალში მოცემული ინფორმაცია" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "განახლებების _დაყენება" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "ცვლილებები" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1217,10 +1234,10 @@ msgstr "დაყენება" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 #, fuzzy msgid "" -"<b><big>The channel information is out-of-date</big></b>\n" +"<b><big>The information about available software is out-of-date</big></b>\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1250,10 +1267,10 @@ msgstr "<b>URI:</b>" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the source that you want to add</b></" -"big>\n" +"<big><b>Enter the complete APT line of the repository that you want to add " +"as source</b></big>\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b> შეყვანა სრული ის -სკენ დამატება</b></big> n ტიპი მდებარეობა და " @@ -1310,7 +1327,7 @@ msgstr "შემოწმება -თვის ახალი დისტ #: ../data/update-manager.schemas.in.h:3 #, fuzzy msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "-თვის ტოლია -სკენ სია -სკენ -ში." @@ -1333,7 +1350,7 @@ msgstr "ზომა ის განახლება დიალოგი" #: ../data/update-manager.schemas.in.h:7 #, fuzzy msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "ის შეიცავს სია ის და აღწერა" @@ -1360,209 +1377,187 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 განახლებები" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "არათავისუფალი (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "არათავისუფალი (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "არათავისუფალი (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Ubuntu 5.10 უსაფრთხოების განახლება" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "განახლებების _დაყენება" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 უსაფრთხოების განახლება" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 განახლებები" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 დამატებითი პროგრამები" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 უსაფრთხოების განახლება" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 განახლებები" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 დამატებითი პროგრამები" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "არათავისუფალი (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "არა" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 #, fuzzy msgid "Restricted copyright" msgstr "შეზღუდული" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 5.10 უსაფრთხოების განახლება" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 5.10 განახლებები" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 დამატებითი პროგრამები" @@ -1617,6 +1612,43 @@ msgid "Non-DFSG-compatible Software" msgstr "პროგრამა" #, fuzzy +#~ msgid "Some software no longer officially supported" +#~ msgstr "არა" + +#~ msgid "Could not find any upgrades" +#~ msgstr "ვერ ვპოულობ განახლებებს" + +#~ msgid "Your system has already been upgraded." +#~ msgstr "თქვენი სისტემა სულ ახლახანს განახლდა." + +#, fuzzy +#~ msgid "" +#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +#~ msgstr "<span weight=\"bold\" size=\"x-large\"> -სკენ</span>" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Ubuntu 5.10 უსაფრთხოების განახლება" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "განახლება -სკენ ვერსია ის" + +#~ msgid "Cannot install all available updates" +#~ msgstr "შეუძლებელია ყველა არსებული განახლების ჩაყენება" + +#~ msgid "" +#~ "<big><b>Examining your system</b></big>\n" +#~ "\n" +#~ "Software updates correct errors, eliminate security vulnerabilities and " +#~ "provide new features." +#~ msgstr "" +#~ "<big><b>ვამოწმებ თქვენს სისტემას</b></big>\n" +#~ "\n" +#~ "მოცემული პროგრამა გიჩვენებთ განახლებებს, გაასწორებს სისტემურ შეცდომებს და " +#~ "წარმოგიდგენთ ახალ შესაძლებლობებს." + +#, fuzzy #~ msgid "" #~ "Some updates require the removal of further software. Use the function " #~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-28 15:14+0000\n" "Last-Translator: darehanl <darehanl@gmail.com>\n" "Language-Team: Korean <ko@li.org>\n" @@ -128,9 +128,9 @@ msgid "The key you selected could not be removed. Please report this as a bug." msgstr "선택한 키를 지울 수 없습니다. 버그 리포팅 하십시오." #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"<big><b>Error scaning the CD</b></big>\n" +"<big><b>Error scanning the CD</b></big>\n" "\n" "%s" msgstr "" @@ -146,11 +146,11 @@ msgstr "디스크에 사용할 이름을 입력하십시오." msgid "Please insert a disc in the drive:" msgstr "드라이브에 디스크를 넣으십시오:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "망가진 꾸러미" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -158,23 +158,23 @@ msgstr "" "이 소프트웨어로 수정할 수 없는 망가진 꾸러미가 있습니다. 진행 전에 먼저 시냅" "틱이나 apt-get을 사용하여 복구하십시오." -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "요청된 메타 꾸러미를 업그레이드 할 수 없습니다" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "필수 꾸러미를 지워야만 합니다." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "업그레이드에 필요한 의존성을 계산할 수 없습니다." -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -183,11 +183,11 @@ msgstr "" "버그를 보고하여 주십시오. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "꾸러미 인증 오류" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -196,27 +196,28 @@ msgstr "" "인증하는데 실패한 꾸러미가 있습니다. 일시적인 네트워크 문제일 수 있으니 나중" "에 다시 시도하십시오. 인증에 실패한 꾸러미의 목록은 다음과 같습니다." -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "'%s'을(를) 설치할 수 없습니다." -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "요청된 꾸러미를 설치할 수 없습니다. 버그로 보고하여 주십시오. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "메타 꾸러미를 추측할 수 없습니다." -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -225,12 +226,12 @@ msgstr "" " 위의 꾸러미 중 하나를 시냅틱이나 apt-get을 이용해서 먼저 설치하시기 바랍니" "다." -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "가져오기가 실패했습니다." -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -240,15 +241,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "캐시를 읽는 중" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -256,11 +257,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "적합한 미러 서버를 찾지 못했습니다." -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -280,11 +281,11 @@ msgstr "" "'아니오'를 고르면 업데이트가 취소됩니다." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "기본 설정된 소스 목록을 만듭니까?" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -297,11 +298,11 @@ msgstr "" "'%s'에 대한 기본 항목을 추가하시겠습니까? '아니오'를 고르면 업데이트가 취소됩" "니다." -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "저장소 정보가 올바르지 않습니다" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -309,13 +310,14 @@ msgstr "" "저장소 정보를 업그레이드하는 것이 잘못된 파일로 만들어졌습니다. 버그를 보고하" "여 주십시오." -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "써드 파티 소스는 이용할 수 없습니다" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#, fuzzy msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" @@ -323,11 +325,11 @@ msgstr "" "properties' 도구나 시냅틱으로 업그레이드 한 후에 다시 사용가능하게 할 수 있습" "니다." -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "업데이트 중 오류" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -335,11 +337,11 @@ msgstr "" "업데이트를 하는 동안에 문제가 발생했습니다. 보통 네트워크 문제인 경우가 많습" "니다. 네트워크의 연결 상태를 확인하시고 다시 시도하십시오." -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "디스크 여유 공간이 충분하지 않습니다." -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -351,15 +353,15 @@ msgstr "" "에 사용했던 임시 꾸러미들을 삭제하시기 바랍니다." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "업그레이드를 시작하시겠습니까?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "업그레이드를 설치하지 못했습니다." -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -371,11 +373,11 @@ msgstr "" "업그레이드가 중지되었습니다. 시스템을 이용할 수 없는 상태일 수 있습니다. " "(dpkg --configure -a)를 실행하여 복구하십시오." -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "업그레이드 파일을 다운로드 할 수 없습니다." -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -383,17 +385,18 @@ msgstr "" "업그레이드가 중지되었습니다. 인터넷 연결과 설치 미디어를 확인하시고 다시 시도" "하십시오. " -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" -msgstr "더 이상 공식적으로 지원하지 않는 소프트웨어가 있습니다." +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 +#, fuzzy msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" "이 소프트웨어들은 더 이상 공식적으로 지원하지 않으며, 이제 Universe 계열에 해" "당합니다.\n" @@ -401,23 +404,23 @@ msgstr "" "'Universe' 저장소를 활성화하지 않았다면 다음 단계에서 이 꾸러미들을 삭제할 " "수 있습니다. " -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "못쓰게 된 꾸러미를 삭제하시겠습니까?" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "이 단계 건너뛰기(_S)" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "삭제(_R)" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "커밋 도중 오류 발생" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -426,26 +429,31 @@ msgstr "" "보를 얻으실 수 있습니다. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "시스템을 원상태로 복구하는 중" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "꾸러미 관리자 확인 중" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "저장소 정보 업데이트 중" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "잘못된 꾸러미 정보" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -458,19 +466,19 @@ msgstr "" "다.\n" "심각한 오류입니다. 버그를 보고하여 주십시오." -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "확인을 요청하는 중" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "업그레이드 하는 중" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "못 쓰게 된 소프트웨어를 검색하는 중" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "시스템 업그레이드가 끝났습니다." @@ -491,7 +499,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "내려받는 중, %li의 %li 파일, 속도 %s/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, fuzzy, python-format msgid "About %s remaining" msgstr "%li 분 정도 남았음" @@ -521,23 +529,29 @@ msgstr "" #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, python-format +#, fuzzy, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" "설정 파일을 바꾸시겠습니까?\n" "'%s'" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "'diff' 명령어를 찾지 못했습니다." -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "심각한 오류 발생" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -551,25 +565,25 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "꾸러미 %s 개가 삭제될 것입니다." -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "새로운 꾸러미가 %s 개 설치될 것입니다." -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "꾸러미가 %s 개 업그레이드 될 것입니다." -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -577,37 +591,40 @@ msgid "" "You have to download a total of %s. " msgstr "총 %s개의 꾸러미를 다운로드 합니다." -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "업그레이드는 여러 시간이 걸릴 수 있고, 어떤 때에도 취소될 수 없습니다." -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "데이터 손실을 막으려면 열려있는 모든 프로그램과 문서를 닫으십시오." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "어떤 업그레이드 꾸러미도 찾을 수 없습니다." +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "시스템이 최신의 상태입니다." -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "이미 시스템이 업그레이드 되어 있습니다." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>%s 삭제</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "%s 설치" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "%s 업그레이드" @@ -641,11 +658,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "재부팅이 필요합니다." -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -681,11 +698,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>업그레이드를 시작하시겠습니까?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>" msgstr "" -"<span weight=\"bold\" size=\"x-large\">우분투 6.06 LTS로 업그레이드하는 중</" -"span>" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -809,9 +823,10 @@ msgid "Verfication failed" msgstr "검사 실패" #: ../UpdateManager/DistUpgradeFetcher.py:222 +#, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" "업그레이드를 검사하는데 실패했습니다. 네트워크나 서버에 문제가 있을 수 있습니" "다. " @@ -838,149 +853,140 @@ msgstr "%li 의 %li 파일 내려 받는 중, 속도 %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "%li 의 %li 파일 내려 받는 중, 속도 알 수 없음" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "바뀐 목록을 아직 이용할 수 없습니다. 잠시 후에 다시 해주시기 바랍니다." -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "바뀐 목록을 아직 이용할 수 없습니다. 잠시 후에 다시 해주시기 바랍니다." -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" "바뀐 목록을 다운로드하는데 실패했습니다. 인터넷 연결을 확인해 주십시오." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "우분투 5.10 보안 업데이트" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "업데이트를 설치(_I)" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "우분투 최신 버젼으로 업그레이드 합니다." +msgid "Normal updates" +msgstr "업데이트를 설치(_I)" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "업데이트를 설치(_I)" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "설치할 수 없는 업데이트가 있습니다" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "버전 %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "바뀐 목록을 다운로드 하는 중..." -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "점검(_C)" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "다운로드 크기: %s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "시스템이 최신의 상태입니다." - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "%s 개의 업데이트를 설치할 수 있습니다." -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "잠시만 기다리십시오. 이 작업은 약간의 시간이 걸립니다." -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "업데이트가 끝났습니다." -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "업데이트를 설치(_I)" + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "새 버전: %s (크기: %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "버전 %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "더 이상 지원되지 않는 배포판입니다." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -990,17 +996,17 @@ msgstr "" "그레이드 하십시오. 업그레이드에 대한 더 많은 정보는 http://www.ubuntu.com에" "서 보실 수 있습니다." -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "<b>새 배포판 '%s'를 이용할 수 있습니다</b>" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "소프트웨어 목록이 망가졌습니다." -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1022,58 +1028,67 @@ msgstr "" "\"Software Properties\"에서 설정할 수 있습니다." #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"<big><b>Examining your system</b></big>\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "<big><b>Keep your system up-to-date</b></big>" +msgstr "<big><b>시스템을 최신으로 유지하십시오.</b></big>" + +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "<big><b>Not all updates can be installed</b></big>" msgstr "" -"<big><b>시스템 검사 중</b></big>\n" +"<big><b>CD 검색 오류</b></big>\n" "\n" -"소프트웨어 업데이트는 에러를 고치고, 보안 문제를 제거하며 새로운 기능을 제공" -"합니다." +"%s" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "<big><b>Keep your system up-to-date</b></big>" -msgstr "<big><b>시스템을 최신으로 유지하십시오.</b></big>" +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "<big><b>Starting update manager</b></big>" +msgstr "<b><big>업그레이드를 시작하시겠습니까?</big></b>" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "다운로드 취소(_D)" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "변경 사항" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "점검(_k)" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "새로운 업데이트를 위해 소프트웨어 채널을 확인합니다." -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "설명" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "릴리즈 정보" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "각 파일의 진행 상황 표시" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "소프트웨어 업데이트" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1081,32 +1096,37 @@ msgstr "" "소프트웨어 업데이트는 에러를 고치고, 보안 문제를 제거하며 새로운 기능을 제공" "합니다." -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "업그레이드(_p)" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "우분투 최신 버젼으로 업그레이드 합니다." -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "점검(_C)" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "업그레이드 계속(_R)" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "앞으로 이 정보 숨김(_H)" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "업데이트를 설치(_I)" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "변경 사항" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1214,11 +1234,12 @@ msgid "_Install security updates without confirmation" msgstr "확인없이 보안 업데이트 설치(_I)" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 +#, fuzzy msgid "" -"<b><big>The channel information is out-of-date</big></b>\n" +"<b><big>The information about available software is out-of-date</big></b>\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1252,10 +1273,10 @@ msgstr "<b>URI:</b>" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the source that you want to add</b></" -"big>\n" +"<big><b>Enter the complete APT line of the repository that you want to add " +"as source</b></big>\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>추가하고자 하는 채널의 APT 줄을 완전히 입력하십시오.</b></big>\n" @@ -1311,8 +1332,9 @@ msgid "Check for new distribution releases" msgstr "새로운 배포판을 확인합니다." #: ../data/update-manager.schemas.in.h:3 +#, fuzzy msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1332,8 +1354,9 @@ msgid "Stores the size of the update-manager dialog" msgstr "업데이트 관리자 대화상자의 크기를 저장합니다." #: ../data/update-manager.schemas.in.h:7 +#, fuzzy msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "변경과 설명의 목록을 가지는 확장자의 상태를 저장합니다." @@ -1359,212 +1382,189 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "우분투 5.10 업데이트" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "커뮤니티에서 관리유지함 (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "자유소프트웨어 아님 (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "우분투 6.06 'Dapper Drake'" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "커뮤니티에서 관리유지함 (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "커뮤니티에서 관리유지함 (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "자유소프트웨어 아님 (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "자유소프트웨어 아님 (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "우분투 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "우분투 5.10 보안 업데이트" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "업데이트를 설치(_I)" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "우분투 5.10 'Breezy Badger'" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "공식적으로 지원됨" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "우분투 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "우분투 5.10 보안 업데이트" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "우분투 5.10 업데이트" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "우분투 5.10 Backports" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "우분투 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -#, fuzzy -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "공식적으로 지원됨" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "우분투 5.10 보안 업데이트" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "우분투 5.10 업데이트" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "우분투 5.10 Backports" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "우분투 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "커뮤니티에서 관리유지함 (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "자유소프트웨어 아님 (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "더 이상 공식적으로 지원하지 않는 소프트웨어가 있습니다." #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "저작권 제한됨" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "우분투 5.10 보안 업데이트" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "우분투 5.10 업데이트" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "우분투 5.10 Backports" @@ -1615,6 +1615,48 @@ msgstr "DFSG 호환이지만 자유소프트웨어가 아닌 의존성이 있는 msgid "Non-DFSG-compatible Software" msgstr "DFSG와 호환이 안되는 소프트웨어" +#~ msgid "Some software no longer officially supported" +#~ msgstr "더 이상 공식적으로 지원하지 않는 소프트웨어가 있습니다." + +#~ msgid "Could not find any upgrades" +#~ msgstr "어떤 업그레이드 꾸러미도 찾을 수 없습니다." + +#~ msgid "Your system has already been upgraded." +#~ msgstr "이미 시스템이 업그레이드 되어 있습니다." + +#, fuzzy +#~ msgid "" +#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +#~ msgstr "" +#~ "<span weight=\"bold\" size=\"x-large\">우분투 6.06 LTS로 업그레이드하는 중" +#~ "</span>" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "우분투 5.10 보안 업데이트" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "우분투 최신 버젼으로 업그레이드 합니다." + +#~ msgid "Cannot install all available updates" +#~ msgstr "설치할 수 없는 업데이트가 있습니다" + +#~ msgid "" +#~ "<big><b>Examining your system</b></big>\n" +#~ "\n" +#~ "Software updates correct errors, eliminate security vulnerabilities and " +#~ "provide new features." +#~ msgstr "" +#~ "<big><b>시스템 검사 중</b></big>\n" +#~ "\n" +#~ "소프트웨어 업데이트는 에러를 고치고, 보안 문제를 제거하며 새로운 기능을 제" +#~ "공합니다." + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "공식적으로 지원됨" + #~ msgid "" #~ "Some updates require the removal of further software. Use the function " #~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-23 19:43+0000\n" "Last-Translator: Erdal Ronahi <erdal.ronahi@gmail.com>\n" "Language-Team: Kurdish <ku@li.org>\n" @@ -129,7 +129,7 @@ msgstr "" #: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" -"<big><b>Error scaning the CD</b></big>\n" +"<big><b>Error scanning the CD</b></big>\n" "\n" "%s" msgstr "" @@ -142,79 +142,79 @@ msgstr "" msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "Paketên şikestî" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "Nikarî '%s' saz bike" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -224,15 +224,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -240,11 +240,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -257,11 +257,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -270,42 +270,42 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -314,15 +314,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -331,72 +331,77 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "_Jê bibe" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -406,19 +411,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "Tê bilindkirin" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "Bilindkirina sîstemê temam bû." @@ -439,7 +444,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, python-format msgid "About %s remaining" msgstr "" @@ -471,19 +476,25 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " @@ -493,28 +504,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "%s paket dê were rakirin." msgstr[1] "%s paket dê werin rakirin." -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "%s paket dê were sazkirin" msgstr[1] "%s paket dê werin sazkirin" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "%s paket dê were bilindkirin." msgstr[1] "%s paket dê werin bilindkirin." -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -522,36 +533,39 @@ msgid "" "You have to download a total of %s. " msgstr "Pêwîst e tu bi tevahî %s daxî." -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "Sîstema te rojane ye" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "Sîstema xwe berê hat bilindkirin." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>%s rake</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "%s saz bike" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "%s bilind bike" @@ -585,11 +599,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -620,7 +634,7 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Dest bi bilindkirinê were kirin?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -741,8 +755,8 @@ msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:222 msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -765,163 +779,150 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 msgid "The list of changes is not available" msgstr "" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" -#: ../UpdateManager/UpdateManager.py:228 -msgid "Important security updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 +msgid "Important security updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +msgid "Proposed updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 -#, fuzzy -msgid "Updates of Ubuntu" -msgstr "Ubuntu tê bilindkirin" +#: ../UpdateManager/UpdateManager.py:240 +msgid "Normal updates" +msgstr "" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 msgid "Other updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Guhertoya %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" +#: ../UpdateManager/UpdateManager.py:551 +msgid "_Check All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "Mezinahiya daxistinê: %s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "Sîstema te rojane ye" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Tu dikarî %s rojanekirinê saz bikî" msgstr[1] "Tu dikarî %s rojanekirinan saz bikî" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "Rojanekirin temam bû" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +msgid "Checking for updates" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Guhertoya nû: %s (Mezinahî: %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Guhertoya %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -937,85 +938,98 @@ msgid "" msgstr "" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"<big><b>Examining your system</b></big>\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "<big><b>Keep your system up-to-date</b></big>" +#: ../data/glade/UpdateManager.glade.h:5 +msgid "<big><b>Not all updates can be installed</b></big>" msgstr "" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "<big><b>Starting update manager</b></big>" +msgstr "<b><big>Dest bi bilindkirinê were kirin?</big></b>" + +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "Daxistinê _betal bike" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Guhartin" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Daxuyanî" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +msgid "_Distribution Upgrade" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Guhartin" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1122,10 +1136,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" -"<b><big>The channel information is out-of-date</big></b>\n" +"<b><big>The information about available software is out-of-date</big></b>\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1152,10 +1166,10 @@ msgstr "<b>URI:</b>" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 msgid "" -"<big><b>Enter the complete APT line of the source that you want to add</b></" -"big>\n" +"<big><b>Enter the complete APT line of the repository that you want to add " +"as source</b></big>\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" @@ -1205,7 +1219,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:3 msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1224,7 +1238,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:7 msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" @@ -1248,204 +1262,183 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Neazad (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Neazad (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Neazad (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:106 -msgid "Important security updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -msgid "Proposed updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "Bi piştgirtiya fermî" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 #, fuzzy msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 #, fuzzy msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -#, fuzzy -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "Bi piştgirtiya fermî" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Neazad (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "Bi piştgirtiya fermî" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "" @@ -1495,6 +1488,17 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#~ msgid "Your system has already been upgraded." +#~ msgstr "Sîstema xwe berê hat bilindkirin." + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "Ubuntu tê bilindkirin" + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "Bi piştgirtiya fermî" + #~ msgid "Download is complete" #~ msgstr "Daxistin hatiye temam kirin" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-28 20:07+0000\n" "Last-Translator: Mantas Kriaučiūnas <mantas@akl.lt>\n" "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n" @@ -129,9 +129,9 @@ msgstr "" "Jūsų pasirinkto rakto pašalinti nepavyko. Praneškite apie tai kaip klaidą." #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"<big><b>Error scaning the CD</b></big>\n" +"<big><b>Error scanning the CD</b></big>\n" "\n" "%s" msgstr "" @@ -147,11 +147,11 @@ msgstr "Įveskite disko pavadinimą" msgid "Please insert a disc in the drive:" msgstr "Įdėkite diską į įrenginį:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "Sugadinti paketai" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -160,23 +160,23 @@ msgstr "" "programa. Prieš tęsdami pirmiausia sutaisykite juos naudodamiesi „synaptic“ " "arba „apt-get“." -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Negalima atnaujinti reikiamų metapaketų" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "Turėtų būti pašalintas esminis paketas" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Nepavyko paskaičiuoti atnaujinimo" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -185,11 +185,11 @@ msgstr "" "tai kaip klaidą. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "Klaida autentikuojant keletą paketų" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -198,12 +198,12 @@ msgstr "" "Nepavyko patvirtinti kelių paketų autentiškumo. Tai gali būti laikina tinklo " "problema. Galite bandyti vėliau. Žemiau yra nepatvirtintų paketų sąrašas." -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "Negalima įdiegti „%s“" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -211,16 +211,17 @@ msgstr "" "Buvo neįmanoma įdiegti reikalingo paketo. Praneškite apie tai, kaip klaidą. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 #, fuzzy msgid "Can't guess meta-package" msgstr "Negalima nuspėti meta paketo" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -230,12 +231,12 @@ msgstr "" " Prieš tęsdami pirmiausia įdiekite vieną iš šių paketų naudodamiesi " "„synaptic“ arba „apt-get“." -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "Atsiųsti nepavyko" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -245,15 +246,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "Nuskaitoma talpykla" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -261,12 +262,12 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 #, fuzzy msgid "No valid mirror found" msgstr "Nerasta tinkamo įrašo" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -279,11 +280,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "Ar sukurti numatytųjų šaltinių sąrašą?" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -292,11 +293,11 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "Saugyklų informacija netinkama" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -304,13 +305,14 @@ msgstr "" "Saugyklos informacijos atnaujinimo rezultatas buvo sugadinta byla. " "Praneškite apie tai kaip klaidą." -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "Trečiųjų šalių šaltiniai išjungti" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#, fuzzy msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" @@ -318,11 +320,11 @@ msgstr "" "Juos galėsite vėl įjungti, kai baigsite atnaujinimą su „programų savybių“ " "įrankiu arba „Synaptic“ paketų tvarkykle." -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "Klaida atnaujinant" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -330,11 +332,11 @@ msgstr "" "Atnaujinant iškilo problema. Tai greičiausiai kokia nors tinklo problema, " "todėl iš naujo patikrinkite tinklo jungtis ir bandykite dar." -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "Diske nepakanka laisvos vietos" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -343,15 +345,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "At norite pradėti atnaujinimą?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "Nepavyko įdiegti atnaujinimų" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -363,11 +365,11 @@ msgstr "" "Atnaujinimas dabar bus nutrauktas. Jūsų sistema gali būti netinkama naudoti. " "Dabar bus vykdomas atkūrimas (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "Nepavyko atsiųsti atnaujinimų" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -375,17 +377,18 @@ msgstr "" "Atnaujinimas dabar bus nutrauktas. Patikrinkite Interneto ryšį arba įdiegimo " "laikmeną ir bandykite dar. " -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" -msgstr "Kai kuri programinė įranga nebėra oficialiai palaikoma" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 +#, fuzzy msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" "Šie įdiegti paketai nebėra oficialiai palaikomi. Dabar juos palaiko " "bendruomenė („universe“).\n" @@ -393,23 +396,23 @@ msgstr "" "Jei nesate įjungę „universe“ skyriaus, šie paketai bus siūlomi pašalinimui " "kitame žingsnyje. " -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "Pašalinti pasenusius paketus?" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "_Praleisti šį žingsnį" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "P_ašalinti" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -418,26 +421,31 @@ msgstr "" "pranešime. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "Perkraunama sistema" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "Tikrinama paketų valdyklė" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "Atnaujinama saugyklų informacija" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "Netinkama paketo informacija" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -450,19 +458,19 @@ msgstr "" "paketo „%s“.\n" "Tai labai rimta problema, praneškite apie tai kaip klaidą." -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "Klausiama patvirtinimo" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "Atnaujinama" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "Ieškoma pasenusios programinės įrangos" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "Sistemos atnaujinimas baigtas." @@ -483,7 +491,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "Atsiunčiamas failas %li iš %li, %s/s greičiu" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, python-format msgid "About %s remaining" msgstr "" @@ -513,23 +521,29 @@ msgstr "" #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, python-format +#, fuzzy, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" "Ar pakeisti konfigūracijos bylą\n" "„%s“?" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "Nerasta komanda „diff“" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "Įvyko lemtinga klaida" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -545,31 +559,31 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "Bus pašalintas %s paketas." msgstr[1] "Bus pašalinti %s paketai." msgstr[2] "Bus pašalinta %s paketų." -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "Bus įdiegtas %s naujas paketas." msgstr[1] "Bus įdiegti %s nauji paketai." msgstr[2] "Bus įdiegta %s naujų paketų." -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "Bus atnaujintas %s paketas." msgstr[1] "Bus atnaujinti %s paketai." msgstr[2] "Bus atnaujinta %s paketų." -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -577,7 +591,7 @@ msgid "" "You have to download a total of %s. " msgstr "Turite atsisiųsti viso %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -585,32 +599,35 @@ msgid "" msgstr "" "Atnaujinimas gali užtrukti keletą valandų ir vėliau jo negalima atšaukti." -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" "Norint išvengti duomenų praradimo turite užverti visas atvertas programas ir " "dokumentus." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "Nepavyko rasti jokių atnaujinimų" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "Jūsų sistema atnaujinta" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "Jūsų sistema jau buvo atnaujinta." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>Pašalinti %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "Įdiegti %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "Atnaujinti %s" @@ -644,11 +661,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "Reikia perkrauti kompiuterį" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -687,10 +704,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Pradėti atnaujinimą?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>" msgstr "" -"<span weight=\"bold\" size=\"x-large\">Atnaujinama į Ubuntu 6.06 LTS</span>" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -815,9 +830,10 @@ msgid "Verfication failed" msgstr "Tapatumo nustatymas nepavyko" #: ../UpdateManager/DistUpgradeFetcher.py:222 +#, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" "Atnaujinimo tapatumo nustatymas nepavyko. Gali būti tinklo arba serverio " "problema. " @@ -844,114 +860,100 @@ msgstr "Atsiunčiamas failas %li iš %li, %s/s greičiu" msgid "Downloading file %li of %li with unknown speed" msgstr "Atsiunčiamas failas %li iš %li, nežinomu greičiu" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "Pakeitimų sąrašas kol kas neprieinamas. Pabandykite vėliau." -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "Pakeitimų sąrašas kol kas neprieinamas. Pabandykite vėliau." -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "Nepavyko atsiųsti pakeitimų sąrašo. Patikrinkite Interneto ryšį." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Ubuntu 5.10 saugumo atnaujinimai" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "Diegiami atnaujinimai" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "Atnaujinti iki naujausios Ubuntu versijos" +msgid "Normal updates" +msgstr "Diegiami atnaujinimai" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "Diegiami atnaujinimai" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "Negalima įdiegti visų galimų atnaujinimų" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Versija %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "Atsiunčiamas pakeitimų sąrašas..." -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "_Patikrinti" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "Atsiuntimo dydis: %s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "Jūsų sistema atnaujinta" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, fuzzy, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -959,35 +961,40 @@ msgstr[0] "Rodyti ir įdiegti galimus atnaujinimus" msgstr[1] "Rodyti ir įdiegti galimus atnaujinimus" msgstr[2] "Rodyti ir įdiegti galimus atnaujinimus" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "Palaukite, tai gali užtrukti." -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "Atnaujinimas užbaigtas" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "Diegiami atnaujinimai" + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Nauja versija: %s (Dydis: %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Versija %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "Jūsų distribucija daugiau nebepalaikoma" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -997,17 +1004,17 @@ msgstr "" "Atnaujinkite į naujausią „Ubuntu Linux“ versiją. Daugiau informacijos apie " "atnaujinimą rasite http://www.ubuntu.com ." -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "Programinės įrangos turinys sugadintas" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1031,59 +1038,67 @@ msgstr "" "naudodamiesi „Sistema“ -> „Administravimas“ -> „Programinės įrangos savybės“." #: ../data/glade/UpdateManager.glade.h:4 +msgid "<big><b>Keep your system up-to-date</b></big>" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:5 #, fuzzy -msgid "" -"<big><b>Examining your system</b></big>\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "<big><b>Not all updates can be installed</b></big>" msgstr "" -"<big><b>Ieškoma galimų atnaujinimų</b></big>\n" +"<big><b>Klaida skanuojant CD</b></big>\n" "\n" -"Programinės įrangos atnaujinimai gali ištaisyti klaidas, pašalinti saugumo " -"spragas bei suteikti naujas funkcijas." +"%s" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "<big><b>Keep your system up-to-date</b></big>" -msgstr "" +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "<big><b>Starting update manager</b></big>" +msgstr "<b><big>Pradėti atnaujinimą?</big></b>" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "Atšaukti _atsiuntimą" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Pakeitimai" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "Ti_krinti" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "Patikrinti programų kanalus dėl atnaujinimų" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Aprašymas" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "Leidimo aprašymas" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "Rodyti pavienių failų progresą" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Programinės įrangos atnaujinimai" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 #, fuzzy msgid "" "Software updates correct errors, eliminate security vulnerabilities and " @@ -1092,32 +1107,37 @@ msgstr "" "Programinės įrangos atnaujinimai gali ištaisyti klaidas, pašalinti saugumo " "spragas bei suteikti naujas funkcijas." -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "At_naujinti" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "Atnaujinti iki naujausios Ubuntu versijos" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "_Patikrinti" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "_Tęsti atnaujinimą" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "_Nerodyti šios informacijos ateityje" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "Į_diegti atnaujinimus" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Pakeitimai" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1229,11 +1249,12 @@ msgid "_Install security updates without confirmation" msgstr "Į_diegti saugumo atnaujinimus neklausiant patvirtinimo" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 +#, fuzzy msgid "" -"<b><big>The channel information is out-of-date</big></b>\n" +"<b><big>The information about available software is out-of-date</big></b>\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1267,10 +1288,10 @@ msgstr "<b>URI:</b>" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the source that you want to add</b></" -"big>\n" +"<big><b>Enter the complete APT line of the repository that you want to add " +"as source</b></big>\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>Įveskite visą Jūsų norimo pridėti kanalo APT eilutę</b></big>\n" @@ -1327,8 +1348,9 @@ msgid "Check for new distribution releases" msgstr "Tikrinti, ar yra išleista nauja distribucijos (OS) versija" #: ../data/update-manager.schemas.in.h:3 +#, fuzzy msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1350,7 +1372,7 @@ msgstr "Išsaugo update-manager dialogų dydį" #: ../data/update-manager.schemas.in.h:7 msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" @@ -1378,211 +1400,189 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 atnaujinimai" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "Prižiūrima bendruomenės (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Ne Laisva (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 „Dapper Drake“" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "Prižiūrima bendruomenės (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "Prižiūrima bendruomenės (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Ne Laisva (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Ne Laisva (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 „Dapper Drake“" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Ubuntu 5.10 saugumo atnaujinimai" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "Diegiami atnaujinimai" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 „Breezy Badger“" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "Oficialiai palaikoma" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 „Breezy Badger“" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 saugumo atnaujinimai" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 atnaujinimai" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 atnaujinimai" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.10 „Breezy Badger“" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -msgid "Oficially supported" -msgstr "Prižiūrima oficialiai" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" +msgstr "Oficialiai palaikoma" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 saugumo atnaujinimai" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 atnaujinimai" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 atnaujinimai" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 „Breezy Badger“" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Prižiūrima bendruomenės (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Ne Laisva (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "Kai kuri programinė įranga nebėra oficialiai palaikoma" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Apribotos autorinės teisės" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 5.10 saugumo atnaujinimai" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 5.10 atnaujinimai" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 atnaujinimai" @@ -1633,6 +1633,48 @@ msgstr "Su DFSG suderinama programinė įranga su Ne Laisvomis priklausomybėmis msgid "Non-DFSG-compatible Software" msgstr "Su DFSG nesuderinama programinė įranga" +#~ msgid "Some software no longer officially supported" +#~ msgstr "Kai kuri programinė įranga nebėra oficialiai palaikoma" + +#~ msgid "Could not find any upgrades" +#~ msgstr "Nepavyko rasti jokių atnaujinimų" + +#~ msgid "Your system has already been upgraded." +#~ msgstr "Jūsų sistema jau buvo atnaujinta." + +#, fuzzy +#~ msgid "" +#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +#~ msgstr "" +#~ "<span weight=\"bold\" size=\"x-large\">Atnaujinama į Ubuntu 6.06 LTS</" +#~ "span>" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Ubuntu 5.10 saugumo atnaujinimai" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "Atnaujinti iki naujausios Ubuntu versijos" + +#~ msgid "Cannot install all available updates" +#~ msgstr "Negalima įdiegti visų galimų atnaujinimų" + +#, fuzzy +#~ msgid "" +#~ "<big><b>Examining your system</b></big>\n" +#~ "\n" +#~ "Software updates correct errors, eliminate security vulnerabilities and " +#~ "provide new features." +#~ msgstr "" +#~ "<big><b>Ieškoma galimų atnaujinimų</b></big>\n" +#~ "\n" +#~ "Programinės įrangos atnaujinimai gali ištaisyti klaidas, pašalinti " +#~ "saugumo spragas bei suteikti naujas funkcijas." + +#~ msgid "Oficially supported" +#~ msgstr "Prižiūrima oficialiai" + #~ msgid "" #~ "Some updates require the removal of further software. Use the function " #~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: mk\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-23 19:43+0000\n" "Last-Translator: Арангел Ангов <ufo@linux.net.mk>\n" "Language-Team: Macedonian <ossm-members@hedona.on.net.mk>\n" @@ -136,7 +136,7 @@ msgstr "" #: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" -"<big><b>Error scaning the CD</b></big>\n" +"<big><b>Error scanning the CD</b></big>\n" "\n" "%s" msgstr "" @@ -149,33 +149,33 @@ msgstr "" msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -184,23 +184,23 @@ msgstr "" "како бубачка. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -210,24 +210,24 @@ msgstr "" "како бубачка. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -237,15 +237,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -253,11 +253,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -270,12 +270,12 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 #, fuzzy msgid "Generate default sources?" msgstr "Врати ги стандардните клучеви" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -284,43 +284,43 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 #, fuzzy msgid "Error during update" msgstr "Грешка при отстранување на клучот" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -329,15 +329,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -346,73 +346,78 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 #, fuzzy msgid "Checking package manager" msgstr "Веќе работи друг менаџер за пакети" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -422,20 +427,20 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 #, fuzzy msgid "Upgrading" msgstr "Надградбата е завршена" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "" @@ -455,7 +460,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, python-format msgid "About %s remaining" msgstr "" @@ -488,19 +493,25 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " @@ -510,31 +521,31 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 #, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 #, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, python-format msgid "" "\n" @@ -542,36 +553,40 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +#, fuzzy +msgid "Your system is up-to-date" +msgstr "Вашиот систем е надграден!" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "" @@ -605,11 +620,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -640,7 +655,7 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -767,8 +782,8 @@ msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:222 msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -792,16 +807,16 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "Достапна е нова верзија на Убунту!" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " @@ -810,101 +825,85 @@ msgstr "" "Не успеав да ги преземам промените. Ве молам проверете дали Вашата интернет " "врска е активна." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Безбедносни надградби за Debian Stable" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "Инсталирам надградби..." -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 -msgid "Updates of Ubuntu" -msgstr "" +#: ../UpdateManager/UpdateManager.py:240 +#, fuzzy +msgid "Normal updates" +msgstr "Инсталирам надградби..." #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "Инсталирам надградби..." -#: ../UpdateManager/UpdateManager.py:276 -#, fuzzy -msgid "Cannot install all available updates" -msgstr "Проверувам за надградби..." - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Верзија %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 #, fuzzy msgid "Downloading the list of changes..." msgstr "Преземам промени" -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" +#: ../UpdateManager/UpdateManager.py:551 +msgid "_Check All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, fuzzy, python-format msgid "Download size: %s" msgstr "Преземам промени" -#: ../UpdateManager/UpdateManager.py:632 -#, fuzzy -msgid "Your system is up-to-date" -msgstr "Вашиот систем е надграден!" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, fuzzy, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -912,53 +911,58 @@ msgstr[0] "Инсталирам надградби..." msgstr[1] "Инсталирам надградби..." msgstr[2] "Инсталирам надградби..." -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "Проверувам за надградби..." + +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Верзија %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "Вашата дистрибуција повеќе не е поддржана" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -974,86 +978,98 @@ msgid "" msgstr "" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"<big><b>Examining your system</b></big>\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "<big><b>Keep your system up-to-date</b></big>" +#: ../data/glade/UpdateManager.glade.h:5 +msgid "<big><b>Not all updates can be installed</b></big>" msgstr "" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:6 +msgid "<big><b>Starting update manager</b></big>" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Промени" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Опис" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Надградба на софтвер" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +msgid "_Distribution Upgrade" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "_Install Updates" msgstr "Инсталирам надградби..." -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Промени" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1168,10 +1184,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" -"<b><big>The channel information is out-of-date</big></b>\n" +"<b><big>The information about available software is out-of-date</big></b>\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1200,10 +1216,10 @@ msgstr "<b>Адреса:</b>" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the source that you want to add</b></" -"big>\n" +"<big><b>Enter the complete APT line of the repository that you want to add " +"as source</b></big>\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>Внесете ја комплетната линија за APT складиштето за да го додадете</" @@ -1264,7 +1280,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:3 msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1283,7 +1299,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:7 msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" @@ -1308,214 +1324,191 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Надградби за Убунту 5.10" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "Оддржувано од заедницата (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Додатен софтвер" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 #, fuzzy msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "CD диск со Убунту 4.10 \"Warty Warthog\"" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Надградби за Убунту 5.04" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "Оддржувано од заедницата (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "Оддржувано од заедницата (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Неслободно (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Неслободно (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "By copyright or legal issues restricted software" msgstr "Забранет софтвер во САД" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Надградби за Убунту 5.04" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Безбедносни надградби за Debian Stable" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "Инсталирам надградби..." - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 #, fuzzy msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "CD диск со Убунту 5.10 \"Breezy Badger\"" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "Официјално поддржано" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "CD диск со Убунту 5.10 \"Breezy Badger\"" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Безбедносни надградби за Убунту 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Надградби за Убунту 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Надградби за Убунту 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD диск со Убунту 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD диск со Убунту 5.04 \"Hoary Hedgehog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -#, fuzzy -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "Официјално поддржано" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "Безбедносни надградби за Убунту 5.04" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "Надградби за Убунту 5.04" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Надградби за Убунту 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "CD диск со Убунту 4.10 \"Warty Warthog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Оддржувано од заедницата (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Неслободно (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 #, fuzzy msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "CD диск со Убунту 4.10 \"Warty Warthog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "Официјално поддржано" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Restricted copyright" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Безбедносни надградби за Убунту 4.10" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "Надградби за Убунту 4.10" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Надградби за Убунту 5.10" @@ -1570,6 +1563,18 @@ msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Безбедносни надградби за Debian Stable" + +#, fuzzy +#~ msgid "Cannot install all available updates" +#~ msgstr "Проверувам за надградби..." + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "Официјално поддржано" + +#, fuzzy #~ msgid "The upgrade aborts now. Please report this bug." #~ msgstr "" #~ "Клучот што го избравте не може да биде отстранет. Ве молам пријавете го " @@ -1873,9 +1878,6 @@ msgstr "" #~ msgid "Updating package list..." #~ msgstr "Ја ажурирам листата на пакети..." -#~ msgid "Checking for updates..." -#~ msgstr "Проверувам за надградби..." - #~ msgid "Installing updates..." #~ msgstr "Инсталирам надградби..." @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-30 13:49+0000\n" "Last-Translator: azlinux <azlinux@gmail.com>\n" "Language-Team: Malay <ms@li.org>\n" @@ -130,9 +130,9 @@ msgstr "" "ralat pepijat." #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"<big><b>Error scaning the CD</b></big>\n" +"<big><b>Error scanning the CD</b></big>\n" "\n" "%s" msgstr "" @@ -148,11 +148,11 @@ msgstr "Sila masukkan nama untuk cakera padat" msgid "Please insert a disc in the drive:" msgstr "Sila masukkan cakera padat kedalam pemacu" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "Pakej rosak" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -161,23 +161,23 @@ msgstr "" "menggunakan sofwer ini. Sila baiki dahulu menggunakan synaptic atau apt-get " "sebelum meneruskan." -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Tidak dapat menaikkan taraf pakej-meta yang diperlukan" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "Satu pakej yang perlu terpaksa dikeluarkan" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Tidak dapat menjangka penaikkan taraf" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -186,23 +186,23 @@ msgstr "" "penaikkan. Sila laporkan ini sebagai ralat pepijat. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "Tidak dapat memasang '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -211,15 +211,16 @@ msgstr "" "pepijat. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "Pakej meta tidak dapat diduga." -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -229,11 +230,11 @@ msgstr "" "Sila pasangkan salah satu pakej diatas dahulu menggunakan synaptic ataupun " "apt-get sebelum meneruskan pemasangan." -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -243,15 +244,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -259,11 +260,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -276,11 +277,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -289,23 +290,24 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "Sumber ketiga tidak diaktifkan." -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#, fuzzy msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" @@ -314,11 +316,11 @@ msgstr "" "selepas penaikkan taraf menggunakan alatan 'software-properties' ataupun " "'synaptic'." -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "Ralat semasa pengemaskinian." -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -327,11 +329,11 @@ msgstr "" "yang berkaitan dengan masaalah rangkaian, sila periksa dan cuba lagi " "sambungan rangkaian anda." -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "Muatak cakera keras tidak mencukupi." -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -343,15 +345,15 @@ msgstr "" "pemasangan sebelum ini menggunakan 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "Anda mahu mulakan penaikkan taraf?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "Tidak dapat memasang pakej-pakej penaikkan taraf." -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -363,11 +365,11 @@ msgstr "" "Penaikkan taraf tidak dapat diteruskan. Sistem anda mungkin tidak stabil. " "Sistem 'recovery' telah dijalankan (dpkg --configure -a)" -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "Pakej-pakej penaikan taraf tidak dapat dicapai." -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -375,67 +377,72 @@ msgstr "" "Penaikkan taraf tidak dapat diteruskan. Sila semak sambungan 'internet' atau " "media pemasangan anda dan cuba lagi. " -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" -msgstr "Sesetengah sofwer tidak ada sokongan/bantuan rasmi lagi." +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 #, fuzzy msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" "Pakej-pakej yang telah dipasang ini sudah tidak ada sokonga/bantuan rasmi " "dan ianya hanya dibantu/sokong oleh 'community-supported('universe')\n" "Jika anda tidak megaktifkan 'universe', pakej-pakej ini akan dicadangkan " "untuk dikeluarkan di peringkat selanjutnya. " -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "Keluarkan pakej-pakej yang sudah luput?" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -445,19 +452,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "" @@ -477,7 +484,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, python-format msgid "About %s remaining" msgstr "" @@ -509,19 +516,25 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " @@ -531,28 +544,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." +msgstr[0] "Satu pakej yang perlu terpaksa dikeluarkan" +msgstr[1] "Satu pakej yang perlu terpaksa dikeluarkan" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 #, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 #, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." -msgstr[0] "" -msgstr[1] "" - -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, python-format msgid "" "\n" @@ -560,36 +573,39 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "" @@ -623,11 +639,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -658,7 +674,7 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -780,8 +796,8 @@ msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:222 msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -804,162 +820,150 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 msgid "The list of changes is not available" msgstr "" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" -#: ../UpdateManager/UpdateManager.py:228 -msgid "Important security updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 +msgid "Important security updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +msgid "Proposed updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 -msgid "Updates of Ubuntu" +#: ../UpdateManager/UpdateManager.py:240 +msgid "Normal updates" msgstr "" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 msgid "Other updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" +#: ../UpdateManager/UpdateManager.py:551 +msgid "_Check All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +msgid "Checking for updates" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -975,84 +979,104 @@ msgid "" msgstr "" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"<big><b>Examining your system</b></big>\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "<big><b>Keep your system up-to-date</b></big>" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "<big><b>Not all updates can be installed</b></big>" +msgstr "" +"<big><b>Ralat semasa mengimbas Cakera Padat</b></big>↵\n" +"↵\n" +"%s" + +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "<big><b>Starting update manager</b></big>" msgstr "" +"<big><b>Ralat semasa mengimbas Cakera Padat</b></big>↵\n" +"↵\n" +"%s" #: ../data/glade/UpdateManager.glade.h:7 -msgid "<big><b>Keep your system up-to-date</b></big>" +msgid "Cancel _Download" msgstr "" #: ../data/glade/UpdateManager.glade.h:8 -msgid "Cancel _Download" +msgid "Changes" msgstr "" #: ../data/glade/UpdateManager.glade.h:9 -msgid "Changes" +msgid "Changes and description of the update" msgstr "" #: ../data/glade/UpdateManager.glade.h:10 -msgid "Changes and description of the update" +msgid "Chec_k" msgstr "" #: ../data/glade/UpdateManager.glade.h:11 -msgid "Chec_k" +msgid "Check the software channels for new updates" msgstr "" #: ../data/glade/UpdateManager.glade.h:12 -msgid "Check the software channels for new updates" +msgid "Description" msgstr "" #: ../data/glade/UpdateManager.glade.h:13 -msgid "Description" +msgid "Release Notes" msgstr "" #: ../data/glade/UpdateManager.glade.h:14 -msgid "Release Notes" +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +msgid "_Distribution Upgrade" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 msgid "changes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1156,10 +1180,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" -"<b><big>The channel information is out-of-date</big></b>\n" +"<b><big>The information about available software is out-of-date</big></b>\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1186,10 +1210,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 msgid "" -"<big><b>Enter the complete APT line of the source that you want to add</b></" -"big>\n" +"<big><b>Enter the complete APT line of the repository that you want to add " +"as source</b></big>\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" @@ -1239,7 +1263,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:3 msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1258,7 +1282,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:7 msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" @@ -1282,193 +1306,173 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:106 -msgid "Important security updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -msgid "Proposed updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "Sesetengah sofwer tidak ada sokongan/bantuan rasmi lagi." #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "" @@ -1517,3 +1521,6 @@ msgstr "" #: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" + +#~ msgid "Some software no longer officially supported" +#~ msgstr "Sesetengah sofwer tidak ada sokongan/bantuan rasmi lagi." @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: nb\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-29 13:06+0000\n" "Last-Translator: Hans Petter Birkeland <hanspb@bluezone.no>\n" "Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.uio.no>\n" @@ -131,9 +131,9 @@ msgid "The key you selected could not be removed. Please report this as a bug." msgstr "Nøkkelen du valgte kan ikke fjernes. Vennligst rapporter denne feilen." #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"<big><b>Error scaning the CD</b></big>\n" +"<big><b>Error scanning the CD</b></big>\n" "\n" "%s" msgstr "" @@ -149,11 +149,11 @@ msgstr "Vennligst oppgi et navn for platen" msgid "Please insert a disc in the drive:" msgstr "Vennligst sett inn en plate i CD-spilleren:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "Skadede pakker" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -162,23 +162,23 @@ msgstr "" "av dette programmet. Vennligst rett opp i dette ved å bruke Synaptic eller " "apt-get før du fortsetter." -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Kan ikke oppgradere nødvendige meta-pakker" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "En nødvendig pakke må fjernes" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Kunne ikke forberede oppgraderingen" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -187,11 +187,11 @@ msgstr "" "rapporter dette som en feil. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "Kunne ikke autentisere noen pakker" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -201,12 +201,12 @@ msgstr "" "nettverksproblem, så du bør prøve igjen senere. Se under for listen over " "pakker som ikke kunne autentiseres." -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "Kan ikke installere '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -214,15 +214,16 @@ msgstr "" "Kunne ikke installere en nødvendig pakke. Vennligst rapporter denne feilen. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "Kan ikke gjette på meta-pakke" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -232,12 +233,12 @@ msgstr "" " Vennligst installer én av de nevnte pakkene først ved å bruke synaptic " "eller apt-get før du fortsetter." -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "Kunne ikke hente" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -247,15 +248,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "Leser mellomlager" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -263,11 +264,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "Fant ikke noe gyldig speil" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -287,11 +288,11 @@ msgstr "" "Hvis du velger \"Nei\" vil oppgraderingen avbrytes." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "Vil du opprette standardkilder?" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -305,11 +306,11 @@ msgstr "" "Skal standard linjer for '%s' legges til? Hvis du velger 'Nei' vil " "oppdateringen avbrytes." -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "Ugyldig informasjon om arkiv" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -317,13 +318,14 @@ msgstr "" "Oppgradering av kanalinformasjon resulterte i en ugyldig fil. Vennligst " "rapporter dette som en feil." -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "Tredjepartskilder er deaktivert" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#, fuzzy msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" @@ -331,11 +333,11 @@ msgstr "" "aktivere dem etter oppgraderingen ved hjelp av verktøyet 'Egenskaper for " "programvare' eller med Synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "Feil under oppdatering" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -344,11 +346,11 @@ msgstr "" "problem med nettverkstilkoblingen. Vennligst sjekk nettverkstilkoblingen din " "og prøv igjen." -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "Ikke nok ledig diskplass" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -360,15 +362,15 @@ msgstr "" "bruke 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "Ønsker du å starte oppgraderingen?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "Kunne ikke installere oppgraderingene" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -380,11 +382,11 @@ msgstr "" "Oppgraderingen avbrytes nå. Systemet ditt kan være ubrukelig. En reperasjon " "ble forsøkt kjørt (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "Kunne ikke laste ned alle oppgraderingene." -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -392,17 +394,18 @@ msgstr "" "Oppgraderingen avbrytes nå. Vennligst sjekk internet-tilkoblingen eller " "installasjonsmediet og prøv på nytt. " -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" -msgstr "Noe programvare er ikke lenger offisielt støttet" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 +#, fuzzy msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" "Disse installerte pakkene er ikke lenger offisielt støttet og er nå kun " "støttet av miljøet 'universe'.\n" @@ -410,23 +413,23 @@ msgstr "" "Hvis du ikke har 'universe' aktivert vil disse pakkene bli foreslått fjernet " "i neste steg. " -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "Ønsker du å fjerne utdaterte pakker?" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "_Hopp over dette punktet" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "_Fjern" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "Feil ved commit" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -435,26 +438,31 @@ msgstr "" "informasjon. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "Gjenoppretter systemets originale tilstand" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "Sjekker pakkehåndterer" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "Oppdaterer informasjon om arkivet" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "Ugyldig pakkeinformasjon" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -467,19 +475,19 @@ msgstr "" "pakken '%s'.\n" "Dette indikerer en alvorlig feil, vennligst rapportér denne feilen." -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "Spør om bekreftelse" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "Oppgraderer" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "Søker etter utdatert programvare" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "Systemoppgraderingen er fullført" @@ -500,7 +508,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "Laster ned fil %li av %li med %s/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, fuzzy, python-format msgid "About %s remaining" msgstr "Rundt %li minutter gjenstår" @@ -530,23 +538,29 @@ msgstr "" #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, python-format +#, fuzzy, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" "Vil du erstatte konfigurasjonsfilen\n" "'%s?'" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "Kommandoen 'diff' ble ikke funnet" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "En uopprettelig feil oppsto" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -560,28 +574,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "%s pakke vil bli fjernet." msgstr[1] "%s pakker vil bli fjernet" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "%s pakke vil bli installert." msgstr[1] "%s pakker vil bli installert." -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "%s pakke vil bli oppgradert." msgstr[1] "%s pakker vil bli oppgradert." -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -589,7 +603,7 @@ msgid "" "You have to download a total of %s. " msgstr "Du må laste ned totalt %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -598,31 +612,34 @@ msgstr "" "Oppgraderingen kan ta flere timer og kan ikke avbrytes på noe senere " "tidspunkt." -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" "For å forhindre tap av data bør du lukke alle åpne programmer og dokumenter." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "Kunne ikke finne noen oppgraderinger" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "Systemet ditt er oppdatert!" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "Systemet ditt er allerede oppgradert." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>Fjern %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "Installér %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "Oppgradér %s" @@ -656,11 +673,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "Omstart er nødvendig" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -698,10 +715,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Vil du starte oppgraderingen?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>" msgstr "" -"<span weight=\"bold\" size=\"x-large\">Oppgraderer til Ubuntu 6.06 LTS</span>" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -827,9 +842,10 @@ msgid "Verfication failed" msgstr "Verifisering feilet" #: ../UpdateManager/DistUpgradeFetcher.py:222 +#, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" "Verifisering av oppgraderingen feilet. Det kan være en feil med nettverket " "eller med tjeneren. " @@ -856,16 +872,16 @@ msgstr "Laster ned filen %li av %li med %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Laster ned fil %li av %li ved ukjent hastighet" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "Listen over endringer er ikke tilgjengelig ennå. Prøv senere." -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "Listen over endringer er ikke tilgjengelig ennå. Prøv senere." -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -873,134 +889,125 @@ msgstr "" "Kunne ikke laste ned listen med endringer. Vennligst kontrollér " "internettilkoblingen." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Ubuntu 5.10 Sikkerhetsoppdateringer" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "Installerer oppdateringer" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "Oppgrader til siste versjon av Ubuntu" +msgid "Normal updates" +msgstr "Installerer oppdateringer" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "Installerer oppdateringer" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "Kan ikke installere alle tilgjengelige oppdateringer." - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Versjon %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "Laster ned listen med endringer..." -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "Sjekk" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "Nedlastingsstørrelse: %s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "Systemet ditt er oppdatert!" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Du kan installere %s oppdatering" msgstr[1] "Du kan installere %s oppdateringer" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "Vennligst vent, dette kan ta litt tid." -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "Oppdateringen er fullført" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "Sjekker for tilgjengelige oppdateringer" + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Ny versjon: %s (Størrelse: %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Versjon %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "Din distribusjon er ikke lenger støttet" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -1010,17 +1017,17 @@ msgstr "" "oppdateringer. Oppgradér til en nyere utgivelse av Ubuntu. Se http://www." "ubuntu.com for mer informasjon om oppgradering." -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "<b>Ny versjon \"%s\" er tilgjengelig</b>" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "Programvareoversikten er ødelagt." -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1043,58 +1050,67 @@ msgstr "" "under \"System\" -> \"Administrasjon\" -> \"Egenskaper for programvare\"" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"<big><b>Examining your system</b></big>\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "<big><b>Keep your system up-to-date</b></big>" +msgstr "<big><b>Hold systemet ditt oppdatert</b></big>" + +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "<big><b>Not all updates can be installed</b></big>" msgstr "" -"<big><b>Analyserer systemet</b></big>\n" +"<big><b>Kunne ikke søke gjennom CD</b></big>\n" "\n" -"Programvareoppdateringer reparerer feil, eliminerer sikkerhetsproblemer og " -"gir deg ny funksjonalitet." +"%s" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "<big><b>Keep your system up-to-date</b></big>" -msgstr "<big><b>Hold systemet ditt oppdatert</b></big>" +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "<big><b>Starting update manager</b></big>" +msgstr "<b><big>Vil du starte oppgraderingen?</big></b>" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "Avbryt ne_dlasting" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Endringer" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "Sjek_k" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "Sjekk programvarekanalene for nye oppdateringer" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Beskrivelse" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "Utgivelsesinformasjon" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "Vis fremdrift for enkeltfiler" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Programvareoppdateringer" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1102,32 +1118,37 @@ msgstr "" "Programvareoppdateringer fikser feil, fjerner sikkerhetshull og tilbyr ny " "funksjonalitet." -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "O_ppgrader" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "Oppgrader til siste versjon av Ubuntu" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "Sjekk" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "_Gjenoppta oppgradering" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "Skjul denne informasjonen i fremtiden" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "_Installerer oppdateringer" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Endringer" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1238,11 +1259,12 @@ msgid "_Install security updates without confirmation" msgstr "_Installer sikkerhetsoppdateringer uten bekreftelse" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 +#, fuzzy msgid "" -"<b><big>The channel information is out-of-date</big></b>\n" +"<b><big>The information about available software is out-of-date</big></b>\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1276,10 +1298,10 @@ msgstr "<b>URI:</b>" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the source that you want to add</b></" -"big>\n" +"<big><b>Enter the complete APT line of the repository that you want to add " +"as source</b></big>\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>Skriv inn hele APT-linjen for kanalen du vil legge til</b> </big>\n" @@ -1337,8 +1359,9 @@ msgid "Check for new distribution releases" msgstr "Se etter nye utgivelser av distribusjonen" #: ../data/update-manager.schemas.in.h:3 +#, fuzzy msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1359,8 +1382,9 @@ msgid "Stores the size of the update-manager dialog" msgstr "Lagrer størrelsen for update-manager-vinduet" #: ../data/update-manager.schemas.in.h:7 +#, fuzzy msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" "Lagrer ditt valg for hvorvidt endringslogger og beskrivelse av programmer " @@ -1388,213 +1412,191 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 Oppdateringer" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "Vedlikeholdt av miljøet (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Bidratt programvare" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 #, fuzzy msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "CD med Ubuntu 4.10 «Warty Warthog»" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "Vedlikeholdt av miljøet (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "Vedlikeholdt av miljøet (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Non-free (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Non-free (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "By copyright or legal issues restricted software" msgstr "US eksport begrenset programvare" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Ubuntu 5.10 Sikkerhetsoppdateringer" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "Installerer oppdateringer" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "Offisielt støttet" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 Sikkerhetsoppdateringer" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 Oppdateringer" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Backports" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "Offisielt støttet" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 Sikkerhetsoppdateringer" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 Oppdateringer" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 Backports" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "CD med Ubuntu 4.10 «Warty Warthog»" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Vedlikeholdt av miljøet (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Non-free (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 #, fuzzy msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "CD med Ubuntu 4.10 «Warty Warthog»" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "Noe programvare er ikke lenger offisielt støttet" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Begrenset opphavsrett" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 Security Updates" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 4.10 Updates" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 Backports" @@ -1645,6 +1647,47 @@ msgstr "DFSG-kompatiblel programvare med Non-Free avhengigheter" msgid "Non-DFSG-compatible Software" msgstr "Ikke-DFSG-kompatibel programvare" +#~ msgid "Some software no longer officially supported" +#~ msgstr "Noe programvare er ikke lenger offisielt støttet" + +#~ msgid "Could not find any upgrades" +#~ msgstr "Kunne ikke finne noen oppgraderinger" + +#~ msgid "Your system has already been upgraded." +#~ msgstr "Systemet ditt er allerede oppgradert." + +#, fuzzy +#~ msgid "" +#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +#~ msgstr "" +#~ "<span weight=\"bold\" size=\"x-large\">Oppgraderer til Ubuntu 6.06 LTS</" +#~ "span>" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Ubuntu 5.10 Sikkerhetsoppdateringer" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "Oppgrader til siste versjon av Ubuntu" + +#~ msgid "Cannot install all available updates" +#~ msgstr "Kan ikke installere alle tilgjengelige oppdateringer." + +#~ msgid "" +#~ "<big><b>Examining your system</b></big>\n" +#~ "\n" +#~ "Software updates correct errors, eliminate security vulnerabilities and " +#~ "provide new features." +#~ msgstr "" +#~ "<big><b>Analyserer systemet</b></big>\n" +#~ "\n" +#~ "Programvareoppdateringer reparerer feil, eliminerer sikkerhetsproblemer " +#~ "og gir deg ny funksjonalitet." + +#~ msgid "Oficially supported" +#~ msgstr "Offisielt støttet" + #~ msgid "" #~ "Some updates require the removal of further software. Use the function " #~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " @@ -1754,9 +1797,6 @@ msgstr "Ikke-DFSG-kompatibel programvare" #~ msgid "<b>Sections</b>" #~ msgstr "<b>Seksjoner</b>" -#~ msgid "Check for available updates" -#~ msgstr "Sjekker for tilgjengelige oppdateringer" - #~ msgid "<b>Sections:</b>" #~ msgstr "<b>Seksjoner:</b>" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager.HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-23 19:43+0000\n" "Last-Translator: Jaydeep Bhusal <zaydeep@hotmail.com>\n" "Language-Team: Nepali <info@mpp.org.np>\n" @@ -134,7 +134,7 @@ msgstr "तपाईंले चयन गरेको कुञ्जि ह #: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" -"<big><b>Error scaning the CD</b></big>\n" +"<big><b>Error scanning the CD</b></big>\n" "\n" "%s" msgstr "" @@ -147,56 +147,56 @@ msgstr "" msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." msgstr "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -204,24 +204,24 @@ msgid "" msgstr "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -231,15 +231,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -247,11 +247,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -264,11 +264,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -277,43 +277,43 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 #, fuzzy msgid "Error during update" msgstr "कुञ्जि हटाउँदा त्रुटि" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -322,15 +322,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -339,73 +339,78 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 #, fuzzy msgid "Checking package manager" msgstr "अर्को प्याकेज व्यवस्थापक चलिरेको छ" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -415,20 +420,20 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 #, fuzzy msgid "Upgrading" msgstr "स्तरवृद्धि समाप्त" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "" @@ -448,7 +453,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, python-format msgid "About %s remaining" msgstr "" @@ -481,19 +486,25 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " @@ -503,28 +514,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 #, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 #, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, python-format msgid "" "\n" @@ -532,37 +543,40 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "" - -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 #, fuzzy -msgid "Your system has already been upgraded." -msgstr "तपाईंको प्रणालीमा टुटेका प्याकेजहरु छन!" +msgid "Your system is up-to-date" +msgstr "तपाइं को प्रणालि अप-टु-डेट छ!" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "" @@ -596,11 +610,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -631,7 +645,7 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -756,8 +770,8 @@ msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:222 msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -781,169 +795,159 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "युबन्टुको एउटा नयाँ विमोचन उपलब्ध छ!" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "परिवर्तनहरु डाउनलोड गर्न असफल. यदि सक्रिय इन्टरनेट जडान छ भने जाँच्नुहोस" -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "स्तरवृद्धिहरु स्थापना गर्दै" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 -msgid "Updates of Ubuntu" -msgstr "" +#: ../UpdateManager/UpdateManager.py:240 +#, fuzzy +msgid "Normal updates" +msgstr "स्तरवृद्धिहरु स्थापना गर्दै" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "स्तरवृद्धिहरु स्थापना गर्दै" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "संस्करण %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 #, fuzzy msgid "Downloading the list of changes..." msgstr "परिवर्तनहरु डाउनलोड गर्दै" -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" +#: ../UpdateManager/UpdateManager.py:551 +msgid "_Check All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, fuzzy, python-format msgid "Download size: %s" msgstr "परिवर्तनहरु डाउनलोड गर्दै" -#: ../UpdateManager/UpdateManager.py:632 -#, fuzzy -msgid "Your system is up-to-date" -msgstr "तपाइं को प्रणालि अप-टु-डेट छ!" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, fuzzy, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "स्तरवृद्धिहरु स्थापना गर्दै" msgstr[1] "स्तरवृद्धिहरु स्थापना गर्दै" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "स्तरवृद्धिहरु स्थापना गर्दै" + +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "संस्करण %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "तपाईंको वितरण समर्थित छैन" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -959,86 +963,98 @@ msgid "" msgstr "" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"<big><b>Examining your system</b></big>\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "<big><b>Keep your system up-to-date</b></big>" +#: ../data/glade/UpdateManager.glade.h:5 +msgid "<big><b>Not all updates can be installed</b></big>" msgstr "" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:6 +msgid "<big><b>Starting update manager</b></big>" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "परिवर्तनहरु" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "बर्णन" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "सफ्टवेयर अद्यावधिकहरु" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +msgid "_Distribution Upgrade" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "_Install Updates" msgstr "स्तरवृद्धिहरु स्थापना गर्दै" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "परिवर्तनहरु" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1154,10 +1170,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" -"<b><big>The channel information is out-of-date</big></b>\n" +"<b><big>The information about available software is out-of-date</big></b>\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1186,10 +1202,10 @@ msgstr "<b>युआरएल:</b>" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the source that you want to add</b></" -"big>\n" +"<big><b>Enter the complete APT line of the repository that you want to add " +"as source</b></big>\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>तपाईंले थप्न चाहेको कोषको पुर्ण एपिटि हरफ प्रविष्ट गर्नुहोस</b></big>\n" @@ -1249,7 +1265,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:3 msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1268,7 +1284,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:7 msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" @@ -1293,218 +1309,195 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "युबन्टु ५.०४ अद्यावधिकहरु" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "समुदाय सम्हालिएको (ब्रह्माण्ड)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "योगदान गरिएको सफ्टवेयर" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "युबन्टु ५.०४ अद्यावधिकहरु" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "समुदाय सम्हालिएको (ब्रह्माण्ड)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "समुदाय सम्हालिएको (ब्रह्माण्ड)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "नन-फ्री (बहुभर्स)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "नन-फ्री (बहुभर्स)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "By copyright or legal issues restricted software" msgstr "युएस निषेधित सफ्टवेयर" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "युबन्टु ५.०४ अद्यावधिकहरु" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "स्तरवृद्धिहरु स्थापना गर्दै" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 #, fuzzy msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -#, fuzzy -msgid "Officially supported" -msgstr "कार्यालय बाट समर्थित" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 #, fuzzy msgid "Ubuntu 5.10 Security Updates" msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 #, fuzzy msgid "Ubuntu 5.10 Updates" msgstr "युबन्टु ५.०४ अद्यावधिकहरु" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "युबन्टु ५.०४ अद्यावधिकहरु" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 #, fuzzy -msgid "Oficially supported" +msgid "Officially supported" msgstr "कार्यालय बाट समर्थित" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "युबन्टु ५.०४ अद्यावधिकहरु" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "युबन्टु ५.०४ अद्यावधिकहरु" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "समुदाय सम्हालिएको (ब्रह्माण्ड)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "नन-फ्री (बहुभर्स)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "कार्यालय बाट समर्थित" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "निषेधित प्रतिलिपि अधिकार" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "युबन्टु ४.१० सुरक्षा अद्यावधिकहरु" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "युबन्टु ५.०४ अद्यावधिकहरु" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "युबन्टु ५.०४ अद्यावधिकहरु" @@ -1558,6 +1551,18 @@ msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Your system has already been upgraded." +#~ msgstr "तपाईंको प्रणालीमा टुटेका प्याकेजहरु छन!" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "कार्यालय बाट समर्थित" + +#, fuzzy #~ msgid "The following updates will be skipped:" #~ msgstr "निम्न प्याकेजहरु स्तरवृद्धि गरिएको छैन" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-24 01:32+0000\n" "Last-Translator: Tino Meinen <a.t.meinen@chello.nl>\n" "Language-Team: Nederlands <vertaling@vrijschrift.org>\n" @@ -131,9 +131,9 @@ msgstr "" "fout te melden." #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"<big><b>Error scaning the CD</b></big>\n" +"<big><b>Error scanning the CD</b></big>\n" "\n" "%s" msgstr "" @@ -149,11 +149,11 @@ msgstr "Geef het cd-schijfje een naam" msgid "Please insert a disc in the drive:" msgstr "Plaats een schijf in de speler:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "Niet-werkende pakketten" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -162,23 +162,23 @@ msgstr "" "met deze software. Repareer deze eerst met synaptic of apt-get voordat u " "verder gaat." -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Kan de vereiste meta-pakketten niet upgraden." -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "Een essentieel pakket zou verwijderd worden" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Kan de vereisten voor de upgrade niet berekenen" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -187,11 +187,11 @@ msgstr "" "Gelieve dit als fout te rapporteren. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "Fout bij het bepalen van de echtheid van sommige pakketten" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -202,12 +202,12 @@ msgstr "" "proberen. Hieronder vindt u een lijst met pakketten waarvan de echtheid niet " "vastgesteld is." -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "Kan '%s' niet installeren" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -216,15 +216,16 @@ msgstr "" "fout te rapporteren. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "Kan het meta-pakket niet raden" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -235,12 +236,12 @@ msgstr "" "Installeer eerst één van de bovenstaande pakketten met Synaptic of apt-get " "voordat u verder gaat." -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "Ophalen is mislukt" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -250,15 +251,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "Tijdelijke opslag inlezen" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -266,11 +267,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "Geen geldige mirror-server gevonden" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -291,11 +292,11 @@ msgstr "" "Wanneer u 'Nee' kiest, zal de update worden geannuleerd." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "De standaard bronnenlijst genereren?" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -309,11 +310,11 @@ msgstr "" "Moeten de standaardregels voor '%s' worden toegevoegd? Wanneer u 'Nee' " "kiest, zal de update worden geannuleerd." -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "De informatie over de pakketbronnen is ongeldig" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -321,13 +322,14 @@ msgstr "" "Het upgraden van de informatie over de pakketbronnen heeft het bestand " "ongeldig gemaakt. Rapporteer dit als een fout." -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "Pakketbronnen van derden uitgeschakeld" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#, fuzzy msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" @@ -335,11 +337,11 @@ msgstr "" "kunt ze na de upgrade weer inschakelen via het menu Systeem -> Beheer -> " "Software-eigenschappen of met het programma Synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "Fout tijdens het updaten" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -347,11 +349,11 @@ msgstr "" "Tijdens het updaten is er iets misgegaan. Dit komt meestal door " "netwerkproblemen. Controleer uw netwerkverbinding en probeer opnieuw." -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "Niet genoeg vrije schijfruimte" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -363,15 +365,15 @@ msgstr "" "vorige installaties via 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "Wilt u beginnen met de upgrade?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "Kon de upgrades niet installeren" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -384,11 +386,11 @@ msgstr "" "onbruikbare toestand. Er is een hersteloperatie uitgevoerd (dpkg --configure " "-a)." -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "Kon de upgrades niet downloaden" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -396,17 +398,18 @@ msgstr "" "De upgrade wordt nu afgebroken. Controleer uw internetverbinding of het " "installatiemedium en probeer opnieuw. " -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" -msgstr "Bepaalde software wordt niet meer officieel ondersteund" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 +#, fuzzy msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" "Deze geïnstalleerde pakketten worden niet meer officieel ondersteund, maar " "worden door de gemeenschap beheerd ('universe').\n" @@ -414,23 +417,23 @@ msgstr "" "Indien 'universe' niet geactiveerd is zal bij de volgende stap gevraagd " "worden om deze pakketten te verwijderen. " -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "Overbodige pakketten verwijderen?" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "_Deze stap overslaan" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "_Verwijderen" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "Fout bij het toepassen" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -439,26 +442,31 @@ msgstr "" "voor meer informatie. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "De oorspronkelijke toestand wordt hersteld" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "Pakkettenbeheer controleren" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "Updaten van de informatie over de pakketbronnen" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "Ongeldige pakketinformatie" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -471,19 +479,19 @@ msgstr "" "meer gevonden worden.\n" "Dit is een ernstige fout, die gerapporteerd moet worden." -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "Vragen om bevestiging" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "Bezig met upgraden" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "Zoeken naar overbodige software" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "Systeemupgrade is voltooid." @@ -504,7 +512,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "Downloaden van bestand %li uit %li met %s/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, fuzzy, python-format msgid "About %s remaining" msgstr "Ongeveer %li minuten resterend" @@ -534,23 +542,29 @@ msgstr "" #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, python-format +#, fuzzy, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" "Het configuratiebestand vervangen?\n" "'%s'" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "De opdracht 'diff' is niet gevonden" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "Er is een ernstige fout ontstaan" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -566,28 +580,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "Er zal %s pakket verwijderd worden." msgstr[1] "Er zullen %s pakketten verwijderd worden." -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "Er zal %s nieuw pakket geïnstalleerd worden." msgstr[1] "Er zullen %s nieuwe pakketten geïnstalleerd worden." -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "%s pakket zal een upgrade krijgen" msgstr[1] "%s pakketten zullen een upgrade krijgen." -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -595,7 +609,7 @@ msgid "" "You have to download a total of %s. " msgstr "U moet in totaal %s downloaden." -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -604,32 +618,35 @@ msgstr "" "Het upgraden kan enkele uren in beslag nemen en kan tussentijds niet worden " "afgebroken." -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" "Sluit alle openstaande toepassingen en documenten om dataverlies te " "voorkomen." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "Kon geen upgrades vinden" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "Uw systeem is up-to-date" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "Uw systeem heeft al een upgrade gekregen" +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>%s verwijderen</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "%s installeren" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "%s upgraden" @@ -663,11 +680,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "De computer moet opnieuw opgestart worden" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -703,11 +720,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Upgrade starten?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>" msgstr "" -"<span weight=\"bold\" size=\"x-large\">Bezig met upgraden naar Ubuntu 6.06 " -"LTS</span>" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -832,9 +846,10 @@ msgid "Verfication failed" msgstr "Verificatie is mislukt" #: ../UpdateManager/DistUpgradeFetcher.py:222 +#, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" "Het verifiëren van de upgrade is mislukt. Er is mogelijk een probleem met " "het netwerk of de server. " @@ -861,20 +876,20 @@ msgstr "Downloaden van bestand %li uit %li met %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Downloaden van bestand %li uit %li, snelheid onbekend" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "" "Een overzicht van de wijzigingen in dit pakket is nog niet beschikbaar. " "Probeer het later nog eens." -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" "Een overzicht van de wijzigingen in dit pakket is nog niet beschikbaar. " "Probeer het later nog eens." -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -882,134 +897,125 @@ msgstr "" "Kon de lijst met wijzigingen niet downloaden. Controleer uw " "internetverbinding." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Ubuntu 5.10 veiligheidsupdates" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "Up_dates installeren" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "Upgrade naar de nieuwste versie van Ubuntu" +msgid "Normal updates" +msgstr "Up_dates installeren" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "Up_dates installeren" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "Kan de beschikbare updates niet installeren" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Versie %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "Het overzicht van de wijzigingen wordt gedownload..." -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "_Controleren" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "Downloadgrootte: %s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "Uw systeem is up-to-date" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "U kunt %s update installeren" msgstr[1] "U kunt %s updates installeren" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "Een ogenblik geduld, dit kan even duren." -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "De update is voltooid" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "Up_dates installeren" + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Nieuwe versie: %s (Grootte: %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Versie %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "Uw distributie wordt niet langer ondersteund" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -1019,17 +1025,17 @@ msgstr "" "upgrade uit naar een nieuwere versie van Ubuntu Linux. Zie http://www.ubuntu." "com voor meer informatie over upgraden." -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "Software-index is beschadigd" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1052,58 +1058,67 @@ msgstr "" "configureren in \"Systeem\" -> \"Beheer\" -> \"Software-eigenschappen\"." #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"<big><b>Examining your system</b></big>\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"<big><b>Uw system wordt gecontroleerd</b></big>\n" -"\n" -"Software-updates repareren fouten, verhelpen veiligheidsproblemen en leveren " -"nieuwe mogelijkheden." - -#: ../data/glade/UpdateManager.glade.h:7 msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "<big><b>Houd uw systeem up-to-date</b></big>" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "<big><b>Not all updates can be installed</b></big>" +msgstr "" +"<big><b>Fout tijdens het lezen van de cd</b></big>↵\n" +"↵\n" +"%s" + +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "<big><b>Starting update manager</b></big>" +msgstr "<b><big>Upgrade starten?</big></b>" + +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "Download _annuleren" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Wijzigingen" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "_Controleren" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "Controleer de softwarekanalen op nieuwe updates" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Omschrijving" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "Versie-informatie" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "Voortgang tonen van individuele pakketten" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Software-updates" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1111,32 +1126,37 @@ msgstr "" "Software-updates repareren fouten, verhelpen veiligheidsproblemen en leveren " "nieuwe mogelijkheden." -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "U_pgraden" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "Upgrade naar de nieuwste versie van Ubuntu" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "_Controleren" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "_Upgrade hervatten" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "_Deze informatie in het vervolg niet meer tonen" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "Up_dates installeren" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Wijzigingen" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1246,11 +1266,12 @@ msgid "_Install security updates without confirmation" msgstr "_Veiligheids-updates zonder te vragen installeren" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 +#, fuzzy msgid "" -"<b><big>The channel information is out-of-date</big></b>\n" +"<b><big>The information about available software is out-of-date</big></b>\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1284,10 +1305,10 @@ msgstr "<b>URI:</b>" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the source that you want to add</b></" -"big>\n" +"<big><b>Enter the complete APT line of the repository that you want to add " +"as source</b></big>\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>Voer de volledige APT-regel in van het kanaal dat u wilt toevoegen</" @@ -1345,8 +1366,9 @@ msgid "Check for new distribution releases" msgstr "Controleren op nieuwe distributieversies" #: ../data/update-manager.schemas.in.h:3 +#, fuzzy msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1367,8 +1389,9 @@ msgid "Stores the size of the update-manager dialog" msgstr "Onthoudt de grootte van het dialoogvenster van de update-manager" #: ../data/update-manager.schemas.in.h:7 +#, fuzzy msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" "Slaat de toestand op van het vensterdeel dat de lijst met wijzigingen en de " @@ -1396,212 +1419,189 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 updates" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "Door de gemeenschap beheerd (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Niet-vrij (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "Door de gemeenschap beheerd (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "Door de gemeenschap beheerd (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Niet-vrij (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Niet-vrij (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Ubuntu 5.10 veiligheidsupdates" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "Up_dates installeren" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "Officieel ondersteund" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 veiligheidsupdates" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 updates" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 backports" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -#, fuzzy -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "Officieel ondersteund" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 veiligheidsupdates" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 updates" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 backports" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Door de gemeenschap beheerd (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Niet-vrij (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "Bepaalde software wordt niet meer officieel ondersteund" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Beperkte auteursrechten" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 5.10 veiligheidsupdates" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 5.10 updates" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 backports" @@ -1652,6 +1652,48 @@ msgstr "Software compatibel met DFSG, maar met niet-vrije afhankelijkheden" msgid "Non-DFSG-compatible Software" msgstr "Software niet compatibel met DFSG" +#~ msgid "Some software no longer officially supported" +#~ msgstr "Bepaalde software wordt niet meer officieel ondersteund" + +#~ msgid "Could not find any upgrades" +#~ msgstr "Kon geen upgrades vinden" + +#~ msgid "Your system has already been upgraded." +#~ msgstr "Uw systeem heeft al een upgrade gekregen" + +#, fuzzy +#~ msgid "" +#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +#~ msgstr "" +#~ "<span weight=\"bold\" size=\"x-large\">Bezig met upgraden naar Ubuntu " +#~ "6.06 LTS</span>" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Ubuntu 5.10 veiligheidsupdates" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "Upgrade naar de nieuwste versie van Ubuntu" + +#~ msgid "Cannot install all available updates" +#~ msgstr "Kan de beschikbare updates niet installeren" + +#~ msgid "" +#~ "<big><b>Examining your system</b></big>\n" +#~ "\n" +#~ "Software updates correct errors, eliminate security vulnerabilities and " +#~ "provide new features." +#~ msgstr "" +#~ "<big><b>Uw system wordt gecontroleerd</b></big>\n" +#~ "\n" +#~ "Software-updates repareren fouten, verhelpen veiligheidsproblemen en " +#~ "leveren nieuwe mogelijkheden." + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "Officieel ondersteund" + #~ msgid "" #~ "Some updates require the removal of further software. Use the function " #~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: nb\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2005-06-08 23:10+0200\n" "Last-Translator: Terance Edward Sola <terance@lyse.net>\n" "Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.uio.no>\n" @@ -134,7 +134,7 @@ msgstr "" #: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" -"<big><b>Error scaning the CD</b></big>\n" +"<big><b>Error scanning the CD</b></big>\n" "\n" "%s" msgstr "" @@ -147,33 +147,33 @@ msgstr "" msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -181,23 +181,23 @@ msgstr "" "Nøkkelen du valgte kan ikke bli fjernet. Vennligst rapporter denne feilen." #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -206,24 +206,24 @@ msgstr "" "Nøkkelen du valgte kan ikke bli fjernet. Vennligst rapporter denne feilen." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -233,15 +233,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -249,11 +249,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -266,11 +266,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -279,43 +279,43 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 #, fuzzy msgid "Error during update" msgstr "Feil under fjerning av nøkkel" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -324,15 +324,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -341,73 +341,78 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 #, fuzzy msgid "Checking package manager" msgstr "En annen pakkehåndterer kjører" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -417,21 +422,21 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 #, fuzzy msgid "Asking for confirmation" msgstr "Undersøker systemkonfigurasjon" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 #, fuzzy msgid "Upgrading" msgstr "Oppgradering fullført" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "" @@ -451,7 +456,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, python-format msgid "About %s remaining" msgstr "" @@ -484,19 +489,25 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " @@ -506,28 +517,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 #, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 #, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, python-format msgid "" "\n" @@ -535,37 +546,40 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "" - -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 #, fuzzy -msgid "Your system has already been upgraded." -msgstr "Systemet har ødelagte pakker!" +msgid "Your system is up-to-date" +msgstr "Systemet er helt oppdatert!" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, fuzzy, python-format msgid "<b>Remove %s</b>" msgstr "<b>Detaljer</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, fuzzy, python-format msgid "Install %s" msgstr "_Installer" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, fuzzy, python-format msgid "Upgrade %s" msgstr "Oppgradering fullført" @@ -599,11 +613,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -634,7 +648,7 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -761,8 +775,8 @@ msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:222 msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -786,169 +800,159 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "Det er en ny versjon av Ubuntu tilgjengelig!" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "Feil under nedlasting av endringer. Sjekk tilkoblingen til internett." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Ubuntu 5.10 Security Updates" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "Installerer oppdateringer..." -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 -msgid "Updates of Ubuntu" -msgstr "" +#: ../UpdateManager/UpdateManager.py:240 +#, fuzzy +msgid "Normal updates" +msgstr "Installerer oppdateringer..." #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "Installerer oppdateringer..." -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Versjon %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 #, fuzzy msgid "Downloading the list of changes..." msgstr "Laster ned endringer" -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" +#: ../UpdateManager/UpdateManager.py:551 +msgid "_Check All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, fuzzy, python-format msgid "Download size: %s" msgstr "Laster ned endringer" -#: ../UpdateManager/UpdateManager.py:632 -#, fuzzy -msgid "Your system is up-to-date" -msgstr "Systemet er helt oppdatert!" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, fuzzy, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Installerer oppdateringer..." msgstr[1] "Installerer oppdateringer..." -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "Installerer oppdateringer..." + +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Versjon %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "Din distribusjon er ikke lenger støttet" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -964,86 +968,98 @@ msgid "" msgstr "" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"<big><b>Examining your system</b></big>\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "<big><b>Keep your system up-to-date</b></big>" +#: ../data/glade/UpdateManager.glade.h:5 +msgid "<big><b>Not all updates can be installed</b></big>" msgstr "" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:6 +msgid "<big><b>Starting update manager</b></big>" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Endringer" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Beskrivelse" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Programvareoppdateringer" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +msgid "_Distribution Upgrade" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "_Install Updates" msgstr "Installerer oppdateringer..." -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Endringer" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1158,10 +1174,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" -"<b><big>The channel information is out-of-date</big></b>\n" +"<b><big>The information about available software is out-of-date</big></b>\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1190,10 +1206,10 @@ msgstr "<b>URI:</b>" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the source that you want to add</b></" -"big>\n" +"<big><b>Enter the complete APT line of the repository that you want to add " +"as source</b></big>\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>Skriv inn hele APT-linjen til arkivet du vil legge til</b> </big>\n" @@ -1253,7 +1269,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:3 msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1272,7 +1288,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:7 msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" @@ -1297,217 +1313,194 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 Updates" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "Vedlikeholdt av miljøet (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Bidratt programvare" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 #, fuzzy msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "CD med Ubuntu 4.10 «Warty Warthog»" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 5.04 Updates" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "Vedlikeholdt av miljøet (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "Vedlikeholdt av miljøet (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Non-free (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Non-free (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "By copyright or legal issues restricted software" msgstr "US eksport begrenset programvare" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 5.04 Updates" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Ubuntu 5.10 Security Updates" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "Installerer oppdateringer..." - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 #, fuzzy msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "CD med Ubuntu 5.10 «Breezy Badger»" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -#, fuzzy -msgid "Officially supported" -msgstr "Offisielt støttet" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "CD med Ubuntu 5.10 «Breezy Badger»" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 Security Updates" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 Updates" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Updates" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 #, fuzzy -msgid "Oficially supported" +msgid "Officially supported" msgstr "Offisielt støttet" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 Security Updates" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 Updates" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 Updates" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "CD med Ubuntu 4.10 «Warty Warthog»" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Vedlikeholdt av miljøet (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Non-free (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 #, fuzzy msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "CD med Ubuntu 4.10 «Warty Warthog»" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "Offisielt støttet" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Begrenset opphavsrett" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 Security Updates" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 4.10 Updates" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 Updates" @@ -1562,6 +1555,18 @@ msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Your system has already been upgraded." +#~ msgstr "Systemet har ødelagte pakker!" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Ubuntu 5.10 Security Updates" + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "Offisielt støttet" + +#, fuzzy #~ msgid "The following updates will be skipped:" #~ msgstr "De følgende pakkene er ikke oppgradert:" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-29 08:11+0000\n" "Last-Translator: Yannig MARCHEGAY (Kokoyaya) <yannick.marchegay@lokanova." "com>\n" @@ -131,9 +131,9 @@ msgstr "" "Avem pas poscut suprimir la clau qu'avètz seleccionada. Raportatz l'anomalia." #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"<big><b>Error scaning the CD</b></big>\n" +"<big><b>Error scanning the CD</b></big>\n" "\n" "%s" msgstr "" @@ -149,79 +149,79 @@ msgstr "Picatz un nom pel disc" msgid "Please insert a disc in the drive:" msgstr "Metètz un disc dins lo legidor :" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "Paquetatges corromputs" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Impossible calcular la mesa a jorn" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "Impossible installar '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -231,15 +231,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -247,11 +247,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -264,11 +264,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -277,42 +277,42 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "Error al moment de metre a jorn" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "Pas pro d'espaci liure" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -321,15 +321,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "Volètz començar la mesa a jorn ?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "Impossible installar las mesas a jorn" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -338,72 +338,77 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "Impossible descargar las mesas a jorn" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "_Suprimir" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -413,19 +418,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "Mesa a jorn" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "La mesa a jorn del sistèma es acabada." @@ -445,7 +450,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, python-format msgid "About %s remaining" msgstr "" @@ -477,19 +482,25 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " @@ -499,28 +510,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 #, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 #, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -528,36 +539,39 @@ msgid "" "You have to download a total of %s. " msgstr "Debètz telecargar un total de %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>Suprimir %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "Installar %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "Metre a jorn %s" @@ -591,11 +605,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -626,7 +640,7 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -748,8 +762,8 @@ msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:222 msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -772,164 +786,154 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 msgid "The list of changes is not available" msgstr "" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" -#: ../UpdateManager/UpdateManager.py:228 -msgid "Important security updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 +msgid "Important security updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +msgid "Proposed updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "Metre a jorn Ubuntu" +msgid "Normal updates" +msgstr "<b>Mesas a jorn per internet</b>" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "<b>Mesas a jorn per internet</b>" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Version %s : \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "_Verificar" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "Talha de la descarga : %s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Podètz installar %s mesa a jorn" msgstr[1] "Podètz installar %s mesas a jorn" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "<b>Mesas a jorn per internet</b>" + +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Version %s : \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -945,85 +949,105 @@ msgid "" msgstr "" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"<big><b>Examining your system</b></big>\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "<big><b>Keep your system up-to-date</b></big>" +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "<big><b>Not all updates can be installed</b></big>" msgstr "" +"<big><b>Error a moment d'examinar lo CD</b></big>\n" +"\n" +"%s" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "<big><b>Starting update manager</b></big>" +msgstr "" +"<big><b>Error a moment d'examinar lo CD</b></big>\n" +"\n" +"%s" + +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Cambis" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "_Verificar" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Descripcion" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +msgid "_Distribution Upgrade" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Cambis" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1130,10 +1154,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" -"<b><big>The channel information is out-of-date</big></b>\n" +"<b><big>The information about available software is out-of-date</big></b>\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1160,10 +1184,10 @@ msgstr "<b>URI :</b>" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 msgid "" -"<big><b>Enter the complete APT line of the source that you want to add</b></" -"big>\n" +"<big><b>Enter the complete APT line of the repository that you want to add " +"as source</b></big>\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" @@ -1213,7 +1237,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:3 msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1232,7 +1256,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:7 msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" @@ -1257,206 +1281,186 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Pas liure (multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Mesas a jorn per Ubuntu 6.06 LTS" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Pas liure (multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Pas liure (multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:106 -msgid "Important security updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -msgid "Proposed updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 #, fuzzy msgid "Ubuntu 5.10 Security Updates" msgstr "Mesas a jorn per Ubuntu 6.06 LTS" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 #, fuzzy msgid "Ubuntu 5.10 Updates" msgstr "Mesas a jorn per Ubuntu 6.06 LTS" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Mesas a jorn per Ubuntu 6.06 LTS" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Mesas a jorn per Ubuntu 6.06 LTS" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Pas liure (multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 -msgid "No longer oficially supported" +#: ../data/channels/Ubuntu.info.in:209 +msgid "No longer officially supported" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "Mesas a jorn per Ubuntu 6.06 LTS" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Mesas a jorn per Ubuntu 6.06 LTS" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "" @@ -1506,6 +1510,10 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "Metre a jorn Ubuntu" + #~ msgid "<b>Keys</b>" #~ msgstr "<b>Claus</b>" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: pa\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-04-28 23:31+0000\n" "Last-Translator: Amanpreet Singh Alam <amanpreetalam@yahoo.com>\n" "Language-Team: Punjabi <fedora-transa-pa@redhat.com>\n" @@ -131,7 +131,7 @@ msgstr "" #: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" -"<big><b>Error scaning the CD</b></big>\n" +"<big><b>Error scanning the CD</b></big>\n" "\n" "%s" msgstr "" @@ -144,79 +144,79 @@ msgstr "" msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -226,15 +226,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -242,11 +242,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -259,11 +259,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -272,42 +272,42 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -316,15 +316,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -333,72 +333,77 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -408,20 +413,20 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 #, fuzzy msgid "Upgrading" msgstr "ਅੱਪਗਰੇਡ ਸਮਾਪਤ" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "" @@ -441,7 +446,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, python-format msgid "About %s remaining" msgstr "" @@ -473,19 +478,25 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " @@ -495,28 +506,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 #, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 #, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, python-format msgid "" "\n" @@ -524,36 +535,39 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "" @@ -587,11 +601,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -622,7 +636,7 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -746,8 +760,8 @@ msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:222 msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -771,164 +785,155 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 msgid "The list of changes is not available" msgstr "" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "<b>ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ</b>" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 -msgid "Updates of Ubuntu" -msgstr "" +#: ../UpdateManager/UpdateManager.py:240 +#, fuzzy +msgid "Normal updates" +msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" +#: ../UpdateManager/UpdateManager.py:551 +msgid "_Check All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, fuzzy, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." msgstr[1] "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." + +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -944,87 +949,100 @@ msgid "" msgstr "" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"<big><b>Examining your system</b></big>\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "<big><b>Keep your system up-to-date</b></big>" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:5 +msgid "<big><b>Not all updates can be installed</b></big>" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:6 +msgid "<big><b>Starting update manager</b></big>" msgstr "" #: ../data/glade/UpdateManager.glade.h:7 -msgid "<big><b>Keep your system up-to-date</b></big>" +msgid "Cancel _Download" msgstr "" #: ../data/glade/UpdateManager.glade.h:8 -msgid "Cancel _Download" +msgid "Changes" msgstr "" #: ../data/glade/UpdateManager.glade.h:9 -msgid "Changes" +msgid "Changes and description of the update" msgstr "" #: ../data/glade/UpdateManager.glade.h:10 -msgid "Changes and description of the update" +msgid "Chec_k" msgstr "" #: ../data/glade/UpdateManager.glade.h:11 -msgid "Chec_k" +msgid "Check the software channels for new updates" msgstr "" #: ../data/glade/UpdateManager.glade.h:12 -msgid "Check the software channels for new updates" +msgid "Description" msgstr "" #: ../data/glade/UpdateManager.glade.h:13 -msgid "Description" +msgid "Release Notes" msgstr "" #: ../data/glade/UpdateManager.glade.h:14 -msgid "Release Notes" +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 #, fuzzy msgid "Software Updates" msgstr "<b>ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ</b>" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 #, fuzzy msgid "U_pgrade" msgstr "ਅੱਪਗਰੇਡ ਸਮਾਪਤ" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "ਅੱਪਗਰੇਡ ਸਮਾਪਤ" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "_Install Updates" msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 msgid "changes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1134,10 +1152,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" -"<b><big>The channel information is out-of-date</big></b>\n" +"<b><big>The information about available software is out-of-date</big></b>\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1168,10 +1186,10 @@ msgstr "<b>ਵੇਰਵਾ</b>" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 msgid "" -"<big><b>Enter the complete APT line of the source that you want to add</b></" -"big>\n" +"<big><b>Enter the complete APT line of the repository that you want to add " +"as source</b></big>\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" @@ -1221,7 +1239,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:3 msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1241,7 +1259,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:7 msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" @@ -1265,194 +1283,172 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "<b>ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ</b>" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 -msgid "No longer oficially supported" +#: ../data/channels/Ubuntu.info.in:209 +msgid "No longer officially supported" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "" @@ -1503,6 +1499,10 @@ msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "<b>ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ</b>" + +#, fuzzy #~ msgid "Hide details" #~ msgstr "<b>ਵੇਰਵਾ</b>" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager cvs\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-23 19:59+0000\n" "Last-Translator: Tomasz Dominikowski <dominikowski@gmail.com>\n" "Language-Team: Polish <translators@gnomepl.org>\n" @@ -130,9 +130,9 @@ msgid "The key you selected could not be removed. Please report this as a bug." msgstr "Nie można było usunąć wybranego klucza. Proszę zgłosić to jako błąd." #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"<big><b>Error scaning the CD</b></big>\n" +"<big><b>Error scanning the CD</b></big>\n" "\n" "%s" msgstr "" @@ -148,11 +148,11 @@ msgstr "Proszę podać nazwę dla płyty" msgid "Please insert a disc in the drive:" msgstr "Proszę włożyć płytę do napędu:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "Uszkodzone pakiety" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -161,23 +161,23 @@ msgstr "" "kontynuowaniem należy je naprawić używając Synaptic Menedżer Pakietów lub " "apt-get." -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Nie można zaktualizować wymaganych meta-pakietów" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "Niezbędny pakiet musiałby zostać usunięty" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Nie można przetworzyć aktualizacji" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -186,11 +186,11 @@ msgstr "" "zgłosić to jako błąd. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "Błąd podczas uwierzytelniania niektórych pakietów" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -200,27 +200,28 @@ msgstr "" "sieci. Można spróbować ponownie później. Poniżej znajduje się lista " "nieuwierzytelnionych pakietów." -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "Nie można zainstalować \"%s\"" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "Nie można było usunąć wybranego klucza. Proszę zgłosić to jako błąd. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "Nie można odnaleźć żadnego z wymaganych meta-pakietów" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -228,12 +229,12 @@ msgstr "" "edubuntu-desktop. Nie jest możliwe określenie używanej wersji Ubuntu.\n" " Przed kontynuowaniem proszę zainstalować jeden z powyższych pakietów." -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "Pobranie nie powiodło się" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -243,15 +244,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "Odczytywanie bufora podręcznego" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -259,11 +260,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "Nie odnaleziono poprawnego serwera lustrzanego" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -283,11 +284,11 @@ msgstr "" "Jeśli wybierzesz \"Nie\" aktualizacja zostanie anulowana." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "Wygenerować domyślne źródła?" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -301,11 +302,11 @@ msgstr "" "Czy mam dodać domyślne wpisy dla \"%s\"? Jeśli wybierzesz \"Nie\" " "aktualizacja zostanie anulowana." -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "Błędne informacje o repozytoriach" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -313,13 +314,14 @@ msgstr "" "W wyniku aktualizacji informacji o repozytoriach powstał błędny plik. Proszę " "zgłosić ten błąd." -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "Źródła stron niezależnych zostały wyłączone" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#, fuzzy msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" @@ -327,11 +329,11 @@ msgstr "" "włączyć po aktualizacji używając narzędzia \"Właściwości oprogramowania\" " "lub za pomocą Synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "Błąd podczas aktualizacji" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -339,11 +341,11 @@ msgstr "" "Wystąpił problem podczas aktualizacji. Zazwyczaj wynika on z problemów z " "siecią, proszę sprawdzić połączenie sieciowe i spróbować ponownie." -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "Zbyt mało miejsca na dysku" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -355,15 +357,15 @@ msgstr "" "\"sudo apt-get clean\"." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "Czy chcesz rozpocząć aktualizację?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "Instalacja aktualizacji zakończyła się niepowodzeniem." -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -376,11 +378,11 @@ msgstr "" "nienadającym się do użytku. Uruchamianie naprawiania systemu (dpkg --" "configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "Pobranie aktualizacji było niemożliwe" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -388,17 +390,18 @@ msgstr "" "Aktualizacja została przerwana. Proszę sprawdzić połączenie sieciowe oraz " "dysk instalacyjny i spróbować ponownie. " -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" -msgstr "Niektóre programy nie są już oficjalnie wspierane" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 +#, fuzzy msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" "Te zainstalowane pakiety nie są już oficjalnie wspierane, są teraz " "obsługiwane przez społeczność (\"universe\").\n" @@ -406,23 +409,23 @@ msgstr "" "Jeśli nie masz włączonego \"universe\" w następnym kroku zostanie " "zasugerowane ich usunięcie. " -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "Usunąć niepotrzebne pakiety?" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "_Pomiń ten krok" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "_Usuń" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "Błąd podczas zatwierdzania" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -431,26 +434,31 @@ msgstr "" "poniższych wiadomościach. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "Przywracanie pierwotnego stanu systemu" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "Sprawdzanie menedżera pakietów" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "Aktualizowanie informacji o repozytoriach" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "Błędne informacje o pakietach" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -463,19 +471,19 @@ msgstr "" "być odnaleziony.\n" "To wskazuje na poważny problem, proszę zgłosić ten błąd." -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "Pytanie o potwierdzenie" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "Aktualizacja w toku" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "Wyszukiwanie zdezaktualizowanego oprogramowania" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "Aktualizacja systemu zakończona powodzeniem." @@ -496,7 +504,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "Pobieranie pliku %li z %li z prędkością %s/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, fuzzy, python-format msgid "About %s remaining" msgstr "Około %li minut pozostało" @@ -526,23 +534,29 @@ msgstr "" #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, python-format +#, fuzzy, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" "Zastąpić plik konfiguracyjny\n" "\"%s\"?" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "Polecenie \"diff\" nie zostało odnalezione" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "Wystąpił błąd krytyczny" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -557,31 +571,31 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "%s pakiet zostanie usunięty." msgstr[1] "%s pakiety zostaną usunięte." msgstr[2] "%s pakietów zostanie usuniętych." -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "%s nowy pakiet zostanie zainstalowany." msgstr[1] "%s nowe pakiety zostaną zainstalowane." msgstr[2] "%s nowy pakietów zostanie zainstalowane." -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "%s pakiet zostanie zaktualizowany." msgstr[1] "%s pakiety zostaną zaktualizowane." msgstr[2] "%s pakietów zostanie zaktualizowanych." -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -589,7 +603,7 @@ msgid "" "You have to download a total of %s. " msgstr "Konieczne pobranie ogółem %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -597,32 +611,35 @@ msgid "" msgstr "" "Aktualizacja może trwać wiele godzin i nie może zostać później anulowana." -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" "Aby zapobiec utracie danych proszę zamknąć wszystkie otwarte aplikacje i " "dokumenty." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "Nie odnaleziono żadnych aktualizacji" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "Twój system jest w pełni zaktualizowany" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "System został już zaktualizowany." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>Usuń %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "Instaluj %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "Aktualizuj %s" @@ -656,11 +673,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "Wymagane ponowne uruchomienie komputera" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -698,10 +715,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Rozpocząć aktualizację?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>" msgstr "" -"<span weight=\"bold\" size=\"x-large\">Aktualizacja do Ubuntu 6.06 LTS</span>" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -825,9 +840,10 @@ msgid "Verfication failed" msgstr "Weryfikacja nie powiodła się" #: ../UpdateManager/DistUpgradeFetcher.py:222 +#, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" "Weryfikacja aktualizacji nie powiodła się. To może być problem sieciowy lub " "z serwerem. " @@ -854,16 +870,16 @@ msgstr "Pobieranie pliku %li z %li z prędkością %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Pobieranie pliku %li z %li z nieznaną prędkością" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "Lista zmian nie jest jeszcze dostępna. Proszę spróbować później." -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "Lista zmian nie jest jeszcze dostępna. Proszę spróbować później." -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -871,99 +887,85 @@ msgstr "" "Nie udało się pobrać informacji o zmianach. Proszę sprawdzić połączenie z " "Internetem." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Aktualizacje bezpieczeństwa dla Ubuntu 5.10" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "Instalowanie pakietów" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "Zaktualizuj do najnowszej wersji Ubuntu" +msgid "Normal updates" +msgstr "Instalowanie pakietów" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "Instalowanie pakietów" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "Nie można zainstalować wszystkich dostępnych aktualizacji" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Wersja %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "Pobieranie informacji o zmianach..." -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "Sp_rawdź" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "Rozmiar do pobrania: %s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "Twój system jest w pełni zaktualizowany" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -971,35 +973,40 @@ msgstr[0] "Ilość dostępnych aktualizacji: %s" msgstr[1] "Ilość dostępnych aktualizacji: %s" msgstr[2] "Ilość dostępnych aktualizacji: %s" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "Proszę czekać, to może chwilę potrwać." -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "Aktualizacja została ukończona." -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "Sprawdź dostępne aktualizacje" + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Nowa wersja: %s (Rozmiar: %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Wersja %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "Twoja dystrybucja nie jest już wspierana" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -1009,17 +1016,17 @@ msgstr "" "krytycznych aktualizacji. Zaktualizuj do nowszej wersji Ubuntu Linux. " "Odwiedź http://www.ubuntu.com po więcej informacji." -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "Spis oprogramowania jest uszkodzony" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1043,58 +1050,67 @@ msgstr "" "\"." #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"<big><b>Examining your system</b></big>\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "<big><b>Keep your system up-to-date</b></big>" +msgstr "<big><b>Utrzymuj system w pełni zaktualizowany</b></big>" + +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "<big><b>Not all updates can be installed</b></big>" msgstr "" -"<big><b>Sprawdzanie systemu</b></big>\n" +"<big><b>Błąd podczas przeszukiwania płyty CD</b></big>\n" "\n" -"Aktualizacje oprogramowania mogą poprawić błędy, wyeliminować słabe punkty " -"bezpieczeństwa i dostarczyć nowe funkcje." +"%s" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "<big><b>Keep your system up-to-date</b></big>" -msgstr "<big><b>Utrzymuj system w pełni zaktualizowany</b></big>" +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "<big><b>Starting update manager</b></big>" +msgstr "<b><big>Rozpocząć aktualizację?</big></b>" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "_Przerwij pobieranie" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Zmiany" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "Sp_rawdź" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "Sprawdź kanały oprogramowania w poszukiwaniu nowych aktualizacji" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Opis" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "Informacje o wydaniu" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "Pokaż postęp pobierania poszczególnych plików" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Aktualizacje oprogramowania" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1102,32 +1118,37 @@ msgstr "" "Aktualizacje oprogramowania mogą poprawić błędy, wyeliminować słabe punkty " "bezpieczeństwa i dostarczyć nowe funkcje." -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "_Aktualizuj" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "Zaktualizuj do najnowszej wersji Ubuntu" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "Sp_rawdź" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "_Wznów aktualizację" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "_Ukryj tę informację w przyszłości" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "_Instaluj aktualizacje" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Zmiany" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1238,11 +1259,12 @@ msgid "_Install security updates without confirmation" msgstr "_Instaluj aktualizacje bezpieczeństwa bez potwierdzania" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 +#, fuzzy msgid "" -"<b><big>The channel information is out-of-date</big></b>\n" +"<b><big>The information about available software is out-of-date</big></b>\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1276,10 +1298,10 @@ msgstr "<b>URI:</b>" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the source that you want to add</b></" -"big>\n" +"<big><b>Enter the complete APT line of the repository that you want to add " +"as source</b></big>\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>Wpisz pełny wiersz APT opisujący kanał który chcesz dodać</b></big>\n" @@ -1338,8 +1360,9 @@ msgid "Check for new distribution releases" msgstr "Sprawdzaj nowe wydania dystrybucji" #: ../data/update-manager.schemas.in.h:3 +#, fuzzy msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1360,8 +1383,9 @@ msgid "Stores the size of the update-manager dialog" msgstr "Zapamiętuje rozmiar okna Menedżera aktualizacji" #: ../data/update-manager.schemas.in.h:7 +#, fuzzy msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" "Zapamiętuje stan obszaru z listą zmian i opisem poszczególnych aktualizacji" @@ -1388,212 +1412,190 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Aktualizacje dla Ubuntu 5.10" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "Utrzymywane przez społeczność (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Inne oprogramowanie (Contributed)" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 \"Dapper Drake\"" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "Utrzymywane przez społeczność (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "Utrzymywane przez społeczność (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Nie-wolnodostępne (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Nie-wolnodostępne (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "By copyright or legal issues restricted software" msgstr "Oprogramowanie objęte restrykcjami eksportowymi USA" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 \"Dapper Drake\"" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Aktualizacje bezpieczeństwa dla Ubuntu 5.10" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "Instalowanie pakietów" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 \"Breezy Badger\"" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "Wspierane oficjalnie" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 \"Breezy Badger\"" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Aktualizacje bezpieczeństwa dla Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Aktualizacje dla Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Aktualizacje dla Ubuntu 5.10 (backporty)" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Uaktualnienia bezpieczeństwa dla Ubuntu 5.04" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Uaktualnienia bezpieczeństwa dla Ubuntu 5.04" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "Wspierane oficjalnie" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Aktualizacje bezpieczeństwa dla Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Aktualizacje dla Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Aktualizacje dla Ubuntu 5.10 (backporty)" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 \"Breezy Badger\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Utrzymywane przez społeczność (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Nie-wolnodostępne (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "Niektóre programy nie są już oficjalnie wspierane" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "O ograniczonych prawach kopiowania" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Uaktualnienia bezpieczeństwa dla Ubuntu 4.10" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Aktualizacje dla Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Aktualizacje dla Ubuntu 5.10 (backporty)" @@ -1644,6 +1646,47 @@ msgstr "Oprogramowanie kompatybilne z DFSG z zależnościami Non-Free" msgid "Non-DFSG-compatible Software" msgstr "Oprogramowanie niekompatybilne z DFSG." +#~ msgid "Some software no longer officially supported" +#~ msgstr "Niektóre programy nie są już oficjalnie wspierane" + +#~ msgid "Could not find any upgrades" +#~ msgstr "Nie odnaleziono żadnych aktualizacji" + +#~ msgid "Your system has already been upgraded." +#~ msgstr "System został już zaktualizowany." + +#, fuzzy +#~ msgid "" +#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +#~ msgstr "" +#~ "<span weight=\"bold\" size=\"x-large\">Aktualizacja do Ubuntu 6.06 LTS</" +#~ "span>" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Aktualizacje bezpieczeństwa dla Ubuntu 5.10" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "Zaktualizuj do najnowszej wersji Ubuntu" + +#~ msgid "Cannot install all available updates" +#~ msgstr "Nie można zainstalować wszystkich dostępnych aktualizacji" + +#~ msgid "" +#~ "<big><b>Examining your system</b></big>\n" +#~ "\n" +#~ "Software updates correct errors, eliminate security vulnerabilities and " +#~ "provide new features." +#~ msgstr "" +#~ "<big><b>Sprawdzanie systemu</b></big>\n" +#~ "\n" +#~ "Aktualizacje oprogramowania mogą poprawić błędy, wyeliminować słabe " +#~ "punkty bezpieczeństwa i dostarczyć nowe funkcje." + +#~ msgid "Oficially supported" +#~ msgstr "Wspierane oficjalnie" + #~ msgid "" #~ "Some updates require the removal of further software. Use the function " #~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " @@ -1755,9 +1798,6 @@ msgstr "Oprogramowanie niekompatybilne z DFSG." #~ msgid "<b>Sections</b>" #~ msgstr "<b>Sekcje:</b>" -#~ msgid "Check for available updates" -#~ msgstr "Sprawdź dostępne aktualizacje" - #~ msgid "<b>Sections:</b>" #~ msgstr "<b>Sekcje:</b>" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-24 10:17+0000\n" "Last-Translator: Joao Carvalhinho <latrine@gmail.com>\n" "Language-Team: Ubuntu Portuguese Team <ubuntu-pt.org>\n" @@ -129,9 +129,9 @@ msgstr "" "A chave que seleccionou não pôde ser removida. Por favor reporte este erro." #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"<big><b>Error scaning the CD</b></big>\n" +"<big><b>Error scanning the CD</b></big>\n" "\n" "%s" msgstr "" @@ -147,11 +147,11 @@ msgstr "Por favor introduza um nome para o disco" msgid "Please insert a disc in the drive:" msgstr "Por favor introduza um disco no leitor:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "Pacotes Quebrados" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -160,23 +160,23 @@ msgstr "" "este software. Por favor corrija-os usando o synaptic ou apt-get antes de " "continuar." -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Não foi possível actualizar os meta-pacotes necessários" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "Um pacote essencial teria que ser removido" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Impossível de calcular a actualização" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -185,11 +185,11 @@ msgstr "" "reporte este erro. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "Erro ao autenticar alguns pacotes" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -199,12 +199,12 @@ msgstr "" "rede transitório. Pode tentar novamente mais tarde. Verifique abaixo uma " "lista de pacotes não autenticados." -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "Impossível de instalar '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -212,15 +212,16 @@ msgstr "" "Foi impossível instalar um pacote essencial. Por favor reporte este erro. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "Impossível de descobrir meta-pacote" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -230,12 +231,12 @@ msgstr "" " Por favor instale um dos pacotes acima mencionados usando o synaptic ou apt-" "get antes de continuar." -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "Falha a obter" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -245,15 +246,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "A ler a cache" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -261,11 +262,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "Nenhum repositório válido encontrada" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -286,11 +287,11 @@ msgstr "" "Se escolher \"não\" a actualização irá ser cancelada." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "Gerar as fontes padrão?" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -304,11 +305,11 @@ msgstr "" "Deverão ser adicionadas entradas para '%s'? Se seleccionar 'Não' a " "actualização será cancelada." -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "Informação de repositório inválida" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -316,13 +317,14 @@ msgstr "" "A actualização da informação de repositório resultou num ficheiro inválido. " "Por favor reporte este erro." -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "Fontes de terceiros desactivadas" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#, fuzzy msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" @@ -330,11 +332,11 @@ msgstr "" "reactivá-las depois da actualização com a ferramenta 'propriedades-software' " "ou com o synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "Erro durante a actualização" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -343,11 +345,11 @@ msgstr "" "tipo de problema na rede, por favor verifique a sua ligação à rede e volte a " "tentar." -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "Não existe espaço livre em disco suficiente" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -359,15 +361,15 @@ msgstr "" "usando 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "Deseja iniciar a actualização?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "Impossível de instalar as actualizações" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -379,11 +381,11 @@ msgstr "" "A actualização abortará agora. O seu sistema poderá estar num estado " "inutilizável. Foi efectuada uma recuperação (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "Impossível de descarregar as actualizações" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -391,17 +393,18 @@ msgstr "" "A actualização abortará agora. Por favor verifique a sua ligação à internet " "ou media de instalação e volte a tentar. " -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" -msgstr "Algum software já não é suportado oficialmente" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 +#, fuzzy msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" "Estes pacotes instalados já não são suportados oficialmente, e agora são " "apenas suportados pela comunidade ('universe').\n" @@ -409,23 +412,23 @@ msgstr "" "Se não tem o repositório 'universe' activo será sugerida a remoção destes " "pacotes no próximo passo. " -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "Remover Pacotes obsoletos?" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "_Saltar Este Passo" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "_Remover" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "Erro ao submeter" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -434,27 +437,32 @@ msgstr "" "abaixo para mais informação. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 #, fuzzy msgid "Restoring original system state" msgstr "A restaurar o estado original do sistema" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "A verificar gestor de pacotes" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "A Actualizar informação de repositórios" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "Informação de pacotes inválida" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -467,19 +475,19 @@ msgstr "" "pacote essencial '%s'.\n" "Isto indica um erro sério, por favor reporte este problema." -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "A pedir confirmação" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "A actualizar" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "À procura de software obsoleto" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "A actualização do sistema está completa." @@ -500,7 +508,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "A descarregar ficheiro %li de %li a %s/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, fuzzy, python-format msgid "About %s remaining" msgstr "Cerca de %li minutos restantes" @@ -530,23 +538,29 @@ msgstr "" #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, python-format +#, fuzzy, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" "Substituir ficheiro de configuração\n" "'%s'?" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "O comando 'diff' não foi encontrado" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "Ocorreu um erro fatal" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -561,28 +575,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "%s pacote será removido." msgstr[1] "%s pacotes serão removidos." -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "%s novo pacote será instalado." msgstr[1] "%s novos pacotes serão instalados." -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "%s pacote será actualizado." msgstr[1] "%s pacotes serão actualizados." -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -590,7 +604,7 @@ msgid "" "You have to download a total of %s. " msgstr "Tem de efectuar o download de um total de %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -599,32 +613,35 @@ msgstr "" "A actualização poderá demorar várias horas e não poderá ser cancelada a " "qualquer instante posteriormente." -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" "Para prevenir a perda de dados feche todas as aplicações e documentos " "abertos." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "Impossível de encontrar quaisquer actualizações" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "O seu sistema está actualizado" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "O seu sistema já foi actualizado." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>Remover %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "Instalar %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "Actualizar %s" @@ -658,11 +675,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "Necessário reiniciar" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -698,11 +715,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Iniciar a actualização?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>" msgstr "" -"<span weight=\"bold\" size=\"x-large\">A actualizar para Ubuntu 6.06 LTS</" -"span>" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -826,9 +840,10 @@ msgid "Verfication failed" msgstr "Falhou a verificação" #: ../UpdateManager/DistUpgradeFetcher.py:222 +#, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" "Verificação da actualização falhou. Poderá existir um problema com a rede ou " "com o servidor. " @@ -855,18 +870,18 @@ msgstr "A descarregar ficheiro %li de %li a %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "A descarregar ficheiro %li de %li a velocidade desconhecida" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "" "A lista de alterações ainda não está disponível. Por favor tente mais tarde." -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" "A lista de alterações ainda não está disponível. Por favor tente mais tarde." -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -874,134 +889,125 @@ msgstr "" "Falha a descarregar a lista de alterações. Por favor verifique a sua ligação " "à internet." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Ubuntu 5.10 Actualizações de Segurança" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "A instalar actualizações" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "Actualize para a última versão do Ubuntu" +msgid "Normal updates" +msgstr "A instalar actualizações" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "A instalar actualizações" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "Impossível de instalar todas as actualizações disponíveis" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Versão %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "A descarregar lista de alterações..." -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "_Verificar" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "Tamanho do download: %s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "O seu sistema está actualizado" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Pode instalar %s actualização" msgstr[1] "Pode instalar %s actualizações" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "Por favor aguarde, isto pode levar algum tempo." -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "A actualização está completa" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "Verificar por actualizações disponíveis" + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Nova versão: %s (Tamanho: %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Versão %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "A sua distribuição já não é suportada" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -1011,17 +1017,17 @@ msgstr "" "versão mais recente do Ubuntu Linux. Veja http://www.ubuntu.com para mais " "informação em como actualizar." -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "O índice de software está quebrado" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1045,58 +1051,67 @@ msgstr "" "Software\"." #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"<big><b>Examining your system</b></big>\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "<big><b>Keep your system up-to-date</b></big>" +msgstr "<big><b>Mantenha o seu sistema actualizado</b></big>" + +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "<big><b>Not all updates can be installed</b></big>" msgstr "" -"<big><b>A examinar o seu sistema</b></big>\n" +"<big><b>Erro ao ler o CD</b></big>\n" "\n" -"Actualizações de software podem corrigir erros, eliminar problemas de " -"segurança, e fornecer novas funcionalidades." +"%s" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "<big><b>Keep your system up-to-date</b></big>" -msgstr "<big><b>Mantenha o seu sistema actualizado</b></big>" +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "<big><b>Starting update manager</b></big>" +msgstr "<b><big>Iniciar a actualização?</big></b>" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "Cancelar _Descarregamento" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Alterações" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "Verific_ar" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "Verificar os repositórios de software por novas actualizações" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Descrição" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "Notas de lançamento" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "Mostrar progresso de ficheiros individuais" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Actualizações de Software" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1104,32 +1119,37 @@ msgstr "" "Actualizações de software podem corrigir erros, eliminar problemas de " "segurança, e fornecer novas funcionalidades." -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "A_ctualização" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "Actualize para a última versão do Ubuntu" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "_Verificar" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "_Retomar Actualização?" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "_Ocultar esta informação no futuro" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "_Instalar Actualizações" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Alterações" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1239,11 +1259,12 @@ msgid "_Install security updates without confirmation" msgstr "_Instalar actualizações de segurança sem confirmação" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 +#, fuzzy msgid "" -"<b><big>The channel information is out-of-date</big></b>\n" +"<b><big>The information about available software is out-of-date</big></b>\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1278,10 +1299,10 @@ msgstr "<b>URI:</b>" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the source that you want to add</b></" -"big>\n" +"<big><b>Enter the complete APT line of the repository that you want to add " +"as source</b></big>\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>Introduza uma linha completa APT para o repositório que deseja " @@ -1339,8 +1360,9 @@ msgid "Check for new distribution releases" msgstr "Verificar por novos lançamentos de distribuições" #: ../data/update-manager.schemas.in.h:3 +#, fuzzy msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1361,8 +1383,9 @@ msgid "Stores the size of the update-manager dialog" msgstr "Guarda o tamanho do diálogo do gestor de actualizações" #: ../data/update-manager.schemas.in.h:7 +#, fuzzy msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" "Guarda o estado da lista que contém a lista de alterações e a descrição" @@ -1389,212 +1412,190 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 Actualizações" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "Mantido pela comunidade (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Não-livre (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "Mantido pela comunidade (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "Mantido pela comunidade (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Não-livre (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Não-livre (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Ubuntu 5.10 Actualizações de Segurança" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "A instalar actualizações" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 \"Breezy Badger\"" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "Suportado Oficialmente" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 \"Breezy Badger\"" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 Actualizações de Segurança" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 Actualizações" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Backports" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "Suportado Oficialmente" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 Actualizações de Segurança" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 Actualizações" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 Backports" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 \"Breezy Badger\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Mantido pela comunidade (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Não-livre (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "Algum software já não é suportado oficialmente" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Direitos de autor restritos" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 5.10 Actualizações de Segurança" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 5.10 Actualizações" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 Backports" @@ -1645,6 +1646,47 @@ msgstr "Software compatível-DFSG com Dependências Não-Livres" msgid "Non-DFSG-compatible Software" msgstr "Software compatível-DFSG" +#~ msgid "Some software no longer officially supported" +#~ msgstr "Algum software já não é suportado oficialmente" + +#~ msgid "Could not find any upgrades" +#~ msgstr "Impossível de encontrar quaisquer actualizações" + +#~ msgid "Your system has already been upgraded." +#~ msgstr "O seu sistema já foi actualizado." + +#, fuzzy +#~ msgid "" +#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +#~ msgstr "" +#~ "<span weight=\"bold\" size=\"x-large\">A actualizar para Ubuntu 6.06 LTS</" +#~ "span>" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Ubuntu 5.10 Actualizações de Segurança" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "Actualize para a última versão do Ubuntu" + +#~ msgid "Cannot install all available updates" +#~ msgstr "Impossível de instalar todas as actualizações disponíveis" + +#~ msgid "" +#~ "<big><b>Examining your system</b></big>\n" +#~ "\n" +#~ "Software updates correct errors, eliminate security vulnerabilities and " +#~ "provide new features." +#~ msgstr "" +#~ "<big><b>A examinar o seu sistema</b></big>\n" +#~ "\n" +#~ "Actualizações de software podem corrigir erros, eliminar problemas de " +#~ "segurança, e fornecer novas funcionalidades." + +#~ msgid "Oficially supported" +#~ msgstr "Suportado Oficialmente" + #~ msgid "" #~ "Some updates require the removal of further software. Use the function " #~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " @@ -1745,9 +1787,6 @@ msgstr "Software compatível-DFSG" #~ msgid "<b>Sections</b>" #~ msgstr "<b>Secções</b>" -#~ msgid "Check for available updates" -#~ msgstr "Verificar por actualizações disponíveis" - #~ msgid "<b>Sections:</b>" #~ msgstr "<b>Secções:</b>" diff --git a/po/pt_BR.po b/po/pt_BR.po index 57131852..2a927beb 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-26 22:31+0000\n" "Last-Translator: KurtKraut <ubuntu@kurtkraut.net>\n" "Language-Team: Ubuntu-BR <tradutores@listas.ubuntubrasil.org>\n" @@ -133,9 +133,9 @@ msgstr "" "como um erro." #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"<big><b>Error scaning the CD</b></big>\n" +"<big><b>Error scanning the CD</b></big>\n" "\n" "%s" msgstr "" @@ -151,11 +151,11 @@ msgstr "Por favor digite um nome para o disco" msgid "Please insert a disc in the drive:" msgstr "Por favor insira um disco no drive:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "Pacotes quebrados" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -164,23 +164,23 @@ msgstr "" "programa. Por favor, arrume-os primeiro usando o Synaptic ou apt-get antes " "de continuar." -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Não foi possível atualizar os meta-pacotes requeridos" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "Um pacote essencial teria que ser removido" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Não foi possível calcular a atualização" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -189,11 +189,11 @@ msgstr "" "favor reporte isto como um erro. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "Erro autenticando alguns pacotes" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -203,12 +203,12 @@ msgstr "" "de rede. Você pode tentar de novo depois. Veja abaixo uma lista dos pacotes " "não-autenticados." -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "Não foi possível instalar '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -217,15 +217,16 @@ msgstr "" "um erro. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "Não foi possível adivinhar o meta-pacote" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -235,12 +236,12 @@ msgstr "" "Por favor instale um desses pacotes primeiro usando o Synaptic ou apt-get " "antes de continuar." -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "Falha ao obter" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -250,15 +251,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "Lendo cache" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -266,11 +267,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "Nenhum repositório válido encontrado" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -290,11 +291,11 @@ msgstr "" "Se você selecionar 'não' a atualização será cancelada." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "Gerar sources padrão?" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -308,11 +309,11 @@ msgstr "" "Entradas padrões para '%s' devem ser adicionadas? Se você escolher 'Não' a " "atualização será cancelada." -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "Informação de repositório inválida" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -320,13 +321,14 @@ msgstr "" "Atualizando a informações de repositórios resultou em um arquivo inválido. " "Por favor reporte isso como um erro." -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "Fontes de terceiros desabilitadas" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#, fuzzy msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" @@ -334,11 +336,11 @@ msgstr "" "poderá reabilitá-las depois de atualizar com a ferramenta 'propriedades do " "programa' ou com o synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "Erro durante a atualização" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -347,11 +349,11 @@ msgstr "" "problemas de rede, por favor verifique a sua conexão de rede e tente " "novamente." -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "Não há espaço suficiente no disco" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -363,15 +365,15 @@ msgstr "" "instalações anteriores usando 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "Você quer iniciar a atualização?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "Não foi possível instalar as atualizações" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -383,11 +385,11 @@ msgstr "" "A atualização será abortada agora. Seu sistema pode estar em um estado " "instável. Uma recuperação é executada (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "Não foi possível obter as atualizações" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -395,17 +397,18 @@ msgstr "" "A atualização será abortada agora. Por favor verifique sua conexão à " "Internet ou mídia de instalação e tente de novo. " -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" -msgstr "Alguns softwares não são mais oficialmente suportado." +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 +#, fuzzy msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" "Estes pacotes já instalados não são mais oficialmente suportados, e agora " "são suportados somente pela comunidade ('universe').\n" @@ -413,23 +416,23 @@ msgstr "" "Se você não tem o repositório 'universe' habilitado, estes pacotes serão " "sugeridos à remoção no próximo passo. " -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "Remover Pacotes obsoletos?" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "_Pular Este Passo" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "_Remover" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "Erro ao aplicar as mudanças" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -438,27 +441,32 @@ msgstr "" "abaixo para maiores informações. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "Reiniciando o estado original do sistema" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "Verificando o Gerenciador de Pacotes" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "Atualizando informação do repositório" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 #, fuzzy msgid "Invalid package information" msgstr "Informação do pacote inválida" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -471,19 +479,19 @@ msgstr "" "não pôde mais ser encontrado.\n" "Isto indica um sério erro, por favor reporte isso como um erro." -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "Pedindi por confirmação" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "Atualizando" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "Buscando programas obsoletos" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "A Atualização do Sistema está completa." @@ -504,7 +512,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "Obtendo arquivo %li de %li a %s/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, fuzzy, python-format msgid "About %s remaining" msgstr "Aproximadamente %li minutos restando" @@ -534,23 +542,29 @@ msgstr "" #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, python-format +#, fuzzy, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" "Substituir arquivo de configuração\n" "'%s' ?" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "O comando 'diff' não foi encontrado" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "Ocorreu um erro fatal" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -565,28 +579,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "%s pacote será removido." msgstr[1] "%s pacotes serão removidos." -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "%s novo pacote será instalado." msgstr[1] "%s novos pacotes serão instalados." -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "%s pacote será atualizado." msgstr[1] "%s pacotes serão atualizados." -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -594,7 +608,7 @@ msgid "" "You have to download a total of %s. " msgstr "Você precisa obter um total de %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -602,30 +616,33 @@ msgid "" msgstr "" "A atualização pode levar diversas horas e não poderá ser cancelada depois." -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "Para evitar perda de dados, feche todas as aplicações e documentos." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "Não foi possível encontrar nenhuma atualização" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "Seu sistema está atualizado" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "Seu sistema já foi atualizado." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>Remover %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "Instalar %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "Atualizar %s" @@ -659,11 +676,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "Reinicialização requerida" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -700,11 +717,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Iniciar a Atualização?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>" msgstr "" -"<span weight=\"bold\" size=\"x-large\">Atualizando para o Ubuntu 6.06 LTS</" -"span>" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -829,9 +843,10 @@ msgid "Verfication failed" msgstr "Falha na verificação" #: ../UpdateManager/DistUpgradeFetcher.py:222 +#, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" "Falha na verificação da atualização. Pode ter havido um problema com a rede " "ou com o servidor. " @@ -858,20 +873,20 @@ msgstr "Obtendo arquivo %li de %li a %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Obtendo arquivo %li de %li a uma velocidade desconhecida" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "" "A lista de alterações não está disponível ainda. Por favor, tente novamente " "mais tarde." -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" "A lista de alterações não está disponível ainda. Por favor, tente novamente " "mais tarde." -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -879,134 +894,125 @@ msgstr "" "Não foi possível baixar a lista de mudanças. Por favor, verifique sua " "conexão com a internet." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Atualizações de Segurança do Ubuntu 5.10" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "Instalando Atualizações" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "Atualizar para a última versão do Ubuntu" +msgid "Normal updates" +msgstr "Instalando Atualizações" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "Instalando Atualizações" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "Não foi possível instalar todas as atualizações disponíveis" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Version %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "Obtendo a lista de alterações" -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "_Verificar" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "Tamanho do download: %s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "Seu sistema está atualizado" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Você pode instalar %s atualização" msgstr[1] "Você pode instalar %s atualizações" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "Por favor, espere, isto pode levar algum tempo." -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "Atualização completa" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "Procurar updates disponíveis" + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "New version: %s (Tamanho: %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Version %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "Sua distribuição não é mais suportada" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -1016,17 +1022,17 @@ msgstr "" "falhas de segurança. Atualize para uma versão mais nova do Ubuntu Linux. " "Veja http://www.ubuntu-br.org" -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "A índex de software está quebrado" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1050,58 +1056,67 @@ msgstr "" "de Programas\"." #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"<big><b>Examining your system</b></big>\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "<big><b>Keep your system up-to-date</b></big>" +msgstr "<big><b>Manter o Sistema Atualizado</b></big>" + +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "<big><b>Not all updates can be installed</b></big>" msgstr "" -"<big><b>Verificando as Atualizações Disponíveis</b></big>\n" +"<big><b>Erro analisando o CD</b></big>\n" "\n" -"Atualizações de Programas podem corrigir erros, eliminar vulnerabilidades de " -"segurança, e prover novas funcionalidades para você." +"%s" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "<big><b>Keep your system up-to-date</b></big>" -msgstr "<big><b>Manter o Sistema Atualizado</b></big>" +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "<big><b>Starting update manager</b></big>" +msgstr "<b><big>Iniciar a Atualização?</big></b>" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "Cancelar _Download" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Mudanças" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "_Verificar" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "Verificar os canais de software por novas atualizações" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Descrição" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "Notas de Versão" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "Exibir progresso de arquivos únicos" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Atualizações de Programas" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1109,33 +1124,38 @@ msgstr "" "Atualizações de Programas podem corrigir erros, eliminar vulnerabilidades de " "segurança, e prover novas funcionalidades para você." -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 #, fuzzy msgid "U_pgrade" msgstr "At_ualizar" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "Atualizar para a última versão do Ubuntu" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "_Verificar" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "Continua_r Atualização" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "_Ocultar esta informação no futuro" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "_Instalar Atualizações" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Mudanças" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1247,11 +1267,12 @@ msgid "_Install security updates without confirmation" msgstr "_Instalar novas atualizações de segurança sem confirmação" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 +#, fuzzy msgid "" -"<b><big>The channel information is out-of-date</big></b>\n" +"<b><big>The information about available software is out-of-date</big></b>\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1285,10 +1306,10 @@ msgstr "<b>URI:</b>" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the source that you want to add</b></" -"big>\n" +"<big><b>Enter the complete APT line of the repository that you want to add " +"as source</b></big>\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>Insira a linha completa do APT do canal que você quer adicionar</b></" @@ -1348,8 +1369,9 @@ msgid "Check for new distribution releases" msgstr "Checar por novas versões da distribuição" #: ../data/update-manager.schemas.in.h:3 +#, fuzzy msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1370,8 +1392,9 @@ msgid "Stores the size of the update-manager dialog" msgstr "Armazena o tamanho do diálogo do update-manager" #: ../data/update-manager.schemas.in.h:7 +#, fuzzy msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" "Armazena o estado do expansor que contém a lista de mudanças e a descrição" @@ -1398,212 +1421,190 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Atualizações do Ubuntu 5.10" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "Mantido pela Comunidade (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Contributed software" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "Mantido pela Comunidade (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "Mantido pela Comunidade (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Não-livre (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Não-livre (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "By copyright or legal issues restricted software" msgstr "US export restricted software" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Atualizações de Segurança do Ubuntu 5.10" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "Instalando Atualizações" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "Suporte oficial" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Atualizações de Segurança do Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Atualizações do Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Backports do Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -msgid "Oficially supported" -msgstr "Suportado Oficialmente" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" +msgstr "Suporte oficial" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Atualizações de Segurança do Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Atualizações do Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Backports do Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Mantido pela Comunidade (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Não-livre (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "Alguns softwares não são mais oficialmente suportado." #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Restrito por copyright" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 Security Updates" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Atualizações do Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Backports do Ubuntu 5.10" @@ -1654,6 +1655,47 @@ msgstr "Programa compatível com a DFSG mas com dependências não-livres" msgid "Non-DFSG-compatible Software" msgstr "Programas não compatíveis com a DFSG" +#~ msgid "Some software no longer officially supported" +#~ msgstr "Alguns softwares não são mais oficialmente suportado." + +#~ msgid "Could not find any upgrades" +#~ msgstr "Não foi possível encontrar nenhuma atualização" + +#~ msgid "Your system has already been upgraded." +#~ msgstr "Seu sistema já foi atualizado." + +#, fuzzy +#~ msgid "" +#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +#~ msgstr "" +#~ "<span weight=\"bold\" size=\"x-large\">Atualizando para o Ubuntu 6.06 " +#~ "LTS</span>" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Atualizações de Segurança do Ubuntu 5.10" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "Atualizar para a última versão do Ubuntu" + +#~ msgid "Cannot install all available updates" +#~ msgstr "Não foi possível instalar todas as atualizações disponíveis" + +#~ msgid "" +#~ "<big><b>Examining your system</b></big>\n" +#~ "\n" +#~ "Software updates correct errors, eliminate security vulnerabilities and " +#~ "provide new features." +#~ msgstr "" +#~ "<big><b>Verificando as Atualizações Disponíveis</b></big>\n" +#~ "\n" +#~ "Atualizações de Programas podem corrigir erros, eliminar vulnerabilidades " +#~ "de segurança, e prover novas funcionalidades para você." + +#~ msgid "Oficially supported" +#~ msgstr "Suportado Oficialmente" + #~ msgid "" #~ "Some updates require the removal of further software. Use the function " #~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " @@ -1765,9 +1807,6 @@ msgstr "Programas não compatíveis com a DFSG" #~ msgid "<b>Sections</b>" #~ msgstr "<b>Seções</b>" -#~ msgid "Check for available updates" -#~ msgstr "Procurar updates disponíveis" - #~ msgid "<b>Sections:</b>" #~ msgstr "<b>Sections:</b>" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-24 17:39+0000\n" "Last-Translator: Sami POTIRCA <spotirca@gmail.com>\n" "Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n" @@ -135,9 +135,9 @@ msgid "The key you selected could not be removed. Please report this as a bug." msgstr "Cheia selectată nu poate fi ştearsă. Raportaţi această eroare." #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"<big><b>Error scaning the CD</b></big>\n" +"<big><b>Error scanning the CD</b></big>\n" "\n" "%s" msgstr "" @@ -153,12 +153,12 @@ msgstr "Introduceţi un nume pentru disc" msgid "Please insert a disc in the drive:" msgstr "Introduceţi un disc în unitate:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 #, fuzzy msgid "Broken packages" msgstr "Pachete deteriorate" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 #, fuzzy msgid "" "Your system contains broken packages that couldn't be fixed with this " @@ -168,46 +168,46 @@ msgstr "" "program. Înainte de a continua vă rugăm să le remediaţi utilizând synaptic " "sau apt-get." -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 #, fuzzy msgid "Error authenticating some packages" msgstr "Eroare la autentificarea unor pachete." -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "Nu pot instala '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -217,25 +217,29 @@ msgstr "" "(eroare). " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" +"Sistemul conţine pachete deteriorate care nu au putut fi reparate cu acest " +"program. Înainte de a continua vă rugăm să le remediaţi utilizând synaptic " +"sau apt-get." -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "Nu s-a putut extrage" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -245,15 +249,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "Citire cache" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -261,11 +265,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -278,11 +282,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -291,42 +295,42 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "Eroare în timpul actualizării" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "Spaţiu liber insuficient" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -335,15 +339,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "Vrei sa începi upgrade-ul?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "Nu s-au putut instalat upgrade-urile" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -352,73 +356,78 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "Nu pot descărca actualizările" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "Şter_ge" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 #, fuzzy msgid "Restoring original system state" msgstr "Se reface starea iniţială a sistemului" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "Se verifică managerul de pachete" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -428,19 +437,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "Se actualizează" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "Actualizarea sistemului este completă" @@ -460,7 +469,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, python-format msgid "About %s remaining" msgstr "" @@ -492,19 +501,25 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " @@ -514,31 +529,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 #, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 #, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, python-format msgid "" "\n" @@ -546,36 +558,39 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "Nu s-au găsit actualizări" - -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" msgstr "Sistemul dumneavoastră este actualizat la zi!" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "" @@ -609,11 +624,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -644,7 +659,7 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -768,8 +783,8 @@ msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:222 msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -792,16 +807,16 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "Nu există nici un pachet de actualizat." -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " @@ -810,100 +825,85 @@ msgstr "" "Nu am putut descărca lista modificărilor. Vă rog să verificaţi dacă aveţi o " "conexiune internet activă." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Actualizări de Securitate Ubuntu 5.10" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "_Instalează actualizarile" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "Se actualizează Ubuntu" +msgid "Normal updates" +msgstr "_Instalează actualizarile" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "_Instalează actualizarile" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Versiunea %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 #, fuzzy msgid "Downloading the list of changes..." msgstr "Se descarcă listă schimbărilor..." -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" +#: ../UpdateManager/UpdateManager.py:551 +msgid "_Check All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "Sistemul dumneavoastră este actualizat la zi!" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -911,53 +911,58 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "_Instalează actualizarile" + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Versiunea nouă: %s (Mărime: %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Versiunea %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "Distribuţia dvs. nu mai este suportată" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -973,87 +978,108 @@ msgid "" msgstr "" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"<big><b>Examining your system</b></big>\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "<big><b>Keep your system up-to-date</b></big>" +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "<big><b>Not all updates can be installed</b></big>" msgstr "" +"<big><b>Eroare la scanarea CD-ului</b></big>\n" +"\n" +"%s" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "<big><b>Starting update manager</b></big>" +msgstr "" +"<big><b>Eroare la scanarea CD-ului</b></big>\n" +"\n" +"%s" + +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Modificări" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Descriere" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Actualizări software" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 #, fuzzy msgid "U_pgrade" msgstr "_Actualizează" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "_Continuă Actualizarea" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "_Install Updates" msgstr "_Instalează actualizarile" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Modificări" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1166,10 +1192,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" -"<b><big>The channel information is out-of-date</big></b>\n" +"<b><big>The information about available software is out-of-date</big></b>\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1197,10 +1223,10 @@ msgstr "<b>URI:</b>" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the source that you want to add</b></" -"big>\n" +"<big><b>Enter the complete APT line of the repository that you want to add " +"as source</b></big>\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>Introduceţi linia APT completă a locaţiei pe care doriţi să o " @@ -1265,7 +1291,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:3 msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1284,7 +1310,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:7 msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" @@ -1309,214 +1335,191 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Actualizări Ubuntu 5.10" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "Pachete întreţinute de comunitate (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Software în contribuţie" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Actualizări de securitate Ubuntu 5.04" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "Pachete întreţinute de comunitate (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "Pachete întreţinute de comunitate (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Pachete non-libere (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Pachete non-libere (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "By copyright or legal issues restricted software" msgstr "Software cu restricţii de export din SUA" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Actualizări de securitate Ubuntu 5.04" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Actualizări de Securitate Ubuntu 5.10" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "_Instalează actualizarile" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "Pachete suportate oficial" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Actualizări de Securitate Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Actualizări Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Actualizări de securitate Ubuntu 5.04" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Actualizări de securitate Ubuntu 5.04" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Actualizări de securitate Ubuntu 5.04" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -#, fuzzy -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "Pachete suportate oficial" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Actualizări de Securitate Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Actualizări Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Actualizări de securitate Ubuntu 5.04" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Pachete întreţinute de comunitate (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Pachete non-libere (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "Pachete suportate oficial" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Copyright restrictiv" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Actualizări de securitate Ubuntu 4.10" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Actualizări Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Actualizări de securitate Ubuntu 5.04" @@ -1567,6 +1570,24 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#~ msgid "Could not find any upgrades" +#~ msgstr "Nu s-au găsit actualizări" + +#~ msgid "Your system has already been upgraded." +#~ msgstr "Sistemul dumneavoastră este actualizat la zi!" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Actualizări de Securitate Ubuntu 5.10" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "Se actualizează Ubuntu" + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "Pachete suportate oficial" + #~ msgid "Hide details" #~ msgstr "Ascunde detaliile" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-25 19:23+0000\n" "Last-Translator: Igor Zubarev <igor4u@gmail.com>\n" "Language-Team: Russian <ru@li.org>\n" @@ -130,9 +130,9 @@ msgstr "" "Выбранный вами ключ нельзя удалить. Пожалуйста, отправьте отчет об ошибке." #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"<big><b>Error scaning the CD</b></big>\n" +"<big><b>Error scanning the CD</b></big>\n" "\n" "%s" msgstr "" @@ -148,11 +148,11 @@ msgstr "Введите название для диска" msgid "Please insert a disc in the drive:" msgstr "Пожалуйста, вставьте диск в привод:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "Поврежденные пакеты" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -161,23 +161,23 @@ msgstr "" "данной программой. Пожалуйста, исправьте их, используя synaptic или apt-get, " "прежде чем продолжить." -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Невозможно обновить требуемые мета-пакеты" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "Будет удален необходимый пакет" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Невозможно подготовить обновление системы" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -186,11 +186,11 @@ msgstr "" "Пожалуйста, отправьте отчет об ошибке. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "Ошибка при проверке подлинности некоторых пакетов" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -200,12 +200,12 @@ msgstr "" "кратковременная проблема с сетью и стоит попробовать позже. Ниже приведен " "список пакетов, не прошедших проверку." -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "Невозможно установить '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -214,15 +214,16 @@ msgstr "" "ошибке. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "Невозможно подобрать мета-пакет" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -231,12 +232,12 @@ msgstr "" " Для продолжения сначала установите один из приведенных выше пакетов с " "помощью synaptic или apt-get." -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "Не удалось получить" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -246,15 +247,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "Чтение кэша" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -262,11 +263,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "Не найдено действующее зеркало" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -286,11 +287,11 @@ msgstr "" "Ответ 'Нет' отменит обновление." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "Сгенерировать источники по умолчанию?" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -303,11 +304,11 @@ msgstr "" "\n" "Добавить записи по умолчанию для '%s'? Ответ 'Нет' прервет обновление." -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "Информация о репозитории неверна" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -315,13 +316,14 @@ msgstr "" "В результате обновления информации о репозиториях образовался неверный файл. " "Пожалуйста отправьте отчет об ошибке." -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "Источники третьих сторон отключены" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#, fuzzy msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" @@ -329,11 +331,11 @@ msgstr "" "обновления вы можете снова включить их с помощью утилиты 'software-" "properties' или synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "Ошибка при обновлении" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -341,11 +343,11 @@ msgstr "" "При обновлении возникла проблема. Обычно это бывает вызвано проблемами в " "сети, проверьте сетевые подключения и повторите попытку." -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "Недостаточно свободного места на диске" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -357,15 +359,15 @@ msgstr "" "предыдущих установок с помощью команды 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "Вы хотите начать обновление системы?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "Невозможно установить обновления" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -377,11 +379,11 @@ msgstr "" "Обновление прервано. Система, возможно, находится в неработоспособном " "состоянии. Запущено восстановление системы (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "Невозможно загрузить обновления" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -389,17 +391,18 @@ msgstr "" "Обновление прервано. Проверьте соединение с Интернет или установочный диск и " "попробуйте снова. " -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" -msgstr "Некоторые программы больше не поддерживаются официально" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 +#, fuzzy msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" "Эти установленные пакеты больше не поддерживаются официально. Теперь их " "поддержкой занимается только сообщество ('universe').\n" @@ -407,23 +410,23 @@ msgstr "" "Если у вас не подключен репозиторий 'universe', на следующем шаге вам " "предложат удалить эти пакеты. " -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "Удалить устаревшие пакеты?" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "_Пропустить этот шаг" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "_Удалить" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "Ошибка при фиксировании" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -432,26 +435,31 @@ msgstr "" "ниже. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "Восстановление первоначального состояния системы" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "Проверка менеджера пакетов" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "Обновление информации о репозитории" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "Неверная информация о пакете" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -464,19 +472,19 @@ msgstr "" "найден.\n" "Это говорит о серьезной проблеме, пожалуйста отправьте отчет об ошибке." -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "Запрос подтверждения" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "Обновление" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "Поиск устаревших программ" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "Обновление системы завершено." @@ -497,7 +505,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "Загрузка файла %li из %li со скоростью %s/с" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, fuzzy, python-format msgid "About %s remaining" msgstr "Осталось приблизительно %li минут" @@ -527,23 +535,29 @@ msgstr "" #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, python-format +#, fuzzy, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" "Заменить конфигурационный файл\n" "'%s'?" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "Не найдена команда 'diff'" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "Произошла неисправимая ошибка" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -557,31 +571,31 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "%s пакет будет удален." msgstr[1] "%s пакета будут удалены." msgstr[2] "%s пакетов будут удалены." -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "%s новый пакет будет установлен." msgstr[1] "%s новых пакета будут установлены." msgstr[2] "%s новых пакетов будут установлены." -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "%s пакет будет обновлен." msgstr[1] "%s пакета будут обновлены." msgstr[2] "%s пакетов будут обновлены." -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -589,7 +603,7 @@ msgid "" "You have to download a total of %s. " msgstr "Всего требуется загрузить %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -598,31 +612,34 @@ msgstr "" "Обновление может занять несколько часов и не может быть прервано в любой " "момент." -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" "Чтобы избежать потерь данных, закройте все открытые приложения и документы." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "Обновления не найдены" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "Ваша система не требует обновления" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "Система уже обновлена." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>Удалить %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "Установить %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "Обновить %s" @@ -656,11 +673,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "Требуется перезагрузка" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "Обновление завершено и требуется перезагрузка. Перезагрузиться сейчас?" @@ -695,10 +712,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Начать обновление?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>" msgstr "" -"<span weight=\"bold\" size=\"x-large\">Обновление до Ubuntu 6.06 LTS</span>" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -822,9 +837,10 @@ msgid "Verfication failed" msgstr "Проверка не удалась" #: ../UpdateManager/DistUpgradeFetcher.py:222 +#, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" "Проверка обновления не удалась. Возможно, возникла проблема в сети или на " "сервере. " @@ -851,18 +867,18 @@ msgstr "Загрузка файла %li из %li со скоростью %s/с" msgid "Downloading file %li of %li with unknown speed" msgstr "Загрузка файла %li из %li с неизвестной скоростью" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "" "На данный момент список изменений недоступен. Пожалуйста, попробуйте позднее." -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" "На данный момент список изменений недоступен. Пожалуйста, попробуйте позднее." -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -870,99 +886,85 @@ msgstr "" "Не удалось загрузить список изменений. Пожалуйста, проверьте соединение с " "интернет." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Обновления безопасности Ubuntu 5.10" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "Установить обновления" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "Обновить систему до последней версии Ubuntu" +msgid "Normal updates" +msgstr "Установить обновления" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "Установить обновления" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "Невозможно установить все доступные обновления" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Версия %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "Загрузка списка изменений..." -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "Проверить" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "Размер загружаемых данных: %s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "Ваша система не требует обновления" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -970,35 +972,40 @@ msgstr[0] "Вы можете установить %s обновление" msgstr[1] "Вы можете установить %s обновления" msgstr[2] "Вы можете установить %s обновлений" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "Пожалуйста подождите, это может занять некоторое время." -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "Обновление завершено" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "Установить обновления" + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Новая версия: %s (Размер: %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Версия %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "Ваша версия Ubuntu больше не поддерживается" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -1008,17 +1015,17 @@ msgstr "" "обновления. Обновите систему до более поздней версии Ubuntu Linux. Для " "получения информации об обновлении посетите http://www.ubuntu.com" -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "<b>Доступен новый релиз дистрибутива '%s'</b>" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "Индекс программ поврежден" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1041,58 +1048,67 @@ msgstr "" "\"Система\" -> \"Администрирование\" -> \"Параметры приложений\"." #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"<big><b>Examining your system</b></big>\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "<big><b>Keep your system up-to-date</b></big>" +msgstr "<big><b>Не забывайте обновлять систему</b></big>" + +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "<big><b>Not all updates can be installed</b></big>" msgstr "" -"<big><b>Обследование системы</b></big>\n" +"<big><b>Ошибка при сканировании CD</b></big>\n" "\n" -"Обновления программ исправляют ошибки, уязвимости и добавляют новые " -"возможности." +"%s" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "<big><b>Keep your system up-to-date</b></big>" -msgstr "<big><b>Не забывайте обновлять систему</b></big>" +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "<big><b>Starting update manager</b></big>" +msgstr "<b><big>Начать обновление?</big></b>" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "Отменить _загрузку" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Изменения" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "_Проверить" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "Проверить каналы приложений на наличие обновлений" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Описание" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "Сведения о релизе" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "Показывать прогресс для отдельных файлов" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Обновления программ" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1100,32 +1116,37 @@ msgstr "" "Обновления программ исправляют ошибки, уязвимости и добавляют новые " "возможности." -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "Обновить" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "Обновить систему до последней версии Ubuntu" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "Проверить" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "_Продолжить обновление" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "Не показывать эту информацию в дальнейшем" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "Установить обновления" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Изменения" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1235,11 +1256,12 @@ msgid "_Install security updates without confirmation" msgstr "Устанавливать обновления безопасности без запроса" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 +#, fuzzy msgid "" -"<b><big>The channel information is out-of-date</big></b>\n" +"<b><big>The information about available software is out-of-date</big></b>\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1273,10 +1295,10 @@ msgstr "<b>URI:</b>" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the source that you want to add</b></" -"big>\n" +"<big><b>Enter the complete APT line of the repository that you want to add " +"as source</b></big>\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>Введите полную строку APT канала, который вы хотите добавить</b></" @@ -1334,8 +1356,9 @@ msgid "Check for new distribution releases" msgstr "Проверить на наличие новых релизов дистрибутива" #: ../data/update-manager.schemas.in.h:3 +#, fuzzy msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1356,8 +1379,9 @@ msgid "Stores the size of the update-manager dialog" msgstr "Хранит размер окна менеджера обновлений" #: ../data/update-manager.schemas.in.h:7 +#, fuzzy msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "Хранит состояние экспандера, содержащего список изменений и описание" @@ -1383,212 +1407,189 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Обновления Ubuntu 5.10" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "Поддерживается сообществом (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Несвободное (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "Поддерживается сообществом (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "Поддерживается сообществом (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Несвободное (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Несвободное (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Обновления безопасности Ubuntu 5.10" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "Установить обновления" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "Официально поддерживается" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Обновления безопасности Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Обновления Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Backports" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -#, fuzzy -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "Официально поддерживается" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Обновления безопасности Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Обновления Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 Backports" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Поддерживается сообществом (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Несвободное (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "Некоторые программы больше не поддерживаются официально" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Ограниченные авторские права" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "Обновления безопасности Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Обновления Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 Backports" @@ -1639,6 +1640,48 @@ msgstr "DFSG-совместимое ПО с зависимостями от не msgid "Non-DFSG-compatible Software" msgstr "Не-DFSG-совместимое ПО" +#~ msgid "Some software no longer officially supported" +#~ msgstr "Некоторые программы больше не поддерживаются официально" + +#~ msgid "Could not find any upgrades" +#~ msgstr "Обновления не найдены" + +#~ msgid "Your system has already been upgraded." +#~ msgstr "Система уже обновлена." + +#, fuzzy +#~ msgid "" +#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +#~ msgstr "" +#~ "<span weight=\"bold\" size=\"x-large\">Обновление до Ubuntu 6.06 LTS</" +#~ "span>" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Обновления безопасности Ubuntu 5.10" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "Обновить систему до последней версии Ubuntu" + +#~ msgid "Cannot install all available updates" +#~ msgstr "Невозможно установить все доступные обновления" + +#~ msgid "" +#~ "<big><b>Examining your system</b></big>\n" +#~ "\n" +#~ "Software updates correct errors, eliminate security vulnerabilities and " +#~ "provide new features." +#~ msgstr "" +#~ "<big><b>Обследование системы</b></big>\n" +#~ "\n" +#~ "Обновления программ исправляют ошибки, уязвимости и добавляют новые " +#~ "возможности." + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "Официально поддерживается" + #~ msgid "" #~ "Some updates require the removal of further software. Use the function " #~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-23 19:44+0000\n" "Last-Translator: Steve Murphy <murf@e-tools.com>\n" "Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n" @@ -142,7 +142,7 @@ msgstr "Urufunguzo Byahiswemo OYA Cyavanyweho Icyegeranyo iyi Nka a" #: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" -"<big><b>Error scaning the CD</b></big>\n" +"<big><b>Error scanning the CD</b></big>\n" "\n" "%s" msgstr "" @@ -155,56 +155,56 @@ msgstr "" msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." msgstr "Urufunguzo Byahiswemo OYA Cyavanyweho Icyegeranyo iyi Nka a " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -212,24 +212,24 @@ msgid "" msgstr "Urufunguzo Byahiswemo OYA Cyavanyweho Icyegeranyo iyi Nka a " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -239,15 +239,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -255,11 +255,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -272,11 +272,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -285,43 +285,43 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 #, fuzzy msgid "Error during update" msgstr "i Urufunguzo" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -330,15 +330,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -347,73 +347,78 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 #, fuzzy msgid "Checking package manager" msgstr "Muyobozi ni" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -423,20 +428,20 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 #, fuzzy msgid "Upgrading" msgstr "Byarangiye" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "" @@ -456,7 +461,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, python-format msgid "About %s remaining" msgstr "" @@ -489,19 +494,25 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " @@ -511,25 +522,25 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 #, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 #, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, python-format msgid "" "\n" @@ -537,37 +548,40 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "" - -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 #, fuzzy -msgid "Your system has already been upgraded." -msgstr "Sisitemu" +msgid "Your system is up-to-date" +msgstr "Sisitemu ni Hejuru Kuri Itariki" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "" @@ -601,11 +615,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -636,7 +650,7 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -762,8 +776,8 @@ msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:222 msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -786,16 +800,16 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "ni a Gishya Bya Bihari" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " @@ -803,152 +817,142 @@ msgid "" msgstr "" "Kuri Gufungura Amahinduka Kugenzura... NIBA ni Gikora Interineti Ukwihuza" -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "5" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "Kwinjiza porogaramu" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 -msgid "Updates of Ubuntu" -msgstr "" +#: ../UpdateManager/UpdateManager.py:240 +#, fuzzy +msgid "Normal updates" +msgstr "Kwinjiza porogaramu" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "Kwinjiza porogaramu" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, fuzzy, python-format msgid "Version %s: \n" msgstr "Verisiyo \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 #, fuzzy msgid "Downloading the list of changes..." msgstr "Iyimura... i" -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" +#: ../UpdateManager/UpdateManager.py:551 +msgid "_Check All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:632 -#, fuzzy -msgid "Your system is up-to-date" -msgstr "Sisitemu ni Hejuru Kuri Itariki" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, fuzzy, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Sisitemu ni Hejuru Kuri Itariki" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "Kwinjiza porogaramu" + +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Verisiyo \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "Ikwirakwiza... ni Oya" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -964,87 +968,100 @@ msgid "" msgstr "" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"<big><b>Examining your system</b></big>\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "<big><b>Keep your system up-to-date</b></big>" +#: ../data/glade/UpdateManager.glade.h:5 +msgid "<big><b>Not all updates can be installed</b></big>" msgstr "" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:6 +msgid "<big><b>Starting update manager</b></big>" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Amahinduka" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Isobanuramiterere" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Ibihuzagihe bya porogaramumudasobwa" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 #, fuzzy msgid "U_pgrade" msgstr "Byarangiye" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "Byarangiye" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "_Install Updates" msgstr "Kwinjiza porogaramu" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Amahinduka" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1155,10 +1172,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" -"<b><big>The channel information is out-of-date</big></b>\n" +"<b><big>The information about available software is out-of-date</big></b>\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1191,10 +1208,10 @@ msgstr "<B B" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the source that you want to add</b></" -"big>\n" +"<big><b>Enter the complete APT line of the repository that you want to add " +"as source</b></big>\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<B i Byuzuye Umurongo Bya i Kuri Kongeramo B Umurongo Kirimo i Ubwoko Ahantu " @@ -1250,7 +1267,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:3 msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1269,7 +1286,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:7 msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" @@ -1294,215 +1311,193 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "5" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Kohereza Nta gukoresha bisesuye" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "5" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Kigenga" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Kigenga" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "By copyright or legal issues restricted software" msgstr "Kohereza Nta gukoresha bisesuye" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "5" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "5" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "Kwinjiza porogaramu" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 #, fuzzy msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "5" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "5" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 #, fuzzy msgid "Ubuntu 5.10 Security Updates" msgstr "5" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 #, fuzzy msgid "Ubuntu 5.10 Updates" msgstr "5" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "5" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "5" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "5" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "5" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "5" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "5" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "5" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 #, fuzzy msgid "Non-free (Multiverse)" msgstr "Kigenga" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 -msgid "No longer oficially supported" +#: ../data/channels/Ubuntu.info.in:209 +msgid "No longer officially supported" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 #, fuzzy msgid "Restricted copyright" msgstr "Uburenganzira bw'umuhimbyi" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "5" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "5" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "5" @@ -1555,6 +1550,14 @@ msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Your system has already been upgraded." +#~ msgstr "Sisitemu" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "5" + +#, fuzzy #~ msgid "The following updates will be skipped:" #~ msgstr "OYA" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-24 17:32+0000\n" "Last-Translator: Peter Chabada <ubuntu@chabada.sk>\n" "Language-Team: Slovak <sk-i18n@linux.sk>\n" @@ -130,9 +130,9 @@ msgid "The key you selected could not be removed. Please report this as a bug." msgstr "Vybraný kľúč nebolo možné odstrániť. Nahláste to ako chybu." #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"<big><b>Error scaning the CD</b></big>\n" +"<big><b>Error scanning the CD</b></big>\n" "\n" "%s" msgstr "" @@ -148,11 +148,11 @@ msgstr "Prosím, zadajte názov disku" msgid "Please insert a disc in the drive:" msgstr "Prosím, vložte disk do mechaniky:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "Poškodené balíky" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -160,23 +160,23 @@ msgstr "" "Váš systém obsahuje poškodené balíky, ktoré nemôžu byť týmto programom " "opravené. Pred pokračovaním ich opravte programom synaptic alebo apt-get." -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Nemôžem aktualizovať požadované meta-balíky" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "Musel by byť odstránený dôležitý balík" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Nemôžem vypočítať aktualizáciu" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -185,11 +185,11 @@ msgstr "" "ako chybu. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "Chyba pri overovaní niektorých balíkov" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -199,27 +199,28 @@ msgstr "" "problémom v sieti. Môžete to opäť skúsiť neskôr. Nižšie je uvedený zoznam " "neoverených balíčkov." -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "Nemôžem inštalovať '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "Požadovaný balík nebolo možné nainštalovať. Nahláste to ako chybu. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "Nemôžem odhadnúť meta balík." -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -228,12 +229,12 @@ msgstr "" "Pred pokračovaním nainštalujte jeden z vyššie uvedených balíkov pomocou " "Synapticu alebo apt-get." -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "Zlyhalo získavanie aktualizácie" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -243,15 +244,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "Čítam vyrovnávaciu pamäť cache" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -259,11 +260,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "Nebol nájdený vhodný server" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -283,11 +284,11 @@ msgstr "" "Pokiaľ zvolíte 'Nie', súbor nebude zmenený." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "Vytvoriť štandardný zoznam zdrojov softvéru?" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -301,11 +302,11 @@ msgstr "" "Majú byť pridané štandardné záznamy pre '%s'? Pokiaľ zvolíte 'Nie', súbor " "nebude zmenený." -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "Neplatná informácia o zdrojoch softvéru" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -313,13 +314,14 @@ msgstr "" "Aktualizácia informácií o zdrojoch softvéru skončila neplatným súborom. " "Nahláste to ako chybu." -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "Zdroje tretích strán sú zakázané" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#, fuzzy msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" @@ -327,11 +329,11 @@ msgstr "" "Môžete ich povoliť po upgrade pomocou nástroja 'vlastnosti-softwaru' alebo " "pomocou synapticu." -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "Chyba počas aktualizácie" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -339,11 +341,11 @@ msgstr "" "Počas aktualizácie sa objavil problém, ktorý je zvyčajne spôsobený chybou " "sieťového pripojenia, preto skontrolujte vaše pripojenie a skúste znova." -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "Nedostatok voľného miesta na disku" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -355,15 +357,15 @@ msgstr "" "súborov z predchádzajúcich inštalácií pomocou príkazu 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "Chcete začať s aktualizáciou?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "Nebolo možné nainštalovať aktualizácie" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -375,11 +377,11 @@ msgstr "" "Aktualizácia teraz skončí. Váš systém môže byť v nepoužiteľnom stave, preto " "bol spustený príkaz na zotavenie sa z tohto stavu (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "Nebolo možné stiahnuť požadované balíky" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -387,17 +389,18 @@ msgstr "" "Aktualizácia bola neočakávane prerušená. Skontrolujte svoje internetové " "pripojenie alebo inštalačné médiá a skúste znova. " -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" -msgstr "Niektoré programy už nie sú viac oficiálne podporované" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 +#, fuzzy msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" "Tieto nainštalované balíky už viac nie sú oficiálne podporované, ale stará " "sa o ne komunita.\n" @@ -405,23 +408,23 @@ msgstr "" "Pokiaľ nemáte zapnutý komunitou spravovaný zdroj softvéru 'universe', budú " "tieto balíky v ďalšom kroku navrhnuté na odstránenie. " -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "Odstrániť zastarané balíky?" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "_Preskočiť tento krok" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "_Odstrániť" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "Chyba počas potvrdzovania" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -430,26 +433,31 @@ msgstr "" "uvedené správy. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "Obnovuje sa pôvodný stav systému" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "Kontrola správcu balíkov" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "Aktualizácia informácií o zdrojoch softvéru" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "Neplatná informácia o balíku" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -462,19 +470,19 @@ msgstr "" "s'.\n" "To znamená závažný problém. Nahláste to ako chybu." -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "Požaduje sa potvrdenie" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "Prebieha aktualizácia" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "Vyhľadávanie zastaraného softvéru" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "Aktualizácia systému je dokončená." @@ -495,7 +503,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "Sťahovanie súboru %li z %li pri %s/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, fuzzy, python-format msgid "About %s remaining" msgstr "Zostáva %li minút" @@ -525,23 +533,29 @@ msgstr "" #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, python-format +#, fuzzy, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" "Nahradiť konfiguračný súbor\n" "'%s'?" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "Príkaz 'diff' nebol nájdený." -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "Nastala závažná chyba" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -557,31 +571,31 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "Bude odstránený %s balík." msgstr[1] "Budú odstránené %s balíky." msgstr[2] "Bude odstránených %s balíkov." -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "Bude nainštalovaný %s nový balík." msgstr[1] "Budú nainštalované %s nové balíky." msgstr[2] "Bude nainštalovaných %s nových balíkov." -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "Bude aktualizovaný %s balík." msgstr[1] "Budú aktualizované %s balíky." msgstr[2] "Bude aktualizovaných %s balíkov." -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -589,38 +603,41 @@ msgid "" "You have to download a total of %s. " msgstr "Musíte stiahnuť celkom %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "Aktualizácia môže trvať niekoľko hodín a nemôže byť neskôr prerušená." -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" "Pre zamedzenie straty dát, zavrite všetky otvorené programy a dokumenty." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "Nemôžno nájsť žiadne aktualizácie" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "Váš systém je aktuálny" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "Váš systém už bol aktualizovaný." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>Odstrániť %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "Inštalovať %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "Aktualizovať %s" @@ -654,11 +671,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "Je potrebný reštart" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -695,11 +712,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Spustiť aktualizáciu?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>" msgstr "" -"<span weight=\"bold\" size=\"x-large\">Prebieha aktualizácia na Ubuntu 6.06 " -"LTS</span>" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -823,9 +837,10 @@ msgid "Verfication failed" msgstr "Zlyhala verifikácia" #: ../UpdateManager/DistUpgradeFetcher.py:222 +#, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" "Zlyhala verifikácia aktualizácie. Môže to byť spôsobené sieťovým problémom " "alebo nedostupňosťou servera. " @@ -852,16 +867,16 @@ msgstr "Sťahovanie súboru %li z %li pri %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Sťahovanie súboru %li z %li pri nezámej rýchlosti" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "Zoznam zmien ešte nie je k dispozícii. Skúste neskôr." -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "Zoznam zmien ešte nie je k dispozícii. Skúste neskôr." -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -869,99 +884,85 @@ msgstr "" "Zlyhalo získavanie zoznamu zmien. Skontrolujte si svoje internetové " "pripojenie." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Ubuntu 5.10 - bezpečnostné aktualizácie" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "Nainštalovať _aktualizácie" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "Aktualizovať na najnovšiu verziu Ubuntu" +msgid "Normal updates" +msgstr "Nainštalovať _aktualizácie" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "Nainštalovať _aktualizácie" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "Nebolo možné nainštalovať všetky dostupné aktualizácie" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Verzia %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "Získava sa zoznam zmien..." -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "_Skontrolovať" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "Veľkosť na stiahnutie: %s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "Váš systém je aktuálny" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -969,35 +970,40 @@ msgstr[0] "Môžete nainštalovať %s aktualizáciu" msgstr[1] "Môžete nainštalovať %s aktualizácie" msgstr[2] "Môžete nainštalovať %s aktualizácií" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "Čakajte prosím, toto môže chvíľu trvať." -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "Aktualizácia je dokončená" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "Kontrolujem aktualizácie..." + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Nová verzia: %s (veľkosť: %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Verzia %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "Vaša distribúcia už nie je podporovaná" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -1008,17 +1014,17 @@ msgstr "" "Pre viac informácií o prechode na novšiu verziu si pozrite http://www.ubuntu." "com.\"" -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "Index softvéru je poškodený" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1042,58 +1048,67 @@ msgstr "" "softvéru'." #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"<big><b>Examining your system</b></big>\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "<big><b>Keep your system up-to-date</b></big>" +msgstr "<big><b>Udržujte si systém v aktuálnom stave</b></big>" + +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "<big><b>Not all updates can be installed</b></big>" msgstr "" -"<big><b>Analyzuje sa váš systém</b></big>\n" +"<big><b>Chyba pri načítavaní CD</b></big>\n" "\n" -"Softvérové aktualizácie opravujú chyby, odstraňujú bezpečnostné " -"zraniteľnosti alebo poskytujú nové vlastnosti." +"%s" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "<big><b>Keep your system up-to-date</b></big>" -msgstr "<big><b>Udržujte si systém v aktuálnom stave</b></big>" +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "<big><b>Starting update manager</b></big>" +msgstr "<b><big>Spustiť aktualizáciu?</big></b>" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "_Zrušiť sťahovanie" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Zmeny" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "_Skontrolovať" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "Skontrolovať, či zdroje softvéru neobsahujú nové aktualizácie" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Popis" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "Poznámky k vydaniu" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "Zobraziť priebeh jednotlivých súborov" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Aktualizácie softvéru" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1101,32 +1116,37 @@ msgstr "" "Softvérové aktualizácie opravujú chyby, odstraňujú bezpečnostné " "zraniteľnosti alebo poskytujú nové vlastnosti." -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "_Aktualizovať" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "Aktualizovať na najnovšiu verziu Ubuntu" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "_Skontrolovať" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "_Pokračovať v aktualizácii" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "_Túto správu už viac nezobrazovať" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "Nainštalovať _aktualizácie" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Zmeny" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1237,11 +1257,12 @@ msgid "_Install security updates without confirmation" msgstr "_Bezpečnostné aktualizácie inštalovať automaticky bez potvrdenia" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 +#, fuzzy msgid "" -"<b><big>The channel information is out-of-date</big></b>\n" +"<b><big>The information about available software is out-of-date</big></b>\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1276,10 +1297,10 @@ msgstr "<b>Adresa:</b>" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the source that you want to add</b></" -"big>\n" +"<big><b>Enter the complete APT line of the repository that you want to add " +"as source</b></big>\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>Zadajte kompletný APT riadok zdroja softvéru, ktorý chcete pridať</" @@ -1339,8 +1360,9 @@ msgid "Check for new distribution releases" msgstr "Kontrolovať dostupnosť novšej verzie distribúcie" #: ../data/update-manager.schemas.in.h:3 +#, fuzzy msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1362,8 +1384,9 @@ msgid "Stores the size of the update-manager dialog" msgstr "Uchováva veľkosť dialágu správcu aktualizácií" #: ../data/update-manager.schemas.in.h:7 +#, fuzzy msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "Uchováva veľkosť časti okna so zoznamom zmien a popisom balíka" @@ -1389,213 +1412,191 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 - aktualizácie" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "Udržiavané komunitou (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Softvér závislý na neslobornom softvéri" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 #, fuzzy msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\"" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "Udržiavané komunitou (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "Udržiavané komunitou (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Neslobodné (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Neslobodné (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "By copyright or legal issues restricted software" msgstr "Softvér s obmedzených exportom pre USA" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Ubuntu 5.10 - bezpečnostné aktualizácie" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "Nainštalovať _aktualizácie" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "Oficiálne podporované" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 - bezpečnostné aktualizácie" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 - aktualizácie" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 - backporty" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Disk s Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Disk s Ubuntu 5.04 \"Hoary Hedgehog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "Oficiálne podporované" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 - bezpečnostné aktualizácie" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 - aktualizácie" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 - backporty" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Udržiavané komunitou (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Neslobodné (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 #, fuzzy msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "Niektoré programy už nie sú viac oficiálne podporované" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "S obmedzujúcou licenciou" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 bezpečnostné aktualizácie" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 4.10 aktualizácie" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 - backporty" @@ -1646,6 +1647,47 @@ msgstr "Softvér kompatibilný s DFSG bez závislostí na neslobodnom softvére" msgid "Non-DFSG-compatible Software" msgstr "Softvér nekompatibilný s DFSG" +#~ msgid "Some software no longer officially supported" +#~ msgstr "Niektoré programy už nie sú viac oficiálne podporované" + +#~ msgid "Could not find any upgrades" +#~ msgstr "Nemôžno nájsť žiadne aktualizácie" + +#~ msgid "Your system has already been upgraded." +#~ msgstr "Váš systém už bol aktualizovaný." + +#, fuzzy +#~ msgid "" +#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +#~ msgstr "" +#~ "<span weight=\"bold\" size=\"x-large\">Prebieha aktualizácia na Ubuntu " +#~ "6.06 LTS</span>" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Ubuntu 5.10 - bezpečnostné aktualizácie" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "Aktualizovať na najnovšiu verziu Ubuntu" + +#~ msgid "Cannot install all available updates" +#~ msgstr "Nebolo možné nainštalovať všetky dostupné aktualizácie" + +#~ msgid "" +#~ "<big><b>Examining your system</b></big>\n" +#~ "\n" +#~ "Software updates correct errors, eliminate security vulnerabilities and " +#~ "provide new features." +#~ msgstr "" +#~ "<big><b>Analyzuje sa váš systém</b></big>\n" +#~ "\n" +#~ "Softvérové aktualizácie opravujú chyby, odstraňujú bezpečnostné " +#~ "zraniteľnosti alebo poskytujú nové vlastnosti." + +#~ msgid "Oficially supported" +#~ msgstr "Oficiálne podporované" + #~ msgid "" #~ "Some updates require the removal of further software. Use the function " #~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " @@ -2016,9 +2058,6 @@ msgstr "Softvér nekompatibilný s DFSG" #~ msgid "Updating package list..." #~ msgstr "Aktualizujem zoznam balíkov..." -#~ msgid "Checking for updates..." -#~ msgstr "Kontrolujem aktualizácie..." - #~ msgid "There are no updates available." #~ msgstr "Nie sú dostupné žiadne aktualizácie." @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-27 12:27+0000\n" "Last-Translator: Dejan Milosavljevic <dejan@wavebone.net>\n" "Language-Team: Serbian <sr@li.org>\n" @@ -130,7 +130,7 @@ msgstr "" #: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" -"<big><b>Error scaning the CD</b></big>\n" +"<big><b>Error scanning the CD</b></big>\n" "\n" "%s" msgstr "" @@ -143,79 +143,79 @@ msgstr "" msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -225,15 +225,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -241,11 +241,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -258,11 +258,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -271,42 +271,42 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -315,15 +315,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -332,72 +332,77 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -407,19 +412,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "" @@ -439,7 +444,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, python-format msgid "About %s remaining" msgstr "" @@ -471,19 +476,25 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " @@ -493,31 +504,31 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 #, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 #, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, python-format msgid "" "\n" @@ -525,36 +536,39 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "" @@ -588,11 +602,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -623,7 +637,7 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -744,8 +758,8 @@ msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:222 msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -768,110 +782,94 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 msgid "The list of changes is not available" msgstr "" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" -#: ../UpdateManager/UpdateManager.py:228 -msgid "Important security updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 +msgid "Important security updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +msgid "Proposed updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 -msgid "Updates of Ubuntu" +#: ../UpdateManager/UpdateManager.py:240 +msgid "Normal updates" msgstr "" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 msgid "Other updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" +#: ../UpdateManager/UpdateManager.py:551 +msgid "_Check All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -879,52 +877,56 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +msgid "Checking for updates" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -940,84 +942,96 @@ msgid "" msgstr "" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"<big><b>Examining your system</b></big>\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "<big><b>Keep your system up-to-date</b></big>" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:5 +msgid "<big><b>Not all updates can be installed</b></big>" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:6 +msgid "<big><b>Starting update manager</b></big>" msgstr "" #: ../data/glade/UpdateManager.glade.h:7 -msgid "<big><b>Keep your system up-to-date</b></big>" +msgid "Cancel _Download" msgstr "" #: ../data/glade/UpdateManager.glade.h:8 -msgid "Cancel _Download" +msgid "Changes" msgstr "" #: ../data/glade/UpdateManager.glade.h:9 -msgid "Changes" +msgid "Changes and description of the update" msgstr "" #: ../data/glade/UpdateManager.glade.h:10 -msgid "Changes and description of the update" +msgid "Chec_k" msgstr "" #: ../data/glade/UpdateManager.glade.h:11 -msgid "Chec_k" +msgid "Check the software channels for new updates" msgstr "" #: ../data/glade/UpdateManager.glade.h:12 -msgid "Check the software channels for new updates" +msgid "Description" msgstr "" #: ../data/glade/UpdateManager.glade.h:13 -msgid "Description" +msgid "Release Notes" msgstr "" #: ../data/glade/UpdateManager.glade.h:14 -msgid "Release Notes" +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +msgid "_Distribution Upgrade" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 msgid "changes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1121,10 +1135,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" -"<b><big>The channel information is out-of-date</big></b>\n" +"<b><big>The information about available software is out-of-date</big></b>\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1151,10 +1165,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 msgid "" -"<big><b>Enter the complete APT line of the source that you want to add</b></" -"big>\n" +"<big><b>Enter the complete APT line of the repository that you want to add " +"as source</b></big>\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" @@ -1204,7 +1218,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:3 msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1223,7 +1237,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:7 msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" @@ -1247,192 +1261,172 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:106 -msgid "Important security updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -msgid "Proposed updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 -msgid "No longer oficially supported" +#: ../data/channels/Ubuntu.info.in:209 +msgid "No longer officially supported" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-23 19:18+0000\n" "Last-Translator: Robin Sonefors <ozamosi@blinkenlights.se>\n" "Language-Team: Swedish <sv@li.org>\n" @@ -133,9 +133,9 @@ msgstr "" "Nyckeln du valde kan inte tas bort. Var vänlig anmäl detta som en bugg." #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"<big><b>Error scaning the CD</b></big>\n" +"<big><b>Error scanning the CD</b></big>\n" "\n" "%s" msgstr "" @@ -151,11 +151,11 @@ msgstr "Skriv in ett namn på skivan" msgid "Please insert a disc in the drive:" msgstr "Sätt in en skiva i enheten:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "Trasiga paket" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -164,23 +164,23 @@ msgstr "" "programmet. Reparera dem först med synaptic eller apt-get innan du " "fortsätter." -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Kan inte uppdatera obligatoriska meta-paket" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "Ett grundläggande paket skulle behöva tas bort" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Kunde inte beräkna uppdateringen" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." @@ -189,11 +189,11 @@ msgstr "" "vänlig rapportera detta som en bugg. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "Det gick inte att autentisiera vissa paket" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -203,12 +203,12 @@ msgstr "" "nätverksfel. Det kan hjälpa med att försöka senare. Se nedan för en lista " "med icke autentisierade paket." -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "Kan inte installera \"%s\"" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -217,15 +217,16 @@ msgstr "" "rapportera detta som en bugg. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "Kan inte gissa meta-paket" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -235,12 +236,12 @@ msgstr "" " Installera ett av dessa paket med synaptic eller apt-get innan du " "fortsätter." -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "Misslyckades med att hämta" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -250,15 +251,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "Läser cache" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -266,11 +267,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "Hittade ingen giltig serverspegel" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -290,11 +291,11 @@ msgstr "" "Om du väljer \"nej\" kommer uppdateringen avbrytas." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "Lägg till standardförråd?" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -307,11 +308,11 @@ msgstr "" "Ska standardposter för \"%s\" läggas till? Om du väljer \"Nej\" kommer " "uppdateringen avbrytas." -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "Information om förråd ogiltig" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -319,13 +320,14 @@ msgstr "" "Uppdatering av förrådsinformationen orsakade en ogiltig fil. Var vänlig " "rapportera detta som en bugg." -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "Tredjepartskällor inaktiverade" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#, fuzzy msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" @@ -333,11 +335,11 @@ msgstr "" "aktivera dem efter uppgraderingen med verktyget \"software-properties\" " "eller med synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "Fel vid uppdatering" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -346,11 +348,11 @@ msgstr "" "av nätverksproblem, var god kontrollera din nätverksanslutning och försök " "igen." -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "Inte tillräckligt med ledigt diskutrymme" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -362,15 +364,15 @@ msgstr "" "använda 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "Vill du starta uppdateringen?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "Det gick inte att installera uppgraderingarna" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -382,11 +384,11 @@ msgstr "" "Uppgraderingen avbryts nu. Ditt system kan vara i ett oanvändbart tillstånd. " "En återställning kördes (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "Det gick inte ladda ner uppgraderingarna" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -394,39 +396,40 @@ msgstr "" "Uppdateringen avbryts nu. Var god kontrollera din internetanslutning eller " "ditt installationsmedia och försök igen. " -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" -msgstr "Viss programvara har inte längre officiellt stöd" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 +#, fuzzy msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" "Dessa installerade paket har inte längre officiellt stöd, och är nu enbart " "gemenskapsunderhållna ('universe').Om du inte har 'universe' aktiverat " "kommer dessa paket föreslås för borttagning i nästa steg. " -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "Ta bort föråldrade paket?" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "_Hoppa över det här steget" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "_Ta bort" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "Fel inträffade vid utförandet" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -435,26 +438,31 @@ msgstr "" "information. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "Återställer systemstatus" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "Kontrollerar pakethanterare" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "Uppdaterar förrådsinformation" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "Ogiltig paketinformation" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -467,19 +475,19 @@ msgstr "" "nödvändiga paketet \"%s\" längre.\n" "Det här tyder på ett alvarligt fel, var god och rapportera detto som en bugg." -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "Ber om bekräftelse" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "Uppgraderar" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "Söker efter föråldrad mjukvara" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "Systemuppdateringen är klar." @@ -500,7 +508,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "Hämtar hem fil %li av %li i %s/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, fuzzy, python-format msgid "About %s remaining" msgstr "Omkring %li minuter återstår" @@ -530,23 +538,29 @@ msgstr "" #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, python-format +#, fuzzy, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" "Ersätt konfigurationsfil\n" "\"%s\"?" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "Kommandot \"diff\" hittades inte" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "Ett kritiskt fel uppstod" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -561,28 +575,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "%s paket kommer att tas bort." msgstr[1] "%s paket kommer att tas bort." -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "%s nytt paket kommer att installeras." msgstr[1] "%s nya paket kommer att installeras." -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "%s paket kommer att uppgraderas." msgstr[1] "%s paket kommer att uppgraderas." -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -590,7 +604,7 @@ msgid "" "You have to download a total of %s. " msgstr "Du behöver ladda ner totalt %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -598,30 +612,36 @@ msgid "" msgstr "" "Uppdateringen kan ta flera timmar och kan inte avbrytas någon gång senare." -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "Stäng alla öppna program och dokument för att undvika dataförlust." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "Kunde inte hitta några uppgraderingar" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "Ditt system är uppdaterat" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "Ditt system har redan uppgraderats." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +#, fuzzy +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" +"Det finns <b>%s uppdateringar</b> tillgängliga för ditt system, som kräver " +"att <b>%s</b> data hämtas." -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>Ta bort %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "Installera %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "Uppgradera %s" @@ -655,11 +675,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "Omstart krävs" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -696,10 +716,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Starta uppgraderingen?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>" msgstr "" -"<span weight=\"bold\" size=\"x-large\">Uppdaterar till Ubuntu 6.06 LTS</span>" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -826,9 +844,10 @@ msgid "Verfication failed" msgstr "Kontrollen misslyckades" #: ../UpdateManager/DistUpgradeFetcher.py:222 +#, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" "Kontrollen av uppdateringen misslyckades. Det kan vara ett problem med " "nätverket eller servern. " @@ -855,16 +874,16 @@ msgstr "Hämtar hem fil %li av %li i %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Hämtar hem fil %li av %li med okänd hastighet" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "Listan med ändringar är inte tillgänglig än. Försök igen senare" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "Listan med ändringar är inte tillgänglig än. Försök igen senare" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -872,137 +891,130 @@ msgstr "" "Misslyckades med att hämta listan med ändringar. Kontrollera din " "internetanslutning." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Ubuntu 5.10 Säkerhetsuppdateringar" -#: ../UpdateManager/UpdateManager.py:230 +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 #, fuzzy -msgid "Recommended updates of Ubuntu" +msgid "Recommended updates" msgstr "%d uppdateringar" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "%d uppdateringar" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" -msgstr "" +#: ../UpdateManager/UpdateManager.py:239 +#, fuzzy +msgid "Backports" +msgstr "%d uppdateringar" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "Uppdatera till senaste versionen av Ubuntu" +msgid "Normal updates" +msgstr "%d uppdateringar" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "Uppdateringar" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "Det går inte att installera alla tillgängliga uppdateringar" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Version %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "Hämtar lista med ändringar..." -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" -msgstr "Markera _inga" +#: ../UpdateManager/UpdateManager.py:545 +#, fuzzy +msgid "_Uncheck All" +msgstr "_Uppdatera alla" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "Markera _alla" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "_Kontrollera" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 #, fuzzy msgid "None" msgstr "en" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 #, fuzzy msgid "1 KB" msgstr "%d kB" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, fuzzy, python-format msgid "%.0f KB" msgstr "%.2f MB" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, fuzzy, python-format msgid "%.1f MB" msgstr "%.2f MB" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "Nerladdningsstorlek: %s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "Ditt system är uppdaterat" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Du kan installera %s uppdatering" msgstr[1] "Du kan installera %s uppdateringar" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "Var god vänta, det här kan ta lite tid" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "Uppdateringen är färdig" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "Kontrollera efter tillgängliga uppdateringar" + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "Ny version: %s (Storlek: %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Version %s:" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, fuzzy, python-format msgid "(Size: %s)" msgstr "Storlek:" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "Din distribution stöds inte längre" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -1012,17 +1024,17 @@ msgstr "" "till en senare version av Ubuntu Linux. Se http://www.ubuntu.com för mer " "information om att uppgradera." -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "Indexet för program är trasigt" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1046,58 +1058,67 @@ msgstr "" "\"Programvaruinställningar\"" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"<big><b>Examining your system</b></big>\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "<big><b>Keep your system up-to-date</b></big>" +msgstr "<big><b>Håll ditt system uppdaterat</b></big>" + +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "<big><b>Not all updates can be installed</b></big>" msgstr "" -"<big><b>Undersöker ditt system</b></big>\n" +"<big><b>Fel vid genomsökning av CD</b></big>\n" "\n" -"Mjukvaruuppdateringar fixar fel, eliminerar säkerhetsproblem och ger dig nya " -"funktioner." +"%s" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "<big><b>Keep your system up-to-date</b></big>" -msgstr "<big><b>Håll ditt system uppdaterat</b></big>" +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "<big><b>Starting update manager</b></big>" +msgstr "<b><big>Starta uppgraderingen?</big></b>" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "Avbryt _nedladdningen" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Ändringar" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "_Kontrollera" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "Kontrollera programvarukanalerna efter nya uppdateringar" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Beskrivning" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "Versionsinformation" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "Visa förlopp för enstaka filer" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Programvaruuppdateringar" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1105,32 +1126,37 @@ msgstr "" "Mjukvaruuppdateringar fixar fel, eliminerar säkerhetsproblem och ger dig nya " "funktioner." -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "_Uppdateringar" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "Uppdatera till senaste versionen av Ubuntu" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "_Kontrollera" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "Distribution:" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "_Dölj denna information i framtiden" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "_Installera uppdateringar" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Ändringar" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 #, fuzzy msgid "updates" msgstr "Uppdateringar" @@ -1243,11 +1269,12 @@ msgid "_Install security updates without confirmation" msgstr "_Installera säkerhetsuppdateringar utan bekräftelse" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 +#, fuzzy msgid "" -"<b><big>The channel information is out-of-date</big></b>\n" +"<b><big>The information about available software is out-of-date</big></b>\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1281,10 +1308,10 @@ msgstr "<b>URI:</b>" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the source that you want to add</b></" -"big>\n" +"<big><b>Enter the complete APT line of the repository that you want to add " +"as source</b></big>\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>Skriv in hela APT-raden till kanalen du vill lägga till</b></big>\n" @@ -1343,8 +1370,9 @@ msgid "Check for new distribution releases" msgstr "Sök efter ny utgåva av distributionen" #: ../data/update-manager.schemas.in.h:3 +#, fuzzy msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1365,8 +1393,9 @@ msgid "Stores the size of the update-manager dialog" msgstr "Sparar storleken på uppdateringshanterarens fönster" #: ../data/update-manager.schemas.in.h:7 +#, fuzzy msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" "Sparar läget på expanderaren som innehåller listan på ändringar och " @@ -1394,214 +1423,191 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 Uppdateringar" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "Gemenskapsunderhållen (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Bidragen programvara" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 \"Dapper Drake\"" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "Gemenskapsunderhållen (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "Gemenskapsunderhållen (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Ickefri (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Ickefri (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "By copyright or legal issues restricted software" msgstr "Programvara med USA-exportbegränsningar" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 \"Dapper Drake\"" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Ubuntu 5.10 Säkerhetsuppdateringar" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -#, fuzzy -msgid "Recommended updates" -msgstr "%d uppdateringar" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "%d uppdateringar" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 #, fuzzy msgid "Backported updates" msgstr "%d uppdateringar" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 \"Breezy Badger\"" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "Stöds officiellt" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 \"Breezy Badger\"" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 Säkerhetsuppdateringar" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 Uppdateringar" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Bakåtportar" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.10 \"Breezy Badger\"" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "Stöds officiellt" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 Säkerhetsuppdateringar" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 Uppdateringar" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 Bakåtportar" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 \"Breezy Badger\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Gemenskapsunderhållen (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Ickefri (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "Viss programvara har inte längre officiellt stöd" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Begränsad upphovsrätt" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 5.10 Säkerhetsuppdateringar" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 5.10 Uppdateringar" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 Bakåtportar" @@ -1652,6 +1658,57 @@ msgstr "DFSG-kompatibel programvara med icke-fria beroenden" msgid "Non-DFSG-compatible Software" msgstr "Inte DFSG-kompatibel programvara" +#~ msgid "Some software no longer officially supported" +#~ msgstr "Viss programvara har inte längre officiellt stöd" + +#~ msgid "Could not find any upgrades" +#~ msgstr "Kunde inte hitta några uppgraderingar" + +#~ msgid "Your system has already been upgraded." +#~ msgstr "Ditt system har redan uppgraderats." + +#, fuzzy +#~ msgid "" +#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +#~ msgstr "" +#~ "<span weight=\"bold\" size=\"x-large\">Uppdaterar till Ubuntu 6.06 LTS</" +#~ "span>" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Ubuntu 5.10 Säkerhetsuppdateringar" + +#, fuzzy +#~ msgid "Recommended updates of Ubuntu" +#~ msgstr "%d uppdateringar" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "Uppdatera till senaste versionen av Ubuntu" + +#~ msgid "Cannot install all available updates" +#~ msgstr "Det går inte att installera alla tillgängliga uppdateringar" + +#~ msgid "Select _None" +#~ msgstr "Markera _inga" + +#~ msgid "Select _All" +#~ msgstr "Markera _alla" + +#~ msgid "" +#~ "<big><b>Examining your system</b></big>\n" +#~ "\n" +#~ "Software updates correct errors, eliminate security vulnerabilities and " +#~ "provide new features." +#~ msgstr "" +#~ "<big><b>Undersöker ditt system</b></big>\n" +#~ "\n" +#~ "Mjukvaruuppdateringar fixar fel, eliminerar säkerhetsproblem och ger dig " +#~ "nya funktioner." + +#~ msgid "Oficially supported" +#~ msgstr "Stöds officiellt" + #~ msgid "" #~ "Some updates require the removal of further software. Use the function " #~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " @@ -1841,9 +1898,6 @@ msgstr "Inte DFSG-kompatibel programvara" #~ msgid "Installing updates" #~ msgstr "Installerar uppdateringar" -#~ msgid "Check for available updates" -#~ msgstr "Kontrollera efter tillgängliga uppdateringar" - #~ msgid "<b>Sections:</b>" #~ msgstr "<b>Avdelningar:</b>" @@ -2035,9 +2089,6 @@ msgstr "Inte DFSG-kompatibel programvara" #~ msgid "Components" #~ msgstr "Komponenter" -#~ msgid "Distribution:" -#~ msgstr "Distribution:" - #~ msgid "Type:" #~ msgstr "Typ:" @@ -2876,9 +2927,6 @@ msgstr "Inte DFSG-kompatibel programvara" #~ msgid "_Updates" #~ msgstr "_Uppdateringar" -#~ msgid "_Update All" -#~ msgstr "_Uppdatera alla" - #~ msgid "Privilege" #~ msgstr "Privilegium" @@ -3576,13 +3624,6 @@ msgstr "Inte DFSG-kompatibel programvara" #~ "Det finns <b>en uppdatering</b> tillgänglig för ditt system, som kräver " #~ "att <b>%s</b> data hämtas." -#~ msgid "" -#~ "There are <b>%s updates</b> available for your system, totalling <b>%s</" -#~ "b> of data to be downloaded." -#~ msgstr "" -#~ "Det finns <b>%s uppdateringar</b> tillgängliga för ditt system, som " -#~ "kräver att <b>%s</b> data hämtas." - #~ msgid " Of these updates, <b>one</b> is <b>urgent</b>." #~ msgstr " Utav dessa uppdateringar är <b>en brådskande</b>." @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-24 16:44+0000\n" "Last-Translator: Roys Hengwatanakul <roysheng@msn.com>\n" "Language-Team: Thai <th@li.org>\n" @@ -127,9 +127,9 @@ msgid "The key you selected could not be removed. Please report this as a bug." msgstr "กุญแจที่คุณเลือกไม่สามารถลบออกได้ กรุณารายงานว่าเป็นปัญหา" #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"<big><b>Error scaning the CD</b></big>\n" +"<big><b>Error scanning the CD</b></big>\n" "\n" "%s" msgstr "" @@ -145,11 +145,11 @@ msgstr "กรุณาใส่ชื่อสำหรับแผ่นดิ msgid "Please insert a disc in the drive:" msgstr "กรุณาใส่แผ่นดิสก์เข้าไปในเครื่อง:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "แพกเกจเสียหาย" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -157,34 +157,34 @@ msgstr "" "ระบบของคุณมีแพกเกจที่มีปัญหาที่ไม่สามารถซ่อมได้ด้วยโปรแกรมนี้ กรุณาซ่อมโดยใช้โปรแกรม synaptic " "หรือ apt-get ก่อนดำเนินการต่อไป" -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "ไม่สามารถปรับปรุง meta แพกเกจที่ต้องการได้" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "แพจเกจที่สำคัญจะถูกลบออก" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "ไม่สามารถคำนวนการปรับปรุงได้" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." msgstr "ไม่สามารถแก้ไขปัญหาที่เกิดขึ้นได้ขณะคำนวนการปรับปรุง กรุณารายงานว่านี่เป็นปัญหา " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "ไม่ปัญหาในการยืนยันว่าเป็บของจริงสำหรับบางแพกเกจ" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -193,27 +193,28 @@ msgstr "" "ไม่สามารถที่จะยืนยันความถูกต้องของแพกเกจบางอันได้ นี่อาจจะเกี่ยวกับปัญหาในด้านเครือข่าย " "คุณอาจจะลองอีกครั้งภายหลังก็ได้ กรุณาตรวจดูรายการของแพกเกจที่ไม่ผ่านการยืนยัน" -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "ไม่สามารถติดตั้ง '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "ไม่สามารถที่จะติดตั้งแพกเกจที่ต้องการได้ กรุณารายงานว่าเป็นปัญหา " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "ไม่สามารถเดาเมททาแพกเกจ(meta-package)ได้" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -222,12 +223,12 @@ msgstr "" "กรุณาติดตั้งแพกเกจข้างบนอย่างใดอย่างหนึ่งก่อนโดยใช้โปรแกรม synaptic หรือโปรแกรม apt-get " "ก่อนดำเนินการต่อไป" -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "ไม่สามารถเอามาได้" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -237,15 +238,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "กำลังอ่านจากที่เก็บชั่วคราว" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -253,11 +254,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "ไม่เจอเซิรฟ์เวอร์เสริม(mirror)" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -276,11 +277,11 @@ msgstr "" "ถ้าคุณเลือก 'no' การปรับปรุงจะถูกยกเลิก" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "สร้าง default sources?" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -292,23 +293,24 @@ msgstr "" "\n" "ควรเพิ่มรายการสำหรับ '%s' หรือไม่?ถ้าคุณเลือก 'No' การปรับปรุงจะถูกยกเลิก" -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "ข้อมูลเกี่ยวกับแหล่งเก็บข้อมูลใช้ไม่ได้" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "การปรับปรุงข้อมูลของแหล่งข้อมูลทำให้ไฟล์เสียหาย กรุณารายงานว่าเป็นปัญหา" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "แหล่งอื่นๆใช้ไม่ได้" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#, fuzzy msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" @@ -316,11 +318,11 @@ msgstr "" "คุณสามารถเปลี่ยนให้ใช้ได้หลังการปรับปรุงด้วยเครื่องมือ 'software-properties' " "หรือด้วยโปรแกรม synaptic" -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "เกิดข้อผิดพลาดขณะปรับปรุง" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -328,11 +330,11 @@ msgstr "" "มีปัญหาเกิดขึ้นขณะทำการปรับปรุง โดยปกติแล้วจะเป็นปัญหาด้านเครือข่าย " "กรุณาตรวจสอบการสื่อสารในเครือข่ายของคุณแล้วลองใหม่อีกที" -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "ไม่มีพื้นที่ว่างในดิสก์เพียงพอ" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -343,15 +345,15 @@ msgstr "" "เทถังขยะทิ้งและลบแพกเกจชั่วคราวจากการติดตั้งครั้งก่อนโดยใช้คำสั่ง 'sudo apt-get clean'" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "คุณต้องการที่จะเริ่มการปรับปรุงหรือไม่?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "ไม่สามารถปรับปรุงได้" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -363,11 +365,11 @@ msgstr "" "การปรับปรุงถูกยกเลิก ระบบของคุณอาจจะอยู่ในสภาพที่ไม่มั่นคง โปรแกรมกู้ระบบถูกเรียกใช้ (dpkg --" "configure -a)" -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "ไม่สามารถดาวน์โหลดข้อมูลปรับปรุงรุ่น" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -375,67 +377,73 @@ msgstr "" "การปรับปรุงถูกยกเลิก กรุณาตรวจสอบการสื่อสารทางอินเตอร์เน็ตของคุณหรือ installation " "mediaและลองอีกครั้ง " -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" -msgstr "ซอฟแวร์บางตัวไม่ได้รับการสนับสนุนอย่างเป็นทางการแล้ว" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 +#, fuzzy msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" "แพกเกจเหล่านีไม่ได้รับการสนับสนุนอย่างเป็นทางการแล้วและตอนนี้ได้รับสนับสนุนจากชุมชน " "('universe') แต่เพียงอย่างเดียว\\n\n" "\\n\n" "ถ้าคุณไม่ได้เลือกใช้แหล่งข้อมูล 'universe' แพกเกจเหล่านี้จะถูกแนะนำให้ลบออกในขั้นต่อไป " -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "ลบแพจเกจที่ล้าสมัยทิ้งหรือไม่?" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "_ข้ามขั้นตอนนี้" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "เ_อาออก" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "เกิดข้อผิดพลาดขณะแก้ไขปรับปรุง" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "เกิดปัญหาขึ้นขณะทำการเก็บกวาด กรุณาตรวจสอบข้อความข้างล่างสำหรับรายละเอียดเพิ่มเติม " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 #, fuzzy msgid "Restoring original system state" msgstr "เริ่มระบบใหม่อีกครั้ง" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "กำลังตรวจสอบโปรแกรมจัดการแพกเกจ" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "ปรับปรุงข้อมูลของแหล่งข้อมูล" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "ข้อมูลของแพกเกจไม่ถูกต้อง" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -447,19 +455,19 @@ msgstr "" "หลังจากการปรับปรุงข้อมูลของแพจเกจ แพจเกจที่จำเป็น '%s'ได้หายไป\n" "นี่แสดงว่าเป็นปัญหาร้ายแรง กรุณารายงานว่าเป็นปัญหา" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "_ถามการยืนยันจากคุณก่อน" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "กำลังปรับปรุง" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "ค้นหาซอฟแวร์ที่ล้าสมัย" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "ปรับปรุงระบบเสร็จแล้ว" @@ -480,7 +488,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "กำลังดาวน์โหลดไฟล์ %li จาก %li ที่ %s/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, fuzzy, python-format msgid "About %s remaining" msgstr "เหลือประมาณ %li นาที" @@ -510,23 +518,29 @@ msgstr "" #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, python-format +#, fuzzy, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" "เปลี่ยนไฟล์ปรับแต่ง\n" "'%s'?" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "ไม่เจอคำสั่ง 'diff'" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "เกิดข้อผิดพลาดอย่างร้ายแรง" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -540,25 +554,25 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "%s แพกเกจจะถูกลบออก" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "%s แพกเกจใหม่จะถูกติดตั้ง" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "%s แพกเกจจะถูกปรับปรุง" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -566,37 +580,40 @@ msgid "" "You have to download a total of %s. " msgstr "คุณจะต้องดาวน์โหลดทั้งหมด %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "การปรับปรุงอาจจะใช้เวลานานหลายชั่วโมงและไม่สามารถที่จะยกเลิกได้หลังจากนี้ไป" -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "เพื่อป้องกันข้อมูลสูญหายกรุณาออกจากทุกโปรแกรมและเอกสารที่เปิดอยู่" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "ไม่มีอะไรให้ปรับปรุง" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "ระบบของคุณทันสมัยแล้ว" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "ระบบของคุณได้ผ่านการปรับปรุงแล้ว" +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>ลบออก %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "ติดตั้ง %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "ปรับปรุงรุ่น %s" @@ -630,11 +647,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "ต้องเริ่มระบบใหม่" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "การปรับปรุงเสร็จสิ้นแล้วและต้องการที่จะเริ่มระบบใหม่ คุณต้องการที่จะทำเดี๋ยวนี้หรือเปล่า?" @@ -668,9 +685,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>เริ่มการปรับปรุงหรือไม่?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" -msgstr "<span weight=\"bold\" size=\"x-large\">กำลังปรับปรุงอูบันตู 6.06 LTS</span>" +msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>" +msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -790,9 +806,10 @@ msgid "Verfication failed" msgstr "ไม่สามารถตรวจเช็คความถูกต้องได้" #: ../UpdateManager/DistUpgradeFetcher.py:222 +#, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "ตรวจทานการปรับปรุงไม่สำเร็จ อาจจะมีปัญหาในเครือข่ายหรือที่เซิรฟ์เวอร์ " #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -815,149 +832,140 @@ msgstr "กำลังดาวน์โหลดไฟล์ %li จาก %li msgid "Downloading file %li of %li with unknown speed" msgstr "กำลังดาวน์โหลดไฟล์ %li จาก %li โดยไม่ทราบความเร็ว" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "รายการของการเปลี่ยนแปลงยังไม่มีให้ กรุณาลองอีกทีภายหลัง" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "รายการของการเปลี่ยนแปลงยังไม่มีให้ กรุณาลองอีกทีภายหลัง" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" "ไม่สามารถดาวน์โหลดรายการของการเปลี่ยนแปลง กรุณาตรวจสอบการสื่อสารทางอินเตอร์เน็ตของคุณ" -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "อูบันตู 5.10 Security Updates" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "_ติดตั้งปรัยปรุง" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "ปรับปรุงให้เป็นรุ่นล่าสุดของอูบันตู" +msgid "Normal updates" +msgstr "_ติดตั้งปรัยปรุง" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "_ติดตั้งปรัยปรุง" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "ไม่สามารถปรับปรุงทั้งหมดที่มีได้" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "รุ่น %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "กำลังดาวน์โหลดรายการของการเปลี่ยนแปลง..." -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "เ_ลือก" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "ขนาดดาวน์โหลด: %s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "ระบบของคุณทันสมัยแล้ว" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "คุณสามารถติดตั้ง %s รายการปรับปรุง" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "กรุณารอสักครู่ นี่อาจจะใช้เวลาสักหน่อย" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "ปรับปรุงเสร็จสิ้นแล้ว" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "_ติดตั้งปรัยปรุง" + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "รุ่นใหม่: %s (ขนาด: %s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "รุ่น %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "ชุดเผยแพร่(distribution)ของคุณไม่มีบริการสนับสนุนแล้ว" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -967,17 +975,17 @@ msgstr "" "ปรับปรุงขึ้นไปรุ่นถัดไปของอูบันตูลีนุกซ์ กรุณาอ่าน http://www.ubuntu.com " "สำหรับรายละเอียดเพิ่มเติมในการปรับปรุงรุ่น" -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "ดัชนีของซอฟแวร์เสียหาย" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -999,88 +1007,103 @@ msgstr "" "\"Administration\" -> \"Software Properties\"." #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"<big><b>Examining your system</b></big>\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "<big><b>Keep your system up-to-date</b></big>" +msgstr "<big><b>รักษาระบบของคุณให้ทันสมัย</b></big>" + +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "<big><b>Not all updates can be installed</b></big>" msgstr "" -"<big><b>ตรวจสอบระบบของคุณ</b></big>\n" +"<big><b>มีปัญหาตรวจสอบแผ่นซีดี</b></big>\n" "\n" -"ซอฟแวร์ปรับปรุงแก้ปัญหา,กำจัดจุดอ่อนด้านความปลอดภัยและเพิ่มความสามารถใหม่" +"%s" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "<big><b>Keep your system up-to-date</b></big>" -msgstr "<big><b>รักษาระบบของคุณให้ทันสมัย</b></big>" +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "<big><b>Starting update manager</b></big>" +msgstr "<b><big>เริ่มการปรับปรุงหรือไม่?</big></b>" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "ยกเลิก_ดาวน์โหลด" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "เปลี่ยนแปลง" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "ต_รวจ" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "ตรวจช่องซอฟแวร์สำหรับรายการปรับปรุงใหม่" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "คำบรรยาย" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "บันทึกรายการปรับปรุง" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "แสดงการคืบหน้าของแต่ละไฟล์" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "ซอฟต์แวร์ปรับปรุง" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "ซอฟแวร์ปรับปรุงแก้ปัญหา,กำจัดจุดอ่อนด้านความปลอดภัยและเพิ่มความสามารถใหม่" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "_ปรับปรุง" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "ปรับปรุงให้เป็นรุ่นล่าสุดของอูบันตู" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "เ_ลือก" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "_ปรับปรุงรุ่นต่อจากคราวที่แล้ว" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "_ซ่อนข้อมูลนี้ในคราวหน้า" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "_ติดตั้งปรัยปรุง" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "เปลี่ยนแปลง" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1188,11 +1211,12 @@ msgid "_Install security updates without confirmation" msgstr "_ติดตั้งการปรับปรุงด้านความปลอดภัยโดยไม่ต้องถามก่อน" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 +#, fuzzy msgid "" -"<b><big>The channel information is out-of-date</big></b>\n" +"<b><big>The information about available software is out-of-date</big></b>\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1225,10 +1249,10 @@ msgstr "<b>URI:</b>" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the source that you want to add</b></" -"big>\n" +"<big><b>Enter the complete APT line of the repository that you want to add " +"as source</b></big>\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>กรุณาเติมให้ครบบรรทัด APT ของช่องที่คุณต้องการจะเพิ่ม</b></big>\n" @@ -1284,8 +1308,9 @@ msgid "Check for new distribution releases" msgstr "ตรวจหาชุดเผยแพร่ใหม่" #: ../data/update-manager.schemas.in.h:3 +#, fuzzy msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1305,8 +1330,9 @@ msgid "Stores the size of the update-manager dialog" msgstr "บึนทึกขนาดของหน้าต่างของโปรแกรมจัดการปรับปรุง" #: ../data/update-manager.schemas.in.h:7 +#, fuzzy msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "บันทึกสถานะของตัวขยาย(expander)ที่มีรายการของการเปลี่ยนแปลงและคำบรรยาย" @@ -1332,212 +1358,189 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "อูบันตู 5.10 Updates" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "ชุมชนดูแล (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "ไม่ฟรี(ลิขสิทธิ์)" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "อูบันตู 6.06 'Dapper Drake'" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "ชุมชนดูแล (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "ชุมชนดูแล (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "ไม่ฟรี(ลิขสิทธิ์)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "ไม่ฟรี(ลิขสิทธิ์)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "อูบันตู 6.06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "อูบันตู 5.10 Security Updates" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "_ติดตั้งปรัยปรุง" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "อูบันตู 5.10 'Breezy Badger'" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "สนับสนุนอย่างเป็นทางการ" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "อูบันตู 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "อูบันตู 5.10 Security Updates" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "อูบันตู 5.10 Updates" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "อูบันตู 5.10 Backports" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "อูบันตู 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -#, fuzzy -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "สนับสนุนอย่างเป็นทางการ" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "อูบันตู 5.10 Security Updates" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "อูบันตู 5.10 Updates" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "อูบันตู 5.10 Backports" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "อูบันตู 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "ชุมชนดูแล (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "ไม่ฟรี(ลิขสิทธิ์)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "ซอฟแวร์บางตัวไม่ได้รับการสนับสนุนอย่างเป็นทางการแล้ว" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "จำกัดลิขสิทธิ์" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "อูบันตู 5.10 Security Updates" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "อูบันตู 5.10 Updates" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "อูบันตู 5.10 Backports" @@ -1588,6 +1591,46 @@ msgstr "เข้ากับ DFSG ซอฟแวร์แต่ขึ้นอ msgid "Non-DFSG-compatible Software" msgstr "ไม่เข้ากับ DFSG ซอฟแวร์" +#~ msgid "Some software no longer officially supported" +#~ msgstr "ซอฟแวร์บางตัวไม่ได้รับการสนับสนุนอย่างเป็นทางการแล้ว" + +#~ msgid "Could not find any upgrades" +#~ msgstr "ไม่มีอะไรให้ปรับปรุง" + +#~ msgid "Your system has already been upgraded." +#~ msgstr "ระบบของคุณได้ผ่านการปรับปรุงแล้ว" + +#, fuzzy +#~ msgid "" +#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +#~ msgstr "" +#~ "<span weight=\"bold\" size=\"x-large\">กำลังปรับปรุงอูบันตู 6.06 LTS</span>" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "อูบันตู 5.10 Security Updates" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "ปรับปรุงให้เป็นรุ่นล่าสุดของอูบันตู" + +#~ msgid "Cannot install all available updates" +#~ msgstr "ไม่สามารถปรับปรุงทั้งหมดที่มีได้" + +#~ msgid "" +#~ "<big><b>Examining your system</b></big>\n" +#~ "\n" +#~ "Software updates correct errors, eliminate security vulnerabilities and " +#~ "provide new features." +#~ msgstr "" +#~ "<big><b>ตรวจสอบระบบของคุณ</b></big>\n" +#~ "\n" +#~ "ซอฟแวร์ปรับปรุงแก้ปัญหา,กำจัดจุดอ่อนด้านความปลอดภัยและเพิ่มความสามารถใหม่" + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "สนับสนุนอย่างเป็นทางการ" + #~ msgid "" #~ "Some updates require the removal of further software. Use the function " #~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-23 19:45+0000\n" "Last-Translator: Özgur KIRCALI <okircali@gmail.com>\n" "Language-Team: Turkish <tr@li.org>\n" @@ -128,9 +128,9 @@ msgid "The key you selected could not be removed. Please report this as a bug." msgstr "Seçtiğiniz anahtar kaldırılamadı. Lütfen bunu bir hata olarak iletin." #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"<big><b>Error scaning the CD</b></big>\n" +"<big><b>Error scanning the CD</b></big>\n" "\n" "%s" msgstr "" @@ -146,11 +146,11 @@ msgstr "Lütfen disk için bir isim girin" msgid "Please insert a disc in the drive:" msgstr "Lütfen sürücüye bir disk yerleştirin:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "Bozuk paketler" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -158,60 +158,61 @@ msgstr "" "Sisteminiz bu yazılım ile düzeltilemeyen bozuk paketler içeriyor. Devam " "etmeden önce lütfen bunları synaptic veya apt-get kullanarak düzeltin." -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Gerekli bilgi-paketleri güncelleştirilemiyor" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "'%s' yüklenemiyor" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "Gerekli bir paket yüklenemedi. Lütfen bunu bir hata olarak bildirin. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -220,11 +221,11 @@ msgstr "" " Lütfen devam etmeden önce, synaptic veya apt-get kullanarak yukarıdaki " "paketlerden birini kurun." -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -234,15 +235,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "Önbellek okunuyor" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -250,11 +251,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "Geçerli yansı bulunamadı" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -267,11 +268,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -284,32 +285,32 @@ msgstr "" "'%s' için varsayılan girişler eklensin mi? Eğer 'Hayır'ı seçerseniz, " "güncelleştirme iptal edilecektir." -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "Üçüncü parti kaynaklar devredışı bırakıldı" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "Güncelleştirme sırasında hata" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -317,11 +318,11 @@ msgstr "" "Güncelleştirme sırasında bir hata oluştu. Bu genellikle bir ağ sorunudur, " "lütfen ağ bağlantınızı kontrol edin ve yeniden deneyin." -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "Yeterince boş disk alanı yok" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -330,15 +331,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "Yükseltmeyi başlatmak istiyor musunuz?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "Yükseltmeler kurulamadı" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -347,11 +348,11 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "Yükseltmeler indirilemedi" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -359,62 +360,67 @@ msgstr "" "Yükseltme şimdi iptal edilecek. Lütfen internet bağlantınızı veya kurulum " "ortamınızı kontrol edin ve yeniden deneyin. " -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "Bu Adımı _Atla" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "_Kaldır" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "Geçersiz paket bilgisi" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -424,19 +430,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "Yükseltiliyor" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "Sistem yükseltmesi tamamlandı." @@ -457,7 +463,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, python-format msgid "About %s remaining" msgstr "" @@ -489,19 +495,25 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "'diff' komutu bulunamadı" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " @@ -511,25 +523,25 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 #, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 #, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, python-format msgid "" "\n" @@ -537,36 +549,39 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "Sisteminiz zaten yükseltilmiş." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "%s'i kur" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "%s'i yükselt" @@ -600,11 +615,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "Yeniden başlatma gerekiyor" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -637,11 +652,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Yükseltme başlatılsın mı?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>" msgstr "" -"<span weight=\"bold\" size=\"x-large\">Ubuntu 6.06 LTS'ya yükseltiliyor</" -"span>" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -762,8 +774,8 @@ msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:222 msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -786,162 +798,150 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 msgid "The list of changes is not available" msgstr "" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +msgid "Proposed updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 -msgid "Updates of Ubuntu" +#: ../UpdateManager/UpdateManager.py:240 +msgid "Normal updates" msgstr "" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 msgid "Other updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" +#: ../UpdateManager/UpdateManager.py:551 +msgid "_Check All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +msgid "Checking for updates" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -957,84 +957,101 @@ msgid "" msgstr "" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"<big><b>Examining your system</b></big>\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "<big><b>Keep your system up-to-date</b></big>" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "<big><b>Not all updates can be installed</b></big>" msgstr "" +"<big><b>CD taramada hata</b></big>\n" +"\n" +"%s" + +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "<big><b>Starting update manager</b></big>" +msgstr "<b><big>Yükseltme başlatılsın mı?</big></b>" #: ../data/glade/UpdateManager.glade.h:7 -msgid "<big><b>Keep your system up-to-date</b></big>" +msgid "Cancel _Download" msgstr "" #: ../data/glade/UpdateManager.glade.h:8 -msgid "Cancel _Download" +msgid "Changes" msgstr "" #: ../data/glade/UpdateManager.glade.h:9 -msgid "Changes" +msgid "Changes and description of the update" msgstr "" #: ../data/glade/UpdateManager.glade.h:10 -msgid "Changes and description of the update" +msgid "Chec_k" msgstr "" #: ../data/glade/UpdateManager.glade.h:11 -msgid "Chec_k" +msgid "Check the software channels for new updates" msgstr "" #: ../data/glade/UpdateManager.glade.h:12 -msgid "Check the software channels for new updates" +msgid "Description" msgstr "" #: ../data/glade/UpdateManager.glade.h:13 -msgid "Description" +msgid "Release Notes" msgstr "" #: ../data/glade/UpdateManager.glade.h:14 -msgid "Release Notes" +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +msgid "_Distribution Upgrade" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 msgid "changes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1141,10 +1158,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" -"<b><big>The channel information is out-of-date</big></b>\n" +"<b><big>The information about available software is out-of-date</big></b>\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1171,10 +1188,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 msgid "" -"<big><b>Enter the complete APT line of the source that you want to add</b></" -"big>\n" +"<big><b>Enter the complete APT line of the repository that you want to add " +"as source</b></big>\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" @@ -1226,7 +1243,7 @@ msgstr "Yeni dağıtım yayımları için kontrol et" #: ../data/update-manager.schemas.in.h:3 msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1245,7 +1262,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:7 msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" @@ -1270,205 +1287,183 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Sınırlı telif hakkı" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 LTS Güvenlik Güncelleştirmeleri" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -msgid "Proposed updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 #, fuzzy msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "Resmi olarak desteklenenler" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 6.06 LTS Güvenlik Güncelleştirmeleri" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -#, fuzzy -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "Resmi olarak desteklenenler" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 6.06 LTS Güvenlik Güncelleştirmeleri" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "Resmi olarak desteklenenler" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Sınırlı telif hakkı" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 6.06 LTS Güvenlik Güncelleştirmeleri" @@ -1519,6 +1514,24 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#~ msgid "Your system has already been upgraded." +#~ msgstr "Sisteminiz zaten yükseltilmiş." + +#, fuzzy +#~ msgid "" +#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +#~ msgstr "" +#~ "<span weight=\"bold\" size=\"x-large\">Ubuntu 6.06 LTS'ya yükseltiliyor</" +#~ "span>" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri" + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "Resmi olarak desteklenenler" + #~ msgid "The upgrade aborts now. Please report this bug." #~ msgstr "Yükseltme şimdi iptal edilecek. Lütfen bu hatayı bildirin." @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-23 19:45+0000\n" "Last-Translator: Serhey Kusyumoff <gpalco@gmail.com>\n" "Language-Team: Ukrainian <uk@li.org>\n" @@ -132,7 +132,7 @@ msgstr "Вибраний ключ неможливо видалити. Спов #: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" -"<big><b>Error scaning the CD</b></big>\n" +"<big><b>Error scanning the CD</b></big>\n" "\n" "%s" msgstr "" @@ -145,11 +145,11 @@ msgstr "Введіть назву диску" msgid "Please insert a disc in the drive:" msgstr "Вставте диск в пристрій:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "Пошкоджені пакунки" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -157,46 +157,46 @@ msgstr "" "Ваша система містить пошкоджені пакунки, котрі не можуть бути виправлені " "цією програмою. Скористайтесь перш програмами synaptic чи apt-get." -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Не можливо поновити необхідні meta-пакунки" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "Це призведе довидалення базового пакунку системи" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Не можливо розрахувати поновлення" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." msgstr "Вибраний ключ неможливо видалити. Сповістіть про це як про помилку. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "Помилка підписів в деяких пакунках" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "Не можливо встановити '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -204,24 +204,27 @@ msgid "" msgstr "Вибраний ключ неможливо видалити. Сповістіть про це як про помилку. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "Не можливо підібрати meta-пакунок" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" +"Ваша система містить пошкоджені пакунки, котрі не можуть бути виправлені " +"цією програмою. Скористайтесь перш програмами synaptic чи apt-get." -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -231,15 +234,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "Зчитування кешу" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -247,12 +250,12 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 #, fuzzy msgid "No valid mirror found" msgstr "Не знайдено" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -265,11 +268,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -278,43 +281,43 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "Помилка в даних про репозиторій" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 #, fuzzy msgid "Error during update" msgstr "Помилка підчас поновлення" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "Недостатньо місця на диску" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -323,15 +326,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "Бажаєте почати апгрейд системи?" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "Неможливо провести апргрейд системи" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -344,11 +347,11 @@ msgstr "" "Виконайте команду 'sudo apt-get install -f', або скористайдесь програмою " "Synaptic для налаштування системи." -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "Неможливо завантажити пакунки для апргрейду системи" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -356,37 +359,37 @@ msgstr "" "Апргрейд системи щойно перервано. Будь ласка, перевірте зєднання з " "інтернетом чи носії та спробуйте знов. " -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 #, fuzzy msgid "Remove obsolete packages?" msgstr "Видалити непотрібні пакунки?" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -395,27 +398,32 @@ msgstr "" "нижче. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 #, fuzzy msgid "Restoring original system state" msgstr "Перезавантаження системи" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "Перевірка програми управління пакунками" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "Отримання інформації про репозиторій" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -425,20 +433,20 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "Запит підтвердження" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 #, fuzzy msgid "Upgrading" msgstr "Оновлення завершено" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "Пошук програм, що не використовуються" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "Апргрейд системи завершено." @@ -459,7 +467,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "Завантажується файл %li of %li at %s/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, python-format msgid "About %s remaining" msgstr "" @@ -492,19 +500,25 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "Виникла невиправна помилка" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -517,31 +531,31 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "%s пакунків буде видалено." msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "%s пакунків буде встановлено." msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "буде проведено апргрейд %s пакунків." msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -549,7 +563,7 @@ msgid "" "You have to download a total of %s. " msgstr "Потрібно завантажити всього %s пакунків." -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " @@ -558,30 +572,34 @@ msgstr "" "Апрейд може продовжуватись декілька годин, і не може бути перервано протягом " "всього часу." -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "Не знайдено пакунків для апгрейду" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +#, fuzzy +msgid "Your system is up-to-date" +msgstr "Ваша система оновлена!" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "Апгрейд вашої системи вже проведено." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, fuzzy, python-format msgid "<b>Remove %s</b>" msgstr "<b>Видалити %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, fuzzy, python-format msgid "Install %s" msgstr "Встановити %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, fuzzy, python-format msgid "Upgrade %s" msgstr "Апргрейд %s" @@ -615,11 +633,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "Необхідно перезавантажити систему" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -654,7 +672,7 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Почати апгрейд системи?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -783,8 +801,8 @@ msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:222 msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -808,16 +826,16 @@ msgstr "Завантажується файл %li of %li at %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Завантажується файл %li of %li на невизначенії швидкості" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "Доступний новий випуск Ubuntu!" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " @@ -825,102 +843,85 @@ msgid "" msgstr "" "не вдається завантажити зміни. Перевірте чи активне з'єднання з Інтернет." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Оновлення безпеки Ubuntu 5.10" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "Встановлення оновлень..." -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "Апгрейд системи Ubuntu" +msgid "Normal updates" +msgstr "Встановлення оновлень..." #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "Встановлення оновлень..." -#: ../UpdateManager/UpdateManager.py:276 -#, fuzzy -msgid "Cannot install all available updates" -msgstr "Пошук пакунків для апгрейду" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Версія %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 #, fuzzy msgid "Downloading the list of changes..." msgstr "Завантаження змін" -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" +#: ../UpdateManager/UpdateManager.py:551 +msgid "_Check All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:632 -#, fuzzy -msgid "Your system is up-to-date" -msgstr "Ваша система оновлена!" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, fuzzy, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -928,54 +929,59 @@ msgstr[0] "Неможливо провести апргрейд системи" msgstr[1] "Неможливо провести апргрейд системи" msgstr[2] "Неможливо провести апргрейд системи" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 #, fuzzy msgid "Update is complete" msgstr "Завантадення пакунків завершено" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "Встановлення оновлень..." + +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Версія %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "Ваш дистрибутив вже не підтримується" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -991,86 +997,100 @@ msgid "" msgstr "" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"<big><b>Examining your system</b></big>\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "<big><b>Keep your system up-to-date</b></big>" +#: ../data/glade/UpdateManager.glade.h:5 +msgid "<big><b>Not all updates can be installed</b></big>" msgstr "" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "<big><b>Starting update manager</b></big>" +msgstr "<b><big>Почати апгрейд системи?</big></b>" + +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "Скасувати _Завантаження" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Зміни" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Опис" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Оновлення програм" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "П_родовжити апгрейд системи" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "_Install Updates" msgstr "Встановлення оновлень..." -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Зміни" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1186,10 +1206,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" -"<b><big>The channel information is out-of-date</big></b>\n" +"<b><big>The information about available software is out-of-date</big></b>\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1218,10 +1238,10 @@ msgstr "<b>URI:</b>" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the source that you want to add</b></" -"big>\n" +"<big><b>Enter the complete APT line of the repository that you want to add " +"as source</b></big>\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>Введіть повний рядок APT репозиторію, який ви бажаєте додати</b></" @@ -1282,7 +1302,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:3 msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1301,7 +1321,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:7 msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" @@ -1326,217 +1346,194 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Оновлення Ubuntu 5.10" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "Підтримується спільнотою (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Супутнє програмне забезпечення" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 #, fuzzy msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "CD диск з Ubuntu 4.10 \"Warty Warthog\"" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Оновлення Ubuntu 5.04" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "Підтримується спільнотою (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "Підтримується спільнотою (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Не-вільний (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Не-вільний (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "By copyright or legal issues restricted software" msgstr "ПЗ під експортними обмеженнями США" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Оновлення Ubuntu 5.04" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Оновлення безпеки Ubuntu 5.10" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "Встановлення оновлень..." - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 #, fuzzy msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "CD диск з Ubuntu 5.10 \"Breezy Badger\"" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -#, fuzzy -msgid "Officially supported" -msgstr "Офіціально підтримуються" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "CD диск з Ubuntu 5.10 \"Breezy Badger\"" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Оновлення безпеки Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Оновлення Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Оновлення Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD диск з Ubuntu 5.04 \"Hoary Hedgehog\"" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "CD диск з Ubuntu 5.04 \"Hoary Hedgehog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 #, fuzzy -msgid "Oficially supported" +msgid "Officially supported" msgstr "Офіціально підтримуються" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Оновлення безпеки Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Оновлення Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Оновлення Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "CD диск з Ubuntu 4.10 \"Warty Warthog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Підтримується спільнотою (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Не-вільний (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 #, fuzzy msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "CD диск з Ubuntu 4.10 \"Warty Warthog\"" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "Офіціально підтримуються" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Обмежені авторські права" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Оновлення безпеки Ubuntu 4.10" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "Оновлення Ubuntu 4.10" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Оновлення Ubuntu 5.10" @@ -1590,6 +1587,28 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#~ msgid "Could not find any upgrades" +#~ msgstr "Не знайдено пакунків для апгрейду" + +#~ msgid "Your system has already been upgraded." +#~ msgstr "Апгрейд вашої системи вже проведено." + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Оновлення безпеки Ubuntu 5.10" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "Апгрейд системи Ubuntu" + +#, fuzzy +#~ msgid "Cannot install all available updates" +#~ msgstr "Пошук пакунків для апгрейду" + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "Офіціально підтримуються" + #~ msgid "Download is complete" #~ msgstr "Завантадення пакунків завершено" diff --git a/po/update-manager.pot b/po/update-manager.pot index 225e73e8..56bd51a9 100644 --- a/po/update-manager.pot +++ b/po/update-manager.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -129,7 +129,7 @@ msgstr "" #: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" -"<big><b>Error scaning the CD</b></big>\n" +"<big><b>Error scanning the CD</b></big>\n" "\n" "%s" msgstr "" @@ -142,79 +142,79 @@ msgstr "" msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -224,15 +224,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -240,11 +240,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -257,11 +257,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -270,42 +270,42 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -314,15 +314,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -331,72 +331,77 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -406,19 +411,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "" @@ -438,7 +443,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, python-format msgid "About %s remaining" msgstr "" @@ -470,19 +475,25 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " @@ -492,28 +503,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 #, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 #, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, python-format msgid "" "\n" @@ -521,36 +532,39 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "" @@ -584,11 +598,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -619,7 +633,7 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -740,8 +754,8 @@ msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:222 msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -764,162 +778,150 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 msgid "The list of changes is not available" msgstr "" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" -#: ../UpdateManager/UpdateManager.py:228 -msgid "Important security updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 +msgid "Important security updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +msgid "Proposed updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 -msgid "Updates of Ubuntu" +#: ../UpdateManager/UpdateManager.py:240 +msgid "Normal updates" msgstr "" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 msgid "Other updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" +#: ../UpdateManager/UpdateManager.py:551 +msgid "_Check All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +msgid "Checking for updates" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -935,84 +937,96 @@ msgid "" msgstr "" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"<big><b>Examining your system</b></big>\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "<big><b>Keep your system up-to-date</b></big>" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:5 +msgid "<big><b>Not all updates can be installed</b></big>" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:6 +msgid "<big><b>Starting update manager</b></big>" msgstr "" #: ../data/glade/UpdateManager.glade.h:7 -msgid "<big><b>Keep your system up-to-date</b></big>" +msgid "Cancel _Download" msgstr "" #: ../data/glade/UpdateManager.glade.h:8 -msgid "Cancel _Download" +msgid "Changes" msgstr "" #: ../data/glade/UpdateManager.glade.h:9 -msgid "Changes" +msgid "Changes and description of the update" msgstr "" #: ../data/glade/UpdateManager.glade.h:10 -msgid "Changes and description of the update" +msgid "Chec_k" msgstr "" #: ../data/glade/UpdateManager.glade.h:11 -msgid "Chec_k" +msgid "Check the software channels for new updates" msgstr "" #: ../data/glade/UpdateManager.glade.h:12 -msgid "Check the software channels for new updates" +msgid "Description" msgstr "" #: ../data/glade/UpdateManager.glade.h:13 -msgid "Description" +msgid "Release Notes" msgstr "" #: ../data/glade/UpdateManager.glade.h:14 -msgid "Release Notes" +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +msgid "_Distribution Upgrade" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 msgid "changes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1116,10 +1130,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" -"<b><big>The channel information is out-of-date</big></b>\n" +"<b><big>The information about available software is out-of-date</big></b>\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1146,10 +1160,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 msgid "" -"<big><b>Enter the complete APT line of the source that you want to add</b></" -"big>\n" +"<big><b>Enter the complete APT line of the repository that you want to add " +"as source</b></big>\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" @@ -1199,7 +1213,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:3 msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1218,7 +1232,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:7 msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" @@ -1242,192 +1256,172 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:106 -msgid "Important security updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -msgid "Proposed updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 -msgid "No longer oficially supported" +#: ../data/channels/Ubuntu.info.in:209 +msgid "No longer officially supported" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-19 02:46+0000\n" "Last-Translator: Hameed محمد حمید <hameeduddin517@yahoo.com>\n" "Language-Team: Urdu <urd@li.org>\n" @@ -130,7 +130,7 @@ msgstr "" #: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" -"<big><b>Error scaning the CD</b></big>\n" +"<big><b>Error scanning the CD</b></big>\n" "\n" "%s" msgstr "" @@ -143,79 +143,79 @@ msgstr "" msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -225,15 +225,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -241,11 +241,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -258,11 +258,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -271,42 +271,42 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -315,15 +315,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -332,72 +332,77 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -407,19 +412,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "" @@ -439,7 +444,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, python-format msgid "About %s remaining" msgstr "" @@ -471,19 +476,25 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " @@ -493,28 +504,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 #, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 #, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, python-format msgid "" "\n" @@ -522,36 +533,39 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "" @@ -585,11 +599,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -620,7 +634,7 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -741,8 +755,8 @@ msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:222 msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -765,162 +779,150 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 msgid "The list of changes is not available" msgstr "" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" -#: ../UpdateManager/UpdateManager.py:228 -msgid "Important security updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 +msgid "Important security updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +msgid "Proposed updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 -msgid "Updates of Ubuntu" +#: ../UpdateManager/UpdateManager.py:240 +msgid "Normal updates" msgstr "" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 msgid "Other updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" +#: ../UpdateManager/UpdateManager.py:551 +msgid "_Check All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +msgid "Checking for updates" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -936,84 +938,96 @@ msgid "" msgstr "" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"<big><b>Examining your system</b></big>\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "<big><b>Keep your system up-to-date</b></big>" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:5 +msgid "<big><b>Not all updates can be installed</b></big>" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:6 +msgid "<big><b>Starting update manager</b></big>" msgstr "" #: ../data/glade/UpdateManager.glade.h:7 -msgid "<big><b>Keep your system up-to-date</b></big>" +msgid "Cancel _Download" msgstr "" #: ../data/glade/UpdateManager.glade.h:8 -msgid "Cancel _Download" +msgid "Changes" msgstr "" #: ../data/glade/UpdateManager.glade.h:9 -msgid "Changes" +msgid "Changes and description of the update" msgstr "" #: ../data/glade/UpdateManager.glade.h:10 -msgid "Changes and description of the update" +msgid "Chec_k" msgstr "" #: ../data/glade/UpdateManager.glade.h:11 -msgid "Chec_k" +msgid "Check the software channels for new updates" msgstr "" #: ../data/glade/UpdateManager.glade.h:12 -msgid "Check the software channels for new updates" +msgid "Description" msgstr "" #: ../data/glade/UpdateManager.glade.h:13 -msgid "Description" +msgid "Release Notes" msgstr "" #: ../data/glade/UpdateManager.glade.h:14 -msgid "Release Notes" +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +msgid "_Distribution Upgrade" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 msgid "changes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1118,10 +1132,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" -"<b><big>The channel information is out-of-date</big></b>\n" +"<b><big>The information about available software is out-of-date</big></b>\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1148,10 +1162,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 msgid "" -"<big><b>Enter the complete APT line of the source that you want to add</b></" -"big>\n" +"<big><b>Enter the complete APT line of the repository that you want to add " +"as source</b></big>\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" @@ -1201,7 +1215,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:3 msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1220,7 +1234,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:7 msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" @@ -1244,192 +1258,172 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:106 -msgid "Important security updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -msgid "Proposed updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 -msgid "No longer oficially supported" +#: ../data/channels/Ubuntu.info.in:209 +msgid "No longer officially supported" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-07 01:53+0000\n" "Last-Translator: Hameed محمد حمید <hameeduddin517@yahoo.com>\n" "Language-Team: Urdu <urd@li.org>\n" @@ -130,7 +130,7 @@ msgstr "" #: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" -"<big><b>Error scaning the CD</b></big>\n" +"<big><b>Error scanning the CD</b></big>\n" "\n" "%s" msgstr "" @@ -143,79 +143,79 @@ msgstr "" msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -225,15 +225,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -241,11 +241,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -258,11 +258,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -271,42 +271,42 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -315,15 +315,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -332,72 +332,77 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -407,19 +412,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "" @@ -439,7 +444,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, python-format msgid "About %s remaining" msgstr "" @@ -471,19 +476,25 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " @@ -493,28 +504,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 #, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 #, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, python-format msgid "" "\n" @@ -522,36 +533,39 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "" @@ -585,11 +599,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -620,7 +634,7 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -741,8 +755,8 @@ msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:222 msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -765,162 +779,150 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 msgid "The list of changes is not available" msgstr "" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" -#: ../UpdateManager/UpdateManager.py:228 -msgid "Important security updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 +msgid "Important security updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +msgid "Proposed updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 -msgid "Updates of Ubuntu" +#: ../UpdateManager/UpdateManager.py:240 +msgid "Normal updates" msgstr "" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 msgid "Other updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" +#: ../UpdateManager/UpdateManager.py:551 +msgid "_Check All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +msgid "Checking for updates" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -936,84 +938,96 @@ msgid "" msgstr "" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"<big><b>Examining your system</b></big>\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "<big><b>Keep your system up-to-date</b></big>" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:5 +msgid "<big><b>Not all updates can be installed</b></big>" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:6 +msgid "<big><b>Starting update manager</b></big>" msgstr "" #: ../data/glade/UpdateManager.glade.h:7 -msgid "<big><b>Keep your system up-to-date</b></big>" +msgid "Cancel _Download" msgstr "" #: ../data/glade/UpdateManager.glade.h:8 -msgid "Cancel _Download" +msgid "Changes" msgstr "" #: ../data/glade/UpdateManager.glade.h:9 -msgid "Changes" +msgid "Changes and description of the update" msgstr "" #: ../data/glade/UpdateManager.glade.h:10 -msgid "Changes and description of the update" +msgid "Chec_k" msgstr "" #: ../data/glade/UpdateManager.glade.h:11 -msgid "Chec_k" +msgid "Check the software channels for new updates" msgstr "" #: ../data/glade/UpdateManager.glade.h:12 -msgid "Check the software channels for new updates" +msgid "Description" msgstr "" #: ../data/glade/UpdateManager.glade.h:13 -msgid "Description" +msgid "Release Notes" msgstr "" #: ../data/glade/UpdateManager.glade.h:14 -msgid "Release Notes" +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +msgid "_Distribution Upgrade" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 msgid "changes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1118,10 +1132,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" -"<b><big>The channel information is out-of-date</big></b>\n" +"<b><big>The information about available software is out-of-date</big></b>\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1148,10 +1162,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 msgid "" -"<big><b>Enter the complete APT line of the source that you want to add</b></" -"big>\n" +"<big><b>Enter the complete APT line of the repository that you want to add " +"as source</b></big>\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" @@ -1201,7 +1215,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:3 msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1220,7 +1234,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:7 msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" @@ -1244,192 +1258,172 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:106 -msgid "Important security updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -msgid "Proposed updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 -msgid "No longer oficially supported" +#: ../data/channels/Ubuntu.info.in:209 +msgid "No longer officially supported" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager Gnome HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-23 19:45+0000\n" "Last-Translator: Tran The Trung <tttrung@hotmail.com>\n" "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n" @@ -131,7 +131,7 @@ msgstr "Bạn đã chọn một khóa không thể gỡ bỏ. Vui lòng thông b #: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" -"<big><b>Error scaning the CD</b></big>\n" +"<big><b>Error scanning the CD</b></big>\n" "\n" "%s" msgstr "" @@ -144,56 +144,56 @@ msgstr "" msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." msgstr "Bạn đã chọn một khóa không thể gỡ bỏ. Vui lòng thông báo lỗi này. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -201,24 +201,24 @@ msgid "" msgstr "Bạn đã chọn một khóa không thể gỡ bỏ. Vui lòng thông báo lỗi này. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -228,15 +228,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -244,11 +244,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -261,11 +261,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -274,43 +274,43 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 #, fuzzy msgid "Error during update" msgstr "Gặp lỗi khi gỡ bỏ khóa" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -319,15 +319,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -336,73 +336,78 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 #, fuzzy msgid "Checking package manager" msgstr "Một bộ quản lý gói khác đang chạy" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -412,20 +417,20 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 #, fuzzy msgid "Upgrading" msgstr "Nâng cấp xong" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "" @@ -445,7 +450,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, python-format msgid "About %s remaining" msgstr "" @@ -478,19 +483,25 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " @@ -500,25 +511,25 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 #, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 #, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, python-format msgid "" "\n" @@ -526,36 +537,40 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +#, fuzzy +msgid "Your system is up-to-date" +msgstr "Hệ thống bạn toàn mới nhất." -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "" @@ -589,11 +604,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -624,7 +639,7 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -749,8 +764,8 @@ msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:222 msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -774,16 +789,16 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "Có một bản phát hành Ubuntu mới công bố." -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " @@ -792,153 +807,142 @@ msgstr "" "Không tải thay đổi về được. Bạn hãy kiểm tra có kết nối đến Mạng hoạt động " "chưa." -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Bản cập nhật bảo mặt Ubuntu 5.10" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "Đang cài đặt bản cập nhật..." -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 -msgid "Updates of Ubuntu" -msgstr "" +#: ../UpdateManager/UpdateManager.py:240 +#, fuzzy +msgid "Normal updates" +msgstr "Đang cài đặt bản cập nhật..." #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "Đang cài đặt bản cập nhật..." -#: ../UpdateManager/UpdateManager.py:276 -#, fuzzy -msgid "Cannot install all available updates" -msgstr "Đang kiểm tra có cập nhật..." - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "Phiên bản %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 #, fuzzy msgid "Downloading the list of changes..." msgstr "Đang tải các thay đổi" -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" +#: ../UpdateManager/UpdateManager.py:551 +msgid "_Check All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:632 -#, fuzzy -msgid "Your system is up-to-date" -msgstr "Hệ thống bạn toàn mới nhất." - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "Đang cài đặt bản cập nhật..." + +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "Phiên bản %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "Không còn hỗ trợ lại bản phát hành của bạn." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -954,86 +958,98 @@ msgid "" msgstr "" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"<big><b>Examining your system</b></big>\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "<big><b>Keep your system up-to-date</b></big>" +#: ../data/glade/UpdateManager.glade.h:5 +msgid "<big><b>Not all updates can be installed</b></big>" msgstr "" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:6 +msgid "<big><b>Starting update manager</b></big>" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "Đổi" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "Mô tả" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "Bản cập nhật phần mềm" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +msgid "_Distribution Upgrade" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "_Install Updates" msgstr "Đang cài đặt bản cập nhật..." -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "Đổi" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1147,10 +1163,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" -"<b><big>The channel information is out-of-date</big></b>\n" +"<b><big>The information about available software is out-of-date</big></b>\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1179,10 +1195,10 @@ msgstr "<b>Địa chỉ định vị:</b>" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the source that you want to add</b></" -"big>\n" +"<big><b>Enter the complete APT line of the repository that you want to add " +"as source</b></big>\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>Hãy nhập toàn dòng APT của kho cần thêm</b></big>\n" @@ -1242,7 +1258,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:3 msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1261,7 +1277,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:7 msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" @@ -1286,217 +1302,194 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Bản cập nhật Ubuntu 5.10" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "Do cộng đồng bảo quản (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "Phần mềm đã đóng góp" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 #, fuzzy msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "Đĩa CD chứa « Warty Warthog » của Ubuntu 4.10" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Bản cập nhật Ubuntu 5.04" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "Do cộng đồng bảo quản (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "Do cộng đồng bảo quản (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "Không tự do (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "Không tự do (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "By copyright or legal issues restricted software" msgstr "Phần mềm bị giới hạn xuất Mỹ" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Bản cập nhật Ubuntu 5.04" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Bản cập nhật bảo mặt Ubuntu 5.10" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "Đang cài đặt bản cập nhật..." - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 #, fuzzy msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Đĩa CD chứa « Breezy Badger » của Ubuntu 5.10" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -#, fuzzy -msgid "Officially supported" -msgstr "Được hỗ trợ một cách chính thức" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Đĩa CD chứa « Breezy Badger » của Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Bản cập nhật bảo mặt Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Bản cập nhật Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Bản cập nhật Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Đĩa CD chứa « Hoary Hedgehog » của Ubuntu 5.04" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Đĩa CD chứa « Hoary Hedgehog » của Ubuntu 5.04" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 #, fuzzy -msgid "Oficially supported" +msgid "Officially supported" msgstr "Được hỗ trợ một cách chính thức" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Bản cập nhật bảo mặt Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Bản cập nhật Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Bản cập nhật Ubuntu 5.10" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Đĩa CD chứa « Warty Warthog » của Ubuntu 4.10" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "Do cộng đồng bảo quản (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "Không tự do (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 #, fuzzy msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "Đĩa CD chứa « Warty Warthog » của Ubuntu 4.10" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "Được hỗ trợ một cách chính thức" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "Bản quyền bị giới hạn" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Bản cập nhật bảo mặt Ubuntu 4.10" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "Bản cập nhật Ubuntu 4.10" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Bản cập nhật Ubuntu 5.10" @@ -1551,6 +1544,18 @@ msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Bản cập nhật bảo mặt Ubuntu 5.10" + +#, fuzzy +#~ msgid "Cannot install all available updates" +#~ msgstr "Đang kiểm tra có cập nhật..." + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "Được hỗ trợ một cách chính thức" + +#, fuzzy #~ msgid "The upgrade aborts now. Please report this bug." #~ msgstr "Bạn đã chọn một khóa không thể gỡ bỏ. Vui lòng thông báo lỗi này." @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-notifier\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-04-20 19:15+0000\n" "Last-Translator: Canonical Ltd <translations@canonical.com>\n" "Language-Team: Xhosa <xh-translate@ubuntu.com>\n" @@ -130,7 +130,7 @@ msgstr "" #: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" -"<big><b>Error scaning the CD</b></big>\n" +"<big><b>Error scanning the CD</b></big>\n" "\n" "%s" msgstr "" @@ -143,79 +143,79 @@ msgstr "" msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -225,15 +225,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -241,11 +241,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -258,11 +258,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -271,42 +271,42 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -315,15 +315,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -332,72 +332,77 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -407,19 +412,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "" @@ -439,7 +444,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, python-format msgid "About %s remaining" msgstr "" @@ -471,19 +476,25 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " @@ -493,28 +504,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 #, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 #, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, python-format msgid "" "\n" @@ -522,36 +533,39 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "" @@ -585,11 +599,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -620,7 +634,7 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -741,8 +755,8 @@ msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:222 msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -765,165 +779,156 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "Kukho i-%i yohlaziyo ekhoyo" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Bonisa izihlaziyo" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "Bonisa izihlaziyo" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 -msgid "Updates of Ubuntu" -msgstr "" +#: ../UpdateManager/UpdateManager.py:240 +#, fuzzy +msgid "Normal updates" +msgstr "Bonisa izihlaziyo" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "Bonisa izihlaziyo" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" +#: ../UpdateManager/UpdateManager.py:551 +msgid "_Check All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "Bonisa izihlaziyo" + +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, python-format msgid "Version %s" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -939,86 +944,98 @@ msgid "" msgstr "" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"<big><b>Examining your system</b></big>\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "<big><b>Keep your system up-to-date</b></big>" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:5 +msgid "<big><b>Not all updates can be installed</b></big>" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:6 +msgid "<big><b>Starting update manager</b></big>" msgstr "" #: ../data/glade/UpdateManager.glade.h:7 -msgid "<big><b>Keep your system up-to-date</b></big>" +msgid "Cancel _Download" msgstr "" #: ../data/glade/UpdateManager.glade.h:8 -msgid "Cancel _Download" +msgid "Changes" msgstr "" #: ../data/glade/UpdateManager.glade.h:9 -msgid "Changes" +msgid "Changes and description of the update" msgstr "" #: ../data/glade/UpdateManager.glade.h:10 -msgid "Changes and description of the update" +msgid "Chec_k" msgstr "" #: ../data/glade/UpdateManager.glade.h:11 -msgid "Chec_k" +msgid "Check the software channels for new updates" msgstr "" #: ../data/glade/UpdateManager.glade.h:12 -msgid "Check the software channels for new updates" +msgid "Description" msgstr "" #: ../data/glade/UpdateManager.glade.h:13 -msgid "Description" +msgid "Release Notes" msgstr "" #: ../data/glade/UpdateManager.glade.h:14 -msgid "Release Notes" +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." msgstr "" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 #, fuzzy msgid "Software Updates" msgstr "Bonisa izihlaziyo" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +msgid "_Distribution Upgrade" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "_Install Updates" msgstr "Bonisa izihlaziyo" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 msgid "changes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1125,10 +1142,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" -"<b><big>The channel information is out-of-date</big></b>\n" +"<b><big>The information about available software is out-of-date</big></b>\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1157,10 +1174,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 msgid "" -"<big><b>Enter the complete APT line of the source that you want to add</b></" -"big>\n" +"<big><b>Enter the complete APT line of the repository that you want to add " +"as source</b></big>\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" @@ -1211,7 +1228,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:3 msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1230,7 +1247,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:7 msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" @@ -1254,194 +1271,172 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 msgid "Community maintained" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 msgid "Restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 msgid "Community maintained (universe)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 msgid "Community maintained Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 msgid "Restricted software (Multiverse)" msgstr "" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Bonisa izihlaziyo" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "Bonisa izihlaziyo" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 msgid "Ubuntu 5.04 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 msgid "Ubuntu 5.04 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 msgid "Ubuntu 5.04 Backports" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 -msgid "No longer oficially supported" +#: ../data/channels/Ubuntu.info.in:209 +msgid "No longer officially supported" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 msgid "Ubuntu 4.10 Backports" msgstr "" @@ -1492,6 +1487,10 @@ msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Bonisa izihlaziyo" + +#, fuzzy #~ msgid "<b>Channels</b>" #~ msgstr "Uluhlu lwezinto ezikhethwayo zeenkqubo zekhompyutha" diff --git a/po/zh_CN.po b/po/zh_CN.po index b36da2ac..3ad9723b 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-30 14:16+0000\n" "Last-Translator: catinsnow <catinsnow@gmail.com>\n" "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n" @@ -133,9 +133,9 @@ msgid "The key you selected could not be removed. Please report this as a bug." msgstr "你所选择的密钥不能被删除。请汇报这个bug" #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"<big><b>Error scaning the CD</b></big>\n" +"<big><b>Error scanning the CD</b></big>\n" "\n" "%s" msgstr "" @@ -151,11 +151,11 @@ msgstr "请输入光盘的名称" msgid "Please insert a disc in the drive:" msgstr "请将光盘插入到光驱里:" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "破损的软件包" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -163,34 +163,34 @@ msgstr "" "你的系统包含有破损的软件包而不能通过此软件修复。 在你继续前请先用新立得或者" "apt-get修复它们。" -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "不能升级要求的元包" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "一个必要的软件包会被删除" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "无法计算升级" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." msgstr "在计算升级时遇到一个无法解决的问题。请汇报这个bug。 " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "在认证一些软件包时出错" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -199,27 +199,28 @@ msgstr "" "无法认证一些软件包。这可能是暂时的网络问题。你可以在稍后再试。以下是未认证软" "件包的列表。" -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "无法安装'%s'" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "无法安装要求的软件包。请汇报这个bug。 " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "无法猜出元包" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -227,12 +228,12 @@ msgstr "" "确定你运行的ubuntu的版本。 请在继续前先用新立得或apt-get安装以上所举软件包中" "的一个。" -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "下载失败" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -242,15 +243,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "正在读取缓存" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -258,11 +259,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "未找到可用的镜像" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -279,11 +280,11 @@ msgstr "" "如果选'no'更新将被取消." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "生成默认的源?" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -295,44 +296,45 @@ msgstr "" "\n" "添加用于'%s'的缺省条目?如果选择'No',升级将被取消." -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "源的信息无效" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "升级源的信息时产生一个无效文件。请汇报这个bug。" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "第三方源被禁用" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#, fuzzy msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" "源列表中一些第三方源被禁用.你可以在升级后用\"软件属性\"工具或新立得包管理器来" "重新启用它们." -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "升级时出错" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "升级时候出错。这通常是一些网络问题，请检查你的网络连接后再试。" -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "磁盘空间不足" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -343,15 +345,15 @@ msgstr "" "get clean'命令来删除之前安装的临时软件包。" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "你要开始升级么？" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "无法安装升级" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -363,75 +365,81 @@ msgstr "" "升级现在取消。你的系统可能处于不稳定状态。恢复操作可运行(dpkg --configure -" "a)。" -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "无法下载升级包" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "升级现在取消。请检查你的网络连接活重新放置安装媒体后再试。 " -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" -msgstr "一些软件已经不在被官方支持." +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 +#, fuzzy msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" "这些安装的包已不在被官方支持,仅为社区维护('universe').\n" "\n" "如果你没有启用'社区维护'源,下一步这些包将被建议移除. " -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "删除陈旧的软件包？" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "跳过这个步骤(_S)" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "删除(_R)" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "确认时出错" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "在清理时发生问题。更多信息请查看以下消息。 " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "正在恢复原始系统状态" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "正在检查软件包管理器" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "更新源的信息" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "无效的包信息" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, fuzzy, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -443,19 +451,19 @@ msgstr "" "包信息被更新后核心包'%s'没有找到.\n" "这标志着一个严重的错误,请报告bug." -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "请求确认" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "正在更新" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "寻找陈旧的软件包" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "系统更新完毕" @@ -476,7 +484,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "正在下载文件%li/%li速度是%s/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, fuzzy, python-format msgid "About %s remaining" msgstr "大约还要%li分钟" @@ -506,23 +514,29 @@ msgstr "" #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, python-format +#, fuzzy, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" "替换配置文件\n" "“%s”吗？" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "外部命令“diff”没有找到" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "出现致命错误" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -536,25 +550,25 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "%s软件包将被删除。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "%s新的软件包将被安装。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "%s软件包将被升级" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -562,37 +576,40 @@ msgid "" "You have to download a total of %s. " msgstr "你下载了总体的%s。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "升级会持续几个小时且不能在稍后的任何时候被终止" -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "关闭所有打开的程序和文档以防止数据丢失。" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "不能找到任何升级" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "您的系统已为最新" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "你的系统已经升级。" +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>删除%s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "安装%s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "升级%s" @@ -626,11 +643,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "需要重启" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "升级已经完成并需要重启。你要现在重启么？" @@ -663,10 +680,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>开始升级？</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>" msgstr "" -"<span weight=\"bold\" size=\"x-large\">正在升级到 Ubuntu 6.06 LTS</span>" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -786,9 +801,10 @@ msgid "Verfication failed" msgstr "验证失败" #: ../UpdateManager/DistUpgradeFetcher.py:222 +#, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "验证升级程序失败。可能是网络或服务器的问题。 " #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -811,148 +827,139 @@ msgstr "正在下载文件 %li/%li 速度是 %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "正在下载文件 %li/%li 速度未知" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "变动列表尚不可用。请稍后再试。" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "变动列表尚不可用。请稍后再试。" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "无法下载更新列表。请检查您的网络连接。" -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Ubuntu 5.10 安全更新" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "安装更新" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "升级到最新版本的Ubuntu" +msgid "Normal updates" +msgstr "安装更新" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "安装更新" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "无法安装所有升级" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "版本 %s： \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "正在下载更新列表..." -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "检查（_C）" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "下载文件大小：%s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "您的系统已为最新" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "你可以安装 %s 个更新" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "请稍等，这需要花一些时间。" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "更新完成" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "检查有效的更新" + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "新版本：%s(大小：%s)" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "版本 %s： \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "您的发行版不再被支持" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -962,17 +969,17 @@ msgstr "" "\r\n" "http://www.ubuntu.com 来获取更多有关升级的信息。" -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "<b>新发行版 '%s' 可用</b>" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "软件索引已被破坏" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -994,88 +1001,103 @@ msgstr "" "变." #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"<big><b>Examining your system</b></big>\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "<big><b>Keep your system up-to-date</b></big>" +msgstr "<big><b>保持你的系统更新</b></big>" + +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "<big><b>Not all updates can be installed</b></big>" msgstr "" -"<big><b>正在检查你的系统</b></big>\n" +"<big><b>读取光盘时出错</b></big>\n" "\n" -"软件更新可以为你修复错误，除去安全漏洞，并提供新的特性。" +"%s" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "<big><b>Keep your system up-to-date</b></big>" -msgstr "<big><b>保持你的系统更新</b></big>" +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "<big><b>Starting update manager</b></big>" +msgstr "<b><big>开始升级？</big></b>" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "取消下载(_D)" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "变更" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "检查（_K）" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "检查软件频道以获得新的更新" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "描述" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "发布说明" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "显示单个文件进度" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "软件更新" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "软件更行可以为你修复错误，消除安全漏洞及提供新的特性" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "升级(_p)" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "升级到最新版本的Ubuntu" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "检查（_C）" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "继续升级(_R)" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "在以后隐藏该信息(_H)" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "安装更新(_I)" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "变更" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1186,11 +1208,12 @@ msgid "_Install security updates without confirmation" msgstr "不确认就安装安全更新(_I)" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 +#, fuzzy msgid "" -"<b><big>The channel information is out-of-date</big></b>\n" +"<b><big>The information about available software is out-of-date</big></b>\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1223,10 +1246,10 @@ msgstr "<b>URI：</b>" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the source that you want to add</b></" -"big>\n" +"<big><b>Enter the complete APT line of the repository that you want to add " +"as source</b></big>\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>输入你想增加的完整的频道 APT 命令行</b></big>\n" @@ -1286,8 +1309,9 @@ msgid "Check for new distribution releases" msgstr "检测新版本发布" #: ../data/update-manager.schemas.in.h:3 +#, fuzzy msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1307,8 +1331,9 @@ msgid "Stores the size of the update-manager dialog" msgstr "储存更新管理器对话框的大小" #: ../data/update-manager.schemas.in.h:7 +#, fuzzy msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "储存包含变动和描述列表的扩展器的状态" @@ -1334,212 +1359,190 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 更新" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "社区维护(Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "贡献的软件" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6-06 'Dapper Drake'" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "社区维护(Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "社区维护(Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "非自由(Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "非自由(Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "By copyright or legal issues restricted software" msgstr "美国限制出口的软件" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6-06 'Dapper Drake'" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Ubuntu 5.10 安全更新" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "安装更新" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "官方支持" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 安全更新" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 更新" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 移植" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 安全更新" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 安全更新" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "官方支持" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 安全更新" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 更新" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 移植" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "社区维护(Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "非自由(Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "一些软件已经不在被官方支持." #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "版权限制" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 安全更新" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 5.10 更新" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 移植" @@ -1590,6 +1593,45 @@ msgstr "带有非自由依赖关系的DFSG兼容软件" msgid "Non-DFSG-compatible Software" msgstr "非DFSG兼容软件" +#~ msgid "Some software no longer officially supported" +#~ msgstr "一些软件已经不在被官方支持." + +#~ msgid "Could not find any upgrades" +#~ msgstr "不能找到任何升级" + +#~ msgid "Your system has already been upgraded." +#~ msgstr "你的系统已经升级。" + +#, fuzzy +#~ msgid "" +#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +#~ msgstr "" +#~ "<span weight=\"bold\" size=\"x-large\">正在升级到 Ubuntu 6.06 LTS</span>" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Ubuntu 5.10 安全更新" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "升级到最新版本的Ubuntu" + +#~ msgid "Cannot install all available updates" +#~ msgstr "无法安装所有升级" + +#~ msgid "" +#~ "<big><b>Examining your system</b></big>\n" +#~ "\n" +#~ "Software updates correct errors, eliminate security vulnerabilities and " +#~ "provide new features." +#~ msgstr "" +#~ "<big><b>正在检查你的系统</b></big>\n" +#~ "\n" +#~ "软件更新可以为你修复错误，除去安全漏洞，并提供新的特性。" + +#~ msgid "Oficially supported" +#~ msgstr "官方支持" + #~ msgid "" #~ "Some updates require the removal of further software. Use the function " #~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " @@ -1685,9 +1727,6 @@ msgstr "非DFSG兼容软件" #~ msgid "<b>Sections</b>" #~ msgstr "<b>节：</b>" -#~ msgid "Check for available updates" -#~ msgstr "检查有效的更新" - #~ msgid "<b>Sections:</b>" #~ msgstr "<b>节：</b>" diff --git a/po/zh_HK.po b/po/zh_HK.po index 65eb63ef..06195b80 100644 --- a/po/zh_HK.po +++ b/po/zh_HK.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager 0.41.1\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-23 19:45+0000\n" "Last-Translator: Abel Cheung <abelcheung@gmail.com>\n" "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n" @@ -131,7 +131,7 @@ msgstr "你選定的密碼匙無法移除，請匯報問題。" #: ../SoftwareProperties/SoftwareProperties.py:1036 #, python-format msgid "" -"<big><b>Error scaning the CD</b></big>\n" +"<big><b>Error scanning the CD</b></big>\n" "\n" "%s" msgstr "" @@ -144,56 +144,56 @@ msgstr "" msgid "Please insert a disc in the drive:" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." msgstr "你選定的密碼匙無法移除，請匯報問題。 " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -201,24 +201,24 @@ msgid "" msgstr "你選定的密碼匙無法移除，請匯報問題。 " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -228,15 +228,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -244,11 +244,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -261,11 +261,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -274,43 +274,43 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 #, fuzzy msgid "Error during update" msgstr "移除密碼匙時發生錯誤" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -319,15 +319,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " "recovery was run (dpkg --configure -a).\n" @@ -336,73 +336,78 @@ msgid "" "files in /var/log/dist-upgrade/ in the bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 #, fuzzy msgid "Checking package manager" msgstr "另一個套件管理員正在執行中" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -412,20 +417,20 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 #, fuzzy msgid "Upgrading" msgstr "完成升級" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "" @@ -445,7 +450,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, python-format msgid "About %s remaining" msgstr "" @@ -478,19 +483,25 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:202 #, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts " @@ -500,28 +511,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 #, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 #, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 #, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, python-format msgid "" "\n" @@ -529,36 +540,40 @@ msgid "" "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +#, fuzzy +msgid "Your system is up-to-date" +msgstr "系統已經在最新狀態！" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "" @@ -592,11 +607,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -627,7 +642,7 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -752,8 +767,8 @@ msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:222 msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "" #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -777,170 +792,159 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "Ubuntu 已推出新版本！" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "無法下載更改紀錄。請檢查網絡連線是否正常。" -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Ubuntu 5.10 安全性更新" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "正在安裝軟件更新..." -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 -msgid "Updates of Ubuntu" -msgstr "" +#: ../UpdateManager/UpdateManager.py:240 +#, fuzzy +msgid "Normal updates" +msgstr "正在安裝軟件更新..." #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "正在安裝軟件更新..." -#: ../UpdateManager/UpdateManager.py:276 -#, fuzzy -msgid "Cannot install all available updates" -msgstr "正在檢查更新套件..." - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "版本 %s: \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 #, fuzzy msgid "Downloading the list of changes..." msgstr "正在下載更改紀錄" -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" +#: ../UpdateManager/UpdateManager.py:551 +msgid "_Check All" msgstr "" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:632 -#, fuzzy -msgid "Your system is up-to-date" -msgstr "系統已經在最新狀態！" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "正在安裝軟件更新..." + +#: ../UpdateManager/UpdateManager.py:822 #, python-format msgid "From version %s to %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "版本 %s: \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "已經不再支援你用的發行版本" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -956,86 +960,98 @@ msgid "" msgstr "" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"<big><b>Examining your system</b></big>\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "<big><b>Keep your system up-to-date</b></big>" +#: ../data/glade/UpdateManager.glade.h:5 +msgid "<big><b>Not all updates can be installed</b></big>" msgstr "" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:6 +msgid "<big><b>Starting update manager</b></big>" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "更改紀錄" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "詳細說明" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "軟件更新" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +msgid "_Distribution Upgrade" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 #, fuzzy msgid "_Install Updates" msgstr "正在安裝軟件更新..." -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "更改紀錄" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1149,10 +1165,10 @@ msgstr "" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" -"<b><big>The channel information is out-of-date</big></b>\n" +"<b><big>The information about available software is out-of-date</big></b>\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1181,10 +1197,10 @@ msgstr "<b>URI:</b>" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the source that you want to add</b></" -"big>\n" +"<big><b>Enter the complete APT line of the repository that you want to add " +"as source</b></big>\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>請輸入整行你想加入的 APT 軟件庫位置</b></big>\n" @@ -1243,7 +1259,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:3 msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1262,7 +1278,7 @@ msgstr "" #: ../data/update-manager.schemas.in.h:7 msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "" @@ -1287,217 +1303,194 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 更新" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "協力維護軟件 (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "協力維護軟件" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 #, fuzzy msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 4.10 光碟 “Warty Warthog”" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 5.04 更新" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "協力維護軟件 (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "協力維護軟件 (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "非自由軟件 (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "非自由軟件 (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 #, fuzzy msgid "By copyright or legal issues restricted software" msgstr "美國禁止出口軟件" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 5.04 更新" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Ubuntu 5.10 安全性更新" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "正在安裝軟件更新..." - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 #, fuzzy msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 光碟 “Breezy Badger”" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -#, fuzzy -msgid "Officially supported" -msgstr "官方支援" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 光碟 “Breezy Badger”" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 安全性更新" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 更新" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 更新" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 光碟 “Hoary Hedgehog”" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 #, fuzzy msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.04 光碟 “Hoary Hedgehog”" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 #, fuzzy -msgid "Oficially supported" +msgid "Officially supported" msgstr "官方支援" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 安全性更新" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 更新" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 更新" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 光碟 “Warty Warthog”" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "協力維護軟件 (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "非自由軟件 (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 #, fuzzy msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 4.10 光碟 “Warty Warthog”" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "官方支援" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "版權受限" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 4.10 安全性更新" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 4.10 更新" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 更新" @@ -1552,6 +1545,18 @@ msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Ubuntu 5.10 安全性更新" + +#, fuzzy +#~ msgid "Cannot install all available updates" +#~ msgstr "正在檢查更新套件..." + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "官方支援" + +#, fuzzy #~ msgid "The upgrade aborts now. Please report this bug." #~ msgstr "你選定的密碼匙無法移除，請匯報問題。" diff --git a/po/zh_TW.po b/po/zh_TW.po index 62a2dc1f..5bdfffd2 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager 0.41.1\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-09-10 01:15+0200\n" +"POT-Creation-Date: 2006-09-23 00:48+0200\n" "PO-Revision-Date: 2006-05-31 12:00+0000\n" "Last-Translator: PCMan <pcman.tw@gmail.com>\n" "Language-Team: Chinese (Taiwan) <zh-l10n@linux.org.tw>\n" @@ -126,9 +126,9 @@ msgid "The key you selected could not be removed. Please report this as a bug." msgstr "您選定的金鑰無法移除，請匯報問題。" #: ../SoftwareProperties/SoftwareProperties.py:1036 -#, python-format +#, fuzzy, python-format msgid "" -"<big><b>Error scaning the CD</b></big>\n" +"<big><b>Error scanning the CD</b></big>\n" "\n" "%s" msgstr "" @@ -144,11 +144,11 @@ msgstr "請輸入光碟的名稱" msgid "Please insert a disc in the drive:" msgstr "請將光碟放入光碟機：" -#: ../DistUpgrade/DistUpgradeCache.py:89 +#: ../DistUpgrade/DistUpgradeCache.py:92 msgid "Broken packages" msgstr "不完整套件" -#: ../DistUpgrade/DistUpgradeCache.py:90 +#: ../DistUpgrade/DistUpgradeCache.py:93 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -156,34 +156,34 @@ msgstr "" "您的系統有安裝不完整的套件，而本程式無法將它們修正。在進行前請先使用 " "synaptic 或 apt-get 來修恢它們。" -#: ../DistUpgrade/DistUpgradeCache.py:147 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "無法升級須要的元套件 (meta-package)" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "將會移除的核心套件" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:157 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "無法計算升級" -#: ../DistUpgrade/DistUpgradeCache.py:158 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" -"A unresolvable problem occured while calculating the upgrade.\n" +"A unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " "files in /var/log/dist-upgrade/ in the bugreport." msgstr "計算升級時發生無法解決的問題，請匯報問題。 " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:183 +#: ../DistUpgrade/DistUpgradeCache.py:186 msgid "Error authenticating some packages" msgstr "認證一些套件時發生錯誤" -#: ../DistUpgrade/DistUpgradeCache.py:184 +#: ../DistUpgrade/DistUpgradeCache.py:187 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -192,27 +192,28 @@ msgstr "" "一些套件不能認證，這可能是由於短暫的網路問題；您可以稍後再試。以下為沒有認證" "的套件。" -#: ../DistUpgrade/DistUpgradeCache.py:249 +#: ../DistUpgrade/DistUpgradeCache.py:252 #, python-format msgid "Can't install '%s'" msgstr "無法安裝‘%s’" -#: ../DistUpgrade/DistUpgradeCache.py:250 +#: ../DistUpgrade/DistUpgradeCache.py:253 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "無法安裝須要的套件，請匯報問題。 " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:257 +#: ../DistUpgrade/DistUpgradeCache.py:260 msgid "Can't guess meta-package" msgstr "無法估計元套件 (meta-package)" -#: ../DistUpgrade/DistUpgradeCache.py:258 +#: ../DistUpgrade/DistUpgradeCache.py:261 +#, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " -"you are runing.\n" +"you are running.\n" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" @@ -220,12 +221,12 @@ msgstr "" "此無法偵測正在執行那個版本的 ubuntu。\n" " 請進行操作前使用 synaptic 或 apt-get安裝上述其中一個套件" -#: ../DistUpgrade/DistUpgradeControler.py:73 +#: ../DistUpgrade/DistUpgradeControler.py:74 #, fuzzy msgid "Failed to add the CD" msgstr "下載失敗" -#: ../DistUpgrade/DistUpgradeControler.py:74 +#: ../DistUpgrade/DistUpgradeControler.py:75 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -235,15 +236,15 @@ msgid "" "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:104 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "Reading cache" msgstr "正在讀取快取" -#: ../DistUpgrade/DistUpgradeControler.py:143 +#: ../DistUpgrade/DistUpgradeControler.py:147 msgid "Fetch data from the network for the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:144 +#: ../DistUpgrade/DistUpgradeControler.py:148 msgid "" "The upgrade can use the network to check the latest updates and to fetch " "packages that are not on the current CD.\n" @@ -251,11 +252,11 @@ msgid "" "If networking is expensive for you choose 'No'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:235 +#: ../DistUpgrade/DistUpgradeControler.py:239 msgid "No valid mirror found" msgstr "找不到有效的 mirror" -#: ../DistUpgrade/DistUpgradeControler.py:236 +#: ../DistUpgrade/DistUpgradeControler.py:240 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -274,11 +275,11 @@ msgstr "" "如果選擇「否」，則更新會被取消。" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "Generate default sources?" msgstr "產生預設的來源？" -#: ../DistUpgrade/DistUpgradeControler.py:254 +#: ../DistUpgrade/DistUpgradeControler.py:258 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -290,44 +291,45 @@ msgstr "" "\n" "需要加入預設的 '%s' 項目嗎？如果你選擇「否」，更新將會被取消。" -#: ../DistUpgrade/DistUpgradeControler.py:288 +#: ../DistUpgrade/DistUpgradeControler.py:292 msgid "Repository information invalid" msgstr "無效的套件庫資料" -#: ../DistUpgrade/DistUpgradeControler.py:289 +#: ../DistUpgrade/DistUpgradeControler.py:293 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "升級套件庫時導致無效的檔案。請匯報問題。" -#: ../DistUpgrade/DistUpgradeControler.py:295 +#: ../DistUpgrade/DistUpgradeControler.py:299 msgid "Third party sources disabled" msgstr "停用第三方來源" -#: ../DistUpgrade/DistUpgradeControler.py:296 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#, fuzzy msgid "" -"Some third party entries in your souces.list were disabled. You can re-" +"Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" "你的 sources.list 中，部份第三方的項目已經被停用。在使用 'software-" "properties' 工具或 synaptic升級後，你可以重新啟用它。" -#: ../DistUpgrade/DistUpgradeControler.py:345 +#: ../DistUpgrade/DistUpgradeControler.py:349 msgid "Error during update" msgstr "更新時發生錯誤" -#: ../DistUpgrade/DistUpgradeControler.py:346 +#: ../DistUpgrade/DistUpgradeControler.py:350 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "更新時發生錯誤。這可能是某些網路問題，試檢查網路連線及再試。" -#: ../DistUpgrade/DistUpgradeControler.py:355 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Not enough free disk space" msgstr "磁碟空間不足" -#: ../DistUpgrade/DistUpgradeControler.py:356 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -338,15 +340,15 @@ msgstr "" "clean'來移除先前安裝套件時的暫存檔。" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:415 +#: ../DistUpgrade/DistUpgradeControler.py:419 msgid "Do you want to start the upgrade?" msgstr "是否要開始升級？" -#: ../DistUpgrade/DistUpgradeControler.py:432 +#: ../DistUpgrade/DistUpgradeControler.py:439 msgid "Could not install the upgrades" msgstr "無法安裝升級" -#: ../DistUpgrade/DistUpgradeControler.py:433 +#: ../DistUpgrade/DistUpgradeControler.py:440 #, fuzzy msgid "" "The upgrade aborts now. Your system could be in an unusable state. A " @@ -358,72 +360,77 @@ msgstr "" "升級中止。 你的系統現在可能在一個不穩定的狀態。 正在進行復原 (dpkg --" "configure -a)。" -#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:458 msgid "Could not download the upgrades" msgstr "無法下載升級套件" -#: ../DistUpgrade/DistUpgradeControler.py:452 +#: ../DistUpgrade/DistUpgradeControler.py:459 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "升級現正中止。請檢查網路連線是否正常及再試 " -#: ../DistUpgrade/DistUpgradeControler.py:488 -msgid "Some software no longer officially supported" -msgstr "有些軟體不再有官方支援" +#: ../DistUpgrade/DistUpgradeControler.py:495 +msgid "Support for some applications ended" +msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:490 +#: ../DistUpgrade/DistUpgradeControler.py:496 msgid "" -"These installed packages are no longer officially supported, and are now " -"only community-supported ('universe').\n" +"Canonical Ltd. no longer provides support for the following software " +"packages. You can still get support from the community.\n" "\n" -"If you don't have 'universe' enabled these packages will be suggested for " -"removal in the next step. " +"If you havn't enabled community maintained software (universe), these " +"packages will be suggested for removal in the next step." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:524 +#: ../DistUpgrade/DistUpgradeControler.py:531 msgid "Remove obsolete packages?" msgstr "移除不再使用的套件" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Skip This Step" msgstr "略過這步驟(_S)" -#: ../DistUpgrade/DistUpgradeControler.py:525 +#: ../DistUpgrade/DistUpgradeControler.py:532 msgid "_Remove" msgstr "移除(_R)" -#: ../DistUpgrade/DistUpgradeControler.py:535 +#: ../DistUpgrade/DistUpgradeControler.py:542 msgid "Error during commit" msgstr "提交時發生錯誤" -#: ../DistUpgrade/DistUpgradeControler.py:536 +#: ../DistUpgrade/DistUpgradeControler.py:543 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "在清理時發生一些問題。請參閱以下訊息以取得更多資訊。 " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:546 +#: ../DistUpgrade/DistUpgradeControler.py:553 msgid "Restoring original system state" msgstr "恢復原先的系統狀態" +#: ../DistUpgrade/DistUpgradeControler.py:609 +#, python-format +msgid "Fetching backport of '%s'" +msgstr "" + #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:554 -#: ../DistUpgrade/DistUpgradeControler.py:583 +#: ../DistUpgrade/DistUpgradeControler.py:644 +#: ../DistUpgrade/DistUpgradeControler.py:677 msgid "Checking package manager" msgstr "正在檢查套件管理程式" -#: ../DistUpgrade/DistUpgradeControler.py:569 +#: ../DistUpgrade/DistUpgradeControler.py:663 msgid "Updating repository information" msgstr "正在更新套件庫資料" -#: ../DistUpgrade/DistUpgradeControler.py:594 +#: ../DistUpgrade/DistUpgradeControler.py:688 msgid "Invalid package information" msgstr "無效的套件資訊" -#: ../DistUpgrade/DistUpgradeControler.py:595 +#: ../DistUpgrade/DistUpgradeControler.py:689 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -433,19 +440,19 @@ msgid "" "bugreport." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:607 +#: ../DistUpgrade/DistUpgradeControler.py:701 msgid "Asking for confirmation" msgstr "詢問以確認" -#: ../DistUpgrade/DistUpgradeControler.py:611 +#: ../DistUpgrade/DistUpgradeControler.py:705 msgid "Upgrading" msgstr "升級中" -#: ../DistUpgrade/DistUpgradeControler.py:618 +#: ../DistUpgrade/DistUpgradeControler.py:712 msgid "Searching for obsolete software" msgstr "尋搜不再使用的套件" -#: ../DistUpgrade/DistUpgradeControler.py:623 +#: ../DistUpgrade/DistUpgradeControler.py:717 msgid "System upgrade is complete." msgstr "系統升級完成。" @@ -466,7 +473,7 @@ msgid "Fetching file %li of %li at %s/s" msgstr "正在下載檔案 %li/%li，速度在 %s/秒" #: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewGtk.py:252 +#: ../DistUpgrade/DistUpgradeViewGtk.py:249 #, python-format msgid "About %s remaining" msgstr "" @@ -496,23 +503,29 @@ msgstr "" #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#, python-format +#, fuzzy, python-format msgid "" -"Replace configuration file\n" +"Replace the customized configuration file\n" "'%s'?" msgstr "" "取代設定檔\n" "‘%s‘？" -#: ../DistUpgrade/DistUpgradeViewGtk.py:219 +#: ../DistUpgrade/DistUpgradeViewGtk.py:203 +msgid "" +"You will loose all customizations, that have been made by yourself or by a " +"script, if you replace the file by its latest version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 msgid "The 'diff' command was not found" msgstr "找不到‘diff’指令" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:355 msgid "A fatal error occured" msgstr "發生嚴重錯誤" -#: ../DistUpgrade/DistUpgradeViewGtk.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:356 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." @@ -526,28 +539,28 @@ msgstr "" #. FIXME: make those two seperate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeViewGtk.py:475 -#, python-format -msgid "%s package is going to be removed." -msgid_plural "%s packages are going to be removed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:487 +#, fuzzy, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." msgstr[0] "%s 個套件將會移除。" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 -#, python-format -msgid "%s new package is going to be installed." -msgid_plural "%s new packages are going to be installed." +#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#, fuzzy, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." msgstr[0] "%s 個新套件將會安裝。" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:486 -#, python-format -msgid "%s package is going to be upgraded." -msgid_plural "%s packages are going to be upgraded." +#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#, fuzzy, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." msgstr[0] "%s 個套件將會升級。" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:491 +#: ../DistUpgrade/DistUpgradeViewGtk.py:503 #, fuzzy, python-format msgid "" "\n" @@ -555,37 +568,40 @@ msgid "" "You have to download a total of %s. " msgstr "您總共需要下載 %s。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:497 +#: ../DistUpgrade/DistUpgradeViewGtk.py:509 #, fuzzy msgid "" "Fetching and installing the upgrade can take several hours and cannot be " "canceled at any time later." msgstr "升級可能需要數小時及無法在稍後任何時間取消。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:500 +#: ../DistUpgrade/DistUpgradeViewGtk.py:512 msgid "To prevent data loss close all open applications and documents." msgstr "避免遺失請關閉所有已開啟的程式及文件。" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:506 -msgid "Could not find any upgrades" -msgstr "無法找到任何升級" +#: ../DistUpgrade/DistUpgradeViewGtk.py:518 +#: ../UpdateManager/UpdateManager.py:618 +msgid "Your system is up-to-date" +msgstr "系統已經在最新狀態" -#: ../DistUpgrade/DistUpgradeViewGtk.py:507 -msgid "Your system has already been upgraded." -msgstr "系統升級已經完成。" +#: ../DistUpgrade/DistUpgradeViewGtk.py:519 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:522 +#: ../DistUpgrade/DistUpgradeViewGtk.py:535 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>移除 %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:524 +#: ../DistUpgrade/DistUpgradeViewGtk.py:537 #, python-format msgid "Install %s" msgstr "安裝 %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:526 +#: ../DistUpgrade/DistUpgradeViewGtk.py:539 #, python-format msgid "Upgrade %s" msgstr "升級 %s" @@ -619,11 +635,11 @@ msgid "" "DSL connection" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:105 +#: ../DistUpgrade/DistUpgradeView.py:109 msgid "Reboot required" msgstr "須要重新開機" -#: ../DistUpgrade/DistUpgradeView.py:106 +#: ../DistUpgrade/DistUpgradeView.py:110 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "升級已經完成及須要重新啟動。現在要重新啟動嗎？" @@ -657,9 +673,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>開始升級？</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -#, fuzzy -msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" -msgstr "<span weight=\"bold\" size=\"x-large\">升級至 Ubuntu 6.06 LTS</span>" +msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>" +msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -779,9 +794,10 @@ msgid "Verfication failed" msgstr "檢驗失敗" #: ../UpdateManager/DistUpgradeFetcher.py:222 +#, fuzzy msgid "" -"Verfing the upgrade failed. There may be a problem with the network or with " -"the server. " +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " msgstr "檢驗升級套件失敗。可能是因為跟伺服器的網路連接出現問題。 " #: ../UpdateManager/DistUpgradeFetcher.py:228 @@ -804,149 +820,140 @@ msgstr "正在下載檔案 %li/%li，下載速度為 %s/秒" msgid "Downloading file %li of %li with unknown speed" msgstr "正在下載檔案 %li/%li，下載速度不明" -#: ../UpdateManager/UpdateManager.py:197 +#: ../UpdateManager/UpdateManager.py:204 #, fuzzy msgid "The list of changes is not available" msgstr "修改紀錄不存在，請稍後再試。" -#: ../UpdateManager/UpdateManager.py:203 +#: ../UpdateManager/UpdateManager.py:210 msgid "The list of changes is not available yet. Please try again later." msgstr "修改紀錄不存在，請稍後再試。" -#: ../UpdateManager/UpdateManager.py:208 +#: ../UpdateManager/UpdateManager.py:215 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "無法下載更動列表。請檢查網路連線是否正常。" -#: ../UpdateManager/UpdateManager.py:228 +#. Description +#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88 #, fuzzy -msgid "Important security updates of Ubuntu" +msgid "Important security updates" msgstr "Ubuntu 5.10 安全性更新" -#: ../UpdateManager/UpdateManager.py:230 -msgid "Recommended updates of Ubuntu" +#. Description +#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93 +msgid "Recommended updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:232 -msgid "Proposed updates for Ubuntu" -msgstr "" +#. Description +#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98 +#, fuzzy +msgid "Proposed updates" +msgstr "安裝更新套件(_I)" -#: ../UpdateManager/UpdateManager.py:233 -msgid "Backports of Ubuntu" +#: ../UpdateManager/UpdateManager.py:239 +msgid "Backports" msgstr "" -#: ../UpdateManager/UpdateManager.py:234 +#: ../UpdateManager/UpdateManager.py:240 #, fuzzy -msgid "Updates of Ubuntu" -msgstr "升級到最新版本的 Ubuntu" +msgid "Normal updates" +msgstr "安裝更新套件(_I)" #. TRANSLATORS: updates from an 'unknown' origin -#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255 +#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264 #, fuzzy msgid "Other updates" msgstr "安裝更新套件(_I)" -#: ../UpdateManager/UpdateManager.py:276 -msgid "Cannot install all available updates" -msgstr "無法安裝所有更新套件" - -#: ../UpdateManager/UpdateManager.py:277 -msgid "" -"Some of the updates require more extensive changes than expected.\n" -"\n" -"This usually means that you have enabled unoffical repositories, that it is " -"not fully upgraded from the last distribution release or that you run a " -"development release of the distribution.\n" -"\n" -"Would you like to perform a full distribution upgrade now?" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:460 #, python-format msgid "Version %s: \n" msgstr "版本 %s： \n" -#: ../UpdateManager/UpdateManager.py:535 +#: ../UpdateManager/UpdateManager.py:521 msgid "Downloading the list of changes..." msgstr "正在下載修改紀錄..." -#: ../UpdateManager/UpdateManager.py:559 -msgid "Select _None" +#: ../UpdateManager/UpdateManager.py:545 +msgid "_Uncheck All" msgstr "" -#: ../UpdateManager/UpdateManager.py:565 -msgid "Select _All" -msgstr "" +#: ../UpdateManager/UpdateManager.py:551 +#, fuzzy +msgid "_Check All" +msgstr "檢查(_C)" #. TRANSLATORS: download size is 0 -#: ../UpdateManager/UpdateManager.py:596 +#: ../UpdateManager/UpdateManager.py:582 msgid "None" msgstr "" #. TRANSLATORS: download size of very small updates -#: ../UpdateManager/UpdateManager.py:599 +#: ../UpdateManager/UpdateManager.py:585 msgid "1 KB" msgstr "" #. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../UpdateManager/UpdateManager.py:602 +#: ../UpdateManager/UpdateManager.py:588 #, python-format msgid "%.0f KB" msgstr "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/UpdateManager.py:605 +#: ../UpdateManager/UpdateManager.py:591 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: b stands for Bytes -#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647 +#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633 #, python-format msgid "Download size: %s" msgstr "下載大小：%s" -#: ../UpdateManager/UpdateManager.py:632 -msgid "Your system is up-to-date" -msgstr "系統已經在最新狀態" - -#: ../UpdateManager/UpdateManager.py:643 +#: ../UpdateManager/UpdateManager.py:629 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "您可以安裝 %s 個更新" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:676 +#: ../UpdateManager/UpdateManager.py:662 msgid "Please wait, this can take some time." msgstr "請稍候，這可能需要一點時間。" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:664 msgid "Update is complete" msgstr "更新完成" -#: ../UpdateManager/UpdateManager.py:830 +#: ../UpdateManager/UpdateManager.py:715 +#, fuzzy +msgid "Checking for updates" +msgstr "安裝更新套件(_I)" + +#: ../UpdateManager/UpdateManager.py:822 #, fuzzy, python-format msgid "From version %s to %s" msgstr "新版本：%s （大小：%s）" -#: ../UpdateManager/UpdateManager.py:834 +#: ../UpdateManager/UpdateManager.py:826 #, fuzzy, python-format msgid "Version %s" msgstr "版本 %s： \n" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:836 +#: ../UpdateManager/UpdateManager.py:828 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:846 +#: ../UpdateManager/UpdateManager.py:839 msgid "Your distribution is not supported anymore" msgstr "您正使用的發行版本已不再支援" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:840 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -955,17 +962,17 @@ msgstr "" "您不會再取得任何安全或重大更新，請升級到最新版本的 Ubuntu Linux。請參閱 " "http://www.ubuntu.com以取得更多升級資訊。" -#: ../UpdateManager/UpdateManager.py:866 +#: ../UpdateManager/UpdateManager.py:859 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "<b>有新的 distribution 發行版 '%s'</b>" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:901 +#: ../UpdateManager/UpdateManager.py:894 msgid "Software index is broken" msgstr "軟體索引損壞" -#: ../UpdateManager/UpdateManager.py:902 +#: ../UpdateManager/UpdateManager.py:895 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -986,88 +993,103 @@ msgstr "" "您的系統不會自動檢查更新。您可以在「系統」→「管理的→「軟體偏好設定」中設定。" #: ../data/glade/UpdateManager.glade.h:4 -msgid "" -"<big><b>Examining your system</b></big>\n" -"\n" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "<big><b>Keep your system up-to-date</b></big>" +msgstr "<big><b>將您的系統維持在最新狀態</b></big>" + +#: ../data/glade/UpdateManager.glade.h:5 +#, fuzzy +msgid "<big><b>Not all updates can be installed</b></big>" msgstr "" -"<big><b>正在檢測您的系統</b></big>\n" +"<big><b>掃描光碟時發生錯誤</b></big>\n" "\n" -"軟體更新會更正錯誤，排除安全弱點，並提功新功能." +"%s" -#: ../data/glade/UpdateManager.glade.h:7 -msgid "<big><b>Keep your system up-to-date</b></big>" -msgstr "<big><b>將您的系統維持在最新狀態</b></big>" +#: ../data/glade/UpdateManager.glade.h:6 +#, fuzzy +msgid "<big><b>Starting update manager</b></big>" +msgstr "<b><big>開始升級？</big></b>" -#: ../data/glade/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:7 msgid "Cancel _Download" msgstr "取消下載(_D)" -#: ../data/glade/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Changes" msgstr "修改紀錄" -#: ../data/glade/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes and description of the update" msgstr "" -#: ../data/glade/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:10 msgid "Chec_k" msgstr "檢查(_K)" -#: ../data/glade/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:11 msgid "Check the software channels for new updates" msgstr "檢查軟體來源有沒有更新套件" -#: ../data/glade/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Description" msgstr "詳細說明" -#: ../data/glade/UpdateManager.glade.h:14 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "發行說明" -#: ../data/glade/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:14 +msgid "" +"Run a distribution upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by an uncompleted upgrade, unofficial software packages " +"or by running a development version." +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:17 msgid "Show progress of single files" msgstr "顯示單一檔案的進度" -#: ../data/glade/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:18 msgid "Software Updates" msgstr "軟體更新" -#: ../data/glade/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:19 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "軟體更新會更正錯誤, 排除安全弱點, 並提功新功能." -#: ../data/glade/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:20 msgid "U_pgrade" msgstr "升級(_P)" -#: ../data/glade/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:21 msgid "Upgrade to the latest version of Ubuntu" msgstr "升級到最新版本的 Ubuntu" -#: ../data/glade/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Check" msgstr "檢查(_C)" -#: ../data/glade/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "_Distribution Upgrade" +msgstr "繼續升級(_R)" + +#: ../data/glade/UpdateManager.glade.h:24 msgid "_Hide this information in the future" msgstr "以後不要再顯示此訊息(_H)" -#: ../data/glade/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:25 msgid "_Install Updates" msgstr "安裝更新套件(_I)" -#: ../data/glade/UpdateManager.glade.h:23 +#: ../data/glade/UpdateManager.glade.h:26 #, fuzzy msgid "changes" msgstr "修改紀錄" -#: ../data/glade/UpdateManager.glade.h:24 +#: ../data/glade/UpdateManager.glade.h:27 msgid "updates" msgstr "" @@ -1175,11 +1197,12 @@ msgid "_Install security updates without confirmation" msgstr "無須確認便安裝安全性更新(_I)" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 +#, fuzzy msgid "" -"<b><big>The channel information is out-of-date</big></b>\n" +"<b><big>The information about available software is out-of-date</big></b>\n" "\n" -"You have to reload the channel information to install software and updates " -"from newly added or changed channels. \n" +"To install software and updates from newly added or changed sources, you " +"have to reload the information about available software.\n" "\n" "You need a working internet connection to continue." msgstr "" @@ -1213,10 +1236,10 @@ msgstr "<b>URI：</b>" #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the source that you want to add</b></" -"big>\n" +"<big><b>Enter the complete APT line of the repository that you want to add " +"as source</b></big>\n" "\n" -"The APT line includes the type, location and components of a source, for " +"The APT line includes the type, location and components of a repository, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>請輸入您想加入的完整的 APT 來源列</b></big>\n" @@ -1272,8 +1295,9 @@ msgid "Check for new distribution releases" msgstr "檢查有沒有新的發行版本" #: ../data/update-manager.schemas.in.h:3 +#, fuzzy msgid "" -"If automatic checking for updates is disabeld, you have to reload the " +"If automatic checking for updates is disabled, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." msgstr "" @@ -1293,8 +1317,9 @@ msgid "Stores the size of the update-manager dialog" msgstr "儲存 update-manager 對話視窗的大小" #: ../data/update-manager.schemas.in.h:7 +#, fuzzy msgid "" -"Stores the state of the expander that contains the list of changs and the " +"Stores the state of the expander that contains the list of changes and the " "description" msgstr "儲存包含修改紀錄及描述的 expander 的狀態" @@ -1320,212 +1345,189 @@ msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 更新" #. CompDescription -#: ../data/channels/Ubuntu.info.in:15 +#: ../data/channels/Ubuntu.info.in:13 #, fuzzy msgid "Community maintained" msgstr "協力維護軟體 (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:20 +#: ../data/channels/Ubuntu.info.in:17 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:19 #, fuzzy msgid "Restricted software" msgstr "非自由軟體 (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:29 +#: ../data/channels/Ubuntu.info.in:25 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:71 +#: ../data/channels/Ubuntu.info.in:59 #, fuzzy msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 ‘Dapper Drake‘" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:75 +#: ../data/channels/Ubuntu.info.in:62 msgid "By Canonical supported Open Source software" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:78 +#: ../data/channels/Ubuntu.info.in:64 #, fuzzy msgid "Community maintained (universe)" msgstr "協力維護軟體 (Universe)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:79 +#: ../data/channels/Ubuntu.info.in:65 #, fuzzy msgid "Community maintained Open Source software" msgstr "協力維護軟體 (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:82 +#: ../data/channels/Ubuntu.info.in:67 #, fuzzy msgid "Non-free drivers" msgstr "非自由軟體 (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:83 +#: ../data/channels/Ubuntu.info.in:68 msgid "Proprietary drivers for devices " msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:86 +#: ../data/channels/Ubuntu.info.in:70 #, fuzzy msgid "Restricted software (Multiverse)" msgstr "非自由軟體 (Multiverse)" #. CompDescriptionLong -#: ../data/channels/Ubuntu.info.in:87 +#: ../data/channels/Ubuntu.info.in:71 msgid "By copyright or legal issues restricted software" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:92 +#: ../data/channels/Ubuntu.info.in:76 #, fuzzy msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 ‘Dapper Drake‘" #. Description -#: ../data/channels/Ubuntu.info.in:106 -#, fuzzy -msgid "Important security updates" -msgstr "Ubuntu 5.10 安全性更新" - -#. Description -#: ../data/channels/Ubuntu.info.in:113 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/channels/Ubuntu.info.in:120 -#, fuzzy -msgid "Proposed updates" -msgstr "安裝更新套件(_I)" - -#. Description -#: ../data/channels/Ubuntu.info.in:127 +#: ../data/channels/Ubuntu.info.in:103 msgid "Backported updates" msgstr "" #. Description -#: ../data/channels/Ubuntu.info.in:134 +#: ../data/channels/Ubuntu.info.in:110 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 ‘Breezy Badger’" -#. CompDescription -#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51 -msgid "Officially supported" -msgstr "官方支援" - #. Description -#: ../data/channels/Ubuntu.info.in:151 +#: ../data/channels/Ubuntu.info.in:123 #, fuzzy msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 ‘Breezy Badger’" #. Description -#: ../data/channels/Ubuntu.info.in:165 +#: ../data/channels/Ubuntu.info.in:135 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 安全性更新" #. Description -#: ../data/channels/Ubuntu.info.in:172 +#: ../data/channels/Ubuntu.info.in:140 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 更新" #. Description -#: ../data/channels/Ubuntu.info.in:179 +#: ../data/channels/Ubuntu.info.in:145 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 回移套件" #. Description -#: ../data/channels/Ubuntu.info.in:186 +#: ../data/channels/Ubuntu.info.in:152 #, fuzzy msgid "Ubuntu 5.04 'Hoary Hedgehog'" msgstr "Ubuntu 5.10 ‘Breezy Badger’" #. Description -#: ../data/channels/Ubuntu.info.in:203 +#: ../data/channels/Ubuntu.info.in:165 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:207 -#, fuzzy -msgid "Oficially supported" +#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51 +msgid "Officially supported" msgstr "官方支援" #. Description -#: ../data/channels/Ubuntu.info.in:217 +#: ../data/channels/Ubuntu.info.in:177 #, fuzzy msgid "Ubuntu 5.04 Security Updates" msgstr "Ubuntu 5.10 安全性更新" #. Description -#: ../data/channels/Ubuntu.info.in:224 +#: ../data/channels/Ubuntu.info.in:182 #, fuzzy msgid "Ubuntu 5.04 Updates" msgstr "Ubuntu 5.10 更新" #. Description -#: ../data/channels/Ubuntu.info.in:231 +#: ../data/channels/Ubuntu.info.in:187 #, fuzzy msgid "Ubuntu 5.04 Backports" msgstr "Ubuntu 5.10 回移套件" #. Description -#: ../data/channels/Ubuntu.info.in:237 +#: ../data/channels/Ubuntu.info.in:193 #, fuzzy msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "Ubuntu 5.10 ‘Breezy Badger’" #. CompDescription -#: ../data/channels/Ubuntu.info.in:246 +#: ../data/channels/Ubuntu.info.in:199 msgid "Community maintained (Universe)" msgstr "協力維護軟體 (Universe)" #. CompDescription -#: ../data/channels/Ubuntu.info.in:249 +#: ../data/channels/Ubuntu.info.in:201 msgid "Non-free (Multiverse)" msgstr "非自由軟體 (Multiverse)" #. Description -#: ../data/channels/Ubuntu.info.in:254 +#: ../data/channels/Ubuntu.info.in:206 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../data/channels/Ubuntu.info.in:258 +#: ../data/channels/Ubuntu.info.in:209 #, fuzzy -msgid "No longer oficially supported" +msgid "No longer officially supported" msgstr "有些軟體不再有官方支援" #. CompDescription -#: ../data/channels/Ubuntu.info.in:261 +#: ../data/channels/Ubuntu.info.in:211 msgid "Restricted copyright" msgstr "版權受限制" #. Description -#: ../data/channels/Ubuntu.info.in:268 +#: ../data/channels/Ubuntu.info.in:218 #, fuzzy msgid "Ubuntu 4.10 Security Updates" msgstr "Ubuntu 5.10 安全性更新" #. Description -#: ../data/channels/Ubuntu.info.in:275 +#: ../data/channels/Ubuntu.info.in:223 #, fuzzy msgid "Ubuntu 4.10 Updates" msgstr "Ubuntu 5.10 更新" #. Description -#: ../data/channels/Ubuntu.info.in:282 +#: ../data/channels/Ubuntu.info.in:228 #, fuzzy msgid "Ubuntu 4.10 Backports" msgstr "Ubuntu 5.10 回移套件" @@ -1576,6 +1578,46 @@ msgstr "符合 DFSG 的軟體，但有依賴於非自由軟體" msgid "Non-DFSG-compatible Software" msgstr "不符合 DFSG 的軟體" +#~ msgid "Some software no longer officially supported" +#~ msgstr "有些軟體不再有官方支援" + +#~ msgid "Could not find any upgrades" +#~ msgstr "無法找到任何升級" + +#~ msgid "Your system has already been upgraded." +#~ msgstr "系統升級已經完成。" + +#, fuzzy +#~ msgid "" +#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" +#~ msgstr "" +#~ "<span weight=\"bold\" size=\"x-large\">升級至 Ubuntu 6.06 LTS</span>" + +#, fuzzy +#~ msgid "Important security updates of Ubuntu" +#~ msgstr "Ubuntu 5.10 安全性更新" + +#, fuzzy +#~ msgid "Updates of Ubuntu" +#~ msgstr "升級到最新版本的 Ubuntu" + +#~ msgid "Cannot install all available updates" +#~ msgstr "無法安裝所有更新套件" + +#~ msgid "" +#~ "<big><b>Examining your system</b></big>\n" +#~ "\n" +#~ "Software updates correct errors, eliminate security vulnerabilities and " +#~ "provide new features." +#~ msgstr "" +#~ "<big><b>正在檢測您的系統</b></big>\n" +#~ "\n" +#~ "軟體更新會更正錯誤，排除安全弱點，並提功新功能." + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "官方支援" + #~ msgid "" #~ "Some updates require the removal of further software. Use the function " #~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo " |