r16199 - in /packages/experimental/system-config-printer: ./ debian/ debian/patches/
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Sun Jun 8 12:52:41 UTC 2008
Author: joss
Date: Sun Jun 8 12:52:40 2008
New Revision: 16199
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16199
Log:
* New upstream release.
* Update watch file and get-orig-source URL.
* Target at experimental; include check-dist.mk.
* 02_fr_po.patch: updated translations for the new version.
* 04_de_po.patch: dropped, included upstream.
* 05_vi_po.patch, 06_ru_po.patch, 07_es_po.patch: updated to apply
cleanly.
* 08_stock_icons.patch: update for the new version.
* 12_remove_redhat.patch: added; remove redhat- from the .desktop
names and X-RedHat-Base from the categories.
* postinst: remove the old redhat-print-applet.desktop file.
* Remove useless README.Debian.
* Split utility modules in a python-cupsutils package, making them
public. They will be used by hal-cups-utils.
* Remove the wrapper scripts in /usr/bin, put the python scripts
directly.
* 13_python_paths.patch: new patch, modify python search paths and
imports according to these changes.
* 11_use_gksu.patch: disable startup notification, which is broken by
gksu.
Added:
packages/experimental/system-config-printer/
- copied from r16196, packages/unstable/system-config-printer/
packages/experimental/system-config-printer/debian/install
packages/experimental/system-config-printer/debian/patches/12_remove_redhat.patch
packages/experimental/system-config-printer/debian/patches/13_python_paths.patch
packages/experimental/system-config-printer/debian/postinst
packages/experimental/system-config-printer/debian/python-cupsutils.install
Removed:
packages/experimental/system-config-printer/debian/README.Debian
packages/experimental/system-config-printer/debian/patches/04_de_po.patch
Modified:
packages/experimental/system-config-printer/debian/changelog
packages/experimental/system-config-printer/debian/control
packages/experimental/system-config-printer/debian/control.in
packages/experimental/system-config-printer/debian/patches/02_fr_po.patch
packages/experimental/system-config-printer/debian/patches/05_vi_po.patch
packages/experimental/system-config-printer/debian/patches/06_ru_po.patch
packages/experimental/system-config-printer/debian/patches/07_es_po.patch
packages/experimental/system-config-printer/debian/patches/08_stock_icons.patch
packages/experimental/system-config-printer/debian/patches/11_use_gksu.patch
packages/experimental/system-config-printer/debian/rules
packages/experimental/system-config-printer/debian/watch
Modified: packages/experimental/system-config-printer/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/system-config-printer/debian/changelog?rev=16199&op=diff
==============================================================================
--- packages/experimental/system-config-printer/debian/changelog (original)
+++ packages/experimental/system-config-printer/debian/changelog Sun Jun 8 12:52:40 2008
@@ -1,3 +1,28 @@
+system-config-printer (1.0.0-1) experimental; urgency=low
+
+ * New upstream release.
+ * Update watch file and get-orig-source URL.
+ * Target at experimental; include check-dist.mk.
+ * 02_fr_po.patch: updated translations for the new version.
+ * 04_de_po.patch: dropped, included upstream.
+ * 05_vi_po.patch, 06_ru_po.patch, 07_es_po.patch: updated to apply
+ cleanly.
+ * 08_stock_icons.patch: update for the new version.
+ * 12_remove_redhat.patch: added; remove redhat- from the .desktop
+ names and X-RedHat-Base from the categories.
+ * postinst: remove the old redhat-print-applet.desktop file.
+ * Remove useless README.Debian.
+ * Split utility modules in a python-cupsutils package, making them
+ public. They will be used by hal-cups-utils.
+ * Remove the wrapper scripts in /usr/bin, put the python scripts
+ directly.
+ * 13_python_paths.patch: new patch, modify python search paths and
+ imports according to these changes.
+ * 11_use_gksu.patch: disable startup notification, which is broken by
+ gksu.
+
+ -- Josselin Mouette <joss at debian.org> Sun, 08 Jun 2008 13:18:20 +0200
+
system-config-printer (0.7.81-4) unstable; urgency=low
* 07_es_po.patch: remove ISO8859 encoded text, leading to a crash when
Modified: packages/experimental/system-config-printer/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/system-config-printer/debian/control?rev=16199&op=diff
==============================================================================
--- packages/experimental/system-config-printer/debian/control (original)
+++ packages/experimental/system-config-printer/debian/control Sun Jun 8 12:52:40 2008
@@ -5,7 +5,7 @@
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>
Build-Depends: cdbs (>= 0.4.43),
debhelper (>= 5.0.37.2),
- python-support,
+ python-support (>= 0.7.1),
python-all-dev (>= 2.3.5-11),
libxml-parser-perl,
desktop-file-utils,
@@ -15,11 +15,10 @@
Package: system-config-printer
Architecture: all
-Depends: ${shlibs:Depends},
- ${python:Depends},
+Depends: ${python:Depends},
python-cups (>= 1.9.27),
+ python-cupsutils (= ${binary:Version}),
python-dbus,
- python-elementtree | python (>= 2.5),
python-gtk2,
python-glade2,
python-gnome2,
@@ -33,3 +32,13 @@
.
In terms of features, it aims to be as complete as the CUPS web
administration tool, while being integrated to the desktop.
+
+Package: python-cupsutils
+Architecture: all
+Depends: ${python:Depends},
+ python-cups (>= 1.9.27),
+ python-elementtree | python (>= 2.5)
+Description: Python utility modules around the CUPS printing system
+ These Python modules, that come from the system-config-printer
+ distribution, help building applications and utilities around the CUPS
+ Python bindings.
Modified: packages/experimental/system-config-printer/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/system-config-printer/debian/control.in?rev=16199&op=diff
==============================================================================
--- packages/experimental/system-config-printer/debian/control.in (original)
+++ packages/experimental/system-config-printer/debian/control.in Sun Jun 8 12:52:40 2008
@@ -5,7 +5,7 @@
Uploaders: @GNOME_TEAM@
Build-Depends: cdbs (>= 0.4.43),
debhelper (>= 5.0.37.2),
- python-support,
+ python-support (>= 0.7.1),
python-all-dev (>= 2.3.5-11),
libxml-parser-perl,
desktop-file-utils,
@@ -15,11 +15,10 @@
Package: system-config-printer
Architecture: all
-Depends: ${shlibs:Depends},
- ${python:Depends},
+Depends: ${python:Depends},
python-cups (>= 1.9.27),
+ python-cupsutils (= ${binary:Version}),
python-dbus,
- python-elementtree | python (>= 2.5),
python-gtk2,
python-glade2,
python-gnome2,
@@ -33,3 +32,13 @@
.
In terms of features, it aims to be as complete as the CUPS web
administration tool, while being integrated to the desktop.
+
+Package: python-cupsutils
+Architecture: all
+Depends: ${python:Depends},
+ python-cups (>= 1.9.27),
+ python-elementtree | python (>= 2.5)
+Description: Python utility modules around the CUPS printing system
+ These Python modules, that come from the system-config-printer
+ distribution, help building applications and utilities around the CUPS
+ Python bindings.
Added: packages/experimental/system-config-printer/debian/install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/system-config-printer/debian/install?rev=16199&op=file
==============================================================================
--- packages/experimental/system-config-printer/debian/install (added)
+++ packages/experimental/system-config-printer/debian/install Sun Jun 8 12:52:40 2008
@@ -1,0 +1,9 @@
+debian/tmp/etc
+debian/tmp/usr/share/applications
+debian/tmp/usr/share/locale
+debian/tmp/usr/share/man
+debian/tmp/usr/share/system-config-printer/applet.py /usr/bin
+debian/tmp/usr/share/system-config-printer/system-config-printer.py /usr/bin
+debian/tmp/usr/share/system-config-printer/my-default-printer.py /usr/bin
+debian/tmp/usr/share/system-config-printer/*.glade
+debian/tmp/usr/share/system-config-printer/*/
Modified: packages/experimental/system-config-printer/debian/patches/02_fr_po.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/system-config-printer/debian/patches/02_fr_po.patch?rev=16199&op=diff
==============================================================================
--- packages/experimental/system-config-printer/debian/patches/02_fr_po.patch (original)
+++ packages/experimental/system-config-printer/debian/patches/02_fr_po.patch Sun Jun 8 12:52:40 2008
@@ -1,1382 +1,515 @@
---- po/fr.po.old 2008-02-17 11:23:11.660206097 +0100
-+++ po/fr.po 2008-02-17 12:49:55.640207495 +0100
-@@ -11,14 +11,15 @@
- # Canniot Thomas <thomas.canniot at laposte.net>, 2007.
- # Alain PORTAL <aportal at univ-montp2.fr>, 2007.
- # Jonathan Ernst <jonathan at ernstfamily.ch>, 2007.
-+# Josselin Mouette <joss at debian.org>, 2007.
- #
- msgid ""
- msgstr ""
- "Project-Id-Version: fr\n"
+--- po/fr.po.orig 2008-06-08 14:46:14.093289162 +0200
++++ po/fr.po 2008-06-08 14:47:34.457291500 +0200
+@@ -21,7 +21,7 @@
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/bugzilla\n"
- "POT-Creation-Date: 2008-02-13 18:13+0000\n"
--"PO-Revision-Date: 2007-07-01 15:20+0200\n"
--"Last-Translator: Alain PORTAL <aportal at univ-montp2.fr>\n"
-+"PO-Revision-Date: 2008-02-17 15:20+0200\n"
+ "POT-Creation-Date: 2008-05-27 18:07+0100\n"
+ "PO-Revision-Date: 2008-03-22 15:28+0100\n"
+-"Last-Translator: Thomas Canniot <mrtom at fedoraproject.org>\n"
+"Last-Translator: Josselin Mouette <joss at debian.org>\n"
- "Language-Team: Français <traduc at traduc.org>\n"
+ "Language-Team: Français <fedora-trans-fr at redhat.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-@@ -105,7 +106,7 @@
-
- #: ../system-config-printer.py:374 ../system-config-printer.glade.h:107
- msgid "Downloadable Drivers"
--msgstr ""
-+msgstr "Pilotes pouvant être téléchargés"
-
- #: ../system-config-printer.py:375
- msgid "Users"
-@@ -113,7 +114,7 @@
-
- #: ../system-config-printer.py:402
- msgid "Automatic rotation"
--msgstr ""
-+msgstr "Rotation automatique"
-
- #: ../system-config-printer.py:556
+@@ -38,9 +38,8 @@
+ msgstr "Mot de passe :"
+
+ #: ../authconn.py:32
+-#, fuzzy
+ msgid "Domain:"
+-msgstr "Marge haute :"
++msgstr "Domaine :"
+
+ #: ../authconn.py:34
+ msgid "Authentication"
+@@ -141,9 +140,8 @@
+ msgstr "Tâche"
+
+ #: ../jobviewer.py:90
+-#, fuzzy
+ msgid "User"
+-msgstr "Utilisateurs"
++msgstr "Utilisateur"
+
+ #: ../jobviewer.py:91 ../troubleshoot/PrintTestPage.py:82
+ msgid "Document"
+@@ -170,21 +168,20 @@
+ #: ../jobviewer.py:125
#, python-format
-@@ -127,7 +128,7 @@
-
- #: ../system-config-printer.py:561 ../system-config-printer.py:1273
- msgid "Not connected"
--msgstr "Pas connecté(e)"
-+msgstr "Non connecté(e)"
-
- #: ../system-config-printer.py:672
- msgid "Local Printers"
-@@ -156,7 +157,7 @@
-
- #: ../system-config-printer.py:1202
- msgid "Installable Options"
--msgstr "Options installables"
-+msgstr "Extensions de l'imprimante"
-
- #: ../system-config-printer.py:1203 ../system-config-printer.glade.h:209
- msgid "Printer Options"
-@@ -222,7 +223,7 @@
- #: ../system-config-printer.py:1275
+ msgid "my jobs on %s"
+-msgstr ""
++msgstr "mes tâches sur %s"
+
+ #: ../jobviewer.py:127
+ msgid "my jobs"
+-msgstr ""
++msgstr "mes tâches"
+
+ #: ../jobviewer.py:132
+-#, fuzzy
+ msgid "all jobs"
+-msgstr "Annuler toutes les tâches d'impression"
++msgstr "toutes les tâches"
+
+ #: ../jobviewer.py:133
+-#, fuzzy, python-format
++#, python-format
+ msgid "Document Print Status (%s)"
+-msgstr "Ãtat d'impression du document"
++msgstr "Ãtat d'impression du document (%s)"
+
+ #: ../jobviewer.py:166
+ msgid "Message"
+@@ -250,7 +247,7 @@
+ #: ../jobviewer.py:439
#, python-format
- msgid "status %d"
--msgstr "statut de %d"
-+msgstr "état de %d"
-
- #: ../system-config-printer.py:1279
+ msgid "Authentication required for printing document `%s' (job %d)"
+-msgstr ""
++msgstr "Authentification requise pour imprimer le document « %s » (tâche %d)"
+
+ #: ../jobviewer.py:639
+ msgid "No documents queued"
+@@ -266,34 +263,33 @@
+ msgstr "%d documents dans la file d'attente"
+
+ #: ../jobviewer.py:869
+-#, fuzzy, python-format
++#, python-format
+ msgid "There was a problem sending document `%s' (job %d) to the printer."
+-msgstr "Il y a eu un problème lors de la connexion au serveur CUPS."
++msgstr "Il y a eu un problème lors de l'envoi du document « %s » (tâche %d) à l'imprimante."
+
+ #: ../jobviewer.py:872
+-#, fuzzy, python-format
++#, python-format
+ msgid "There was a problem processing document `%s' (job %d)."
+-msgstr "Il y a problème sur l'imprimante « %s »."
++msgstr "Il y a eu un problème lors du traitement du document « %s » (tâche %d)."
+
+ #. Give up and use the untranslated provided.
+ #: ../jobviewer.py:876
+-#, fuzzy, python-format
++#, python-format
+ msgid "There was a problem printing document `%s' (job %d): `%s'."
+-msgstr "Il y a problème sur l'imprimante « %s »."
++msgstr "Il y a eu un problème lors de l'impression du document « %s » (tâche %d) : « %s »."
+
+ #: ../jobviewer.py:881 ../jobviewer.py:897
+-#, fuzzy
+ msgid "Print Error"
+-msgstr "Erreur de l'imprimante"
++msgstr "Erreur d'impression"
+
+ #: ../jobviewer.py:882
+ msgid "_Diagnose"
+-msgstr ""
++msgstr "_Diagnostiquer"
+
+ #: ../jobviewer.py:903
+-#, fuzzy, python-format
++#, python-format
+ msgid "The printer called `%s' has been disabled."
+-msgstr "La file d'attente « %s » n'est pas activée."
++msgstr "L'imprimante « %s » a été désactivée."
+
+ #: ../my-default-printer.py:141 ../my-default-printer.desktop.in.h:1
+ msgid "Default Printer"
+@@ -318,15 +314,13 @@
+ msgstr "Conflits avec :"
+
+ #: ../system-config-printer.py:275
+-#, fuzzy
+ msgid "Class"
+-msgstr "Nouveau groupe"
++msgstr "Groupe"
+
+ #. Set up "Problems?" link button
+ #: ../system-config-printer.py:305
+-#, fuzzy
+ msgid "Problems?"
+-msgstr "Rechercher"
++msgstr "Problèmes ?"
+
+ #: ../system-config-printer.py:345 ../system-config-printer.py:347
+ msgid "Members of this class"
+@@ -365,9 +359,9 @@
+ msgstr "Rotation automatique"
+
+ #: ../system-config-printer.py:554
+-#, fuzzy, python-format
++#, python-format
+ msgid "Printer Properties - `%s' on %s"
+-msgstr "Rapport de l'imprimante"
++msgstr "Propriétés de l'imprimante - « %s » sur %s"
+
+ #: ../system-config-printer.py:657
#, python-format
-@@ -260,9 +261,9 @@
- "parce que l'imprimante n'est pas partagée."
-
- #: ../system-config-printer.py:1553
--#, fuzzy, python-format
-+#, python-format
- msgid "Maintenance command submitted as job %d"
--msgstr "Page de test soumise comme tâche d'impression %d"
-+msgstr "Commande de maintenance soumise comme tâche d'impression %d"
-
- #: ../system-config-printer.py:1649 ../system-config-printer.py:1791
- msgid "Error"
-@@ -283,7 +284,7 @@
- #: ../system-config-printer.py:1792
+@@ -380,24 +374,20 @@
+ msgstr "Connecté(e) à %s"
+
+ #: ../system-config-printer.py:751
+-#, fuzzy
+ msgid "Remote class"
+-msgstr "Groupes distants"
++msgstr "Groupe distant"
+
+ #: ../system-config-printer.py:753
+-#, fuzzy
+ msgid "Remote printer"
+-msgstr "Imprimantes distantes"
++msgstr "Imprimante distante"
+
+ #: ../system-config-printer.py:757
+-#, fuzzy
+ msgid "Local class"
+-msgstr "Groupes locaux"
++msgstr "Groupe local"
+
+ #: ../system-config-printer.py:759
+-#, fuzzy
+ msgid "Local printer"
+-msgstr "Imprimantes locales"
++msgstr "Imprimante locale"
+
+ #: ../system-config-printer.py:829
#, python-format
- msgid "Option '%s' has value '%s' and cannot be edited."
--msgstr ""
-+msgstr "L'option '%s' a pour valeur '%s' et ne peut pas être modifiée"
-
- #: ../system-config-printer.py:1832
- msgid "Cancel Tests"
-@@ -298,12 +299,12 @@
- #: ../system-config-printer.py:2066
- #, python-format
- msgid "Really delete printer %s?"
--msgstr "Voulez-vous réellement effacer %s ?"
-+msgstr "Voulez-vous réellement supprimer l'imprimante %s ?"
-
- #: ../system-config-printer.py:2068
- #, python-format
- msgid "Really delete class %s?"
--msgstr "Voulez-vous réellement effacer %s ?"
-+msgstr "Voulez-vous réellement supprimer la classe %s ?"
-
- #. SMB list columns
- #: ../system-config-printer.py:2345
-@@ -317,24 +318,24 @@
- #. IPP list columns
- #: ../system-config-printer.py:2367
- msgid "Queue"
--msgstr ""
-+msgstr "File"
-
- #: ../system-config-printer.py:2381
--#, fuzzy
- msgid ""
- "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
- "PPD.GZ)"
--msgstr "Description de l'imprimante PostScript (*.ppd[.gz])"
-+msgstr ""
-+"Fichier de description de l'imprimante PostScript (*.ppd, *.PPD, *.ppd.gz, "
-+"*.PPD.gz, *.PPD.GZ)"
-
- #: ../system-config-printer.py:2390
- msgid "All files (*)"
--msgstr ""
-+msgstr "Tous les fichiers (*)"
-
- #: ../system-config-printer.py:2425 ../system-config-printer.py:3741
- #: ../system-config-printer.py:3775
--#, fuzzy
- msgid "Search"
--msgstr "Nouveau nom pour l'imprimante"
-+msgstr "Recherche"
-
- #: ../system-config-printer.py:2428 ../system-config-printer.glade.h:155
- msgid "New Printer"
-@@ -355,16 +356,15 @@
- #: ../system-config-printer.py:2551 ../system-config-printer.py:2775
- #: ../system-config-printer.py:2941 ../system-config-printer.py:3764
- msgid "Searching"
--msgstr ""
-+msgstr "Recherche"
-
- #: ../system-config-printer.py:2552 ../system-config-printer.py:2776
- msgid "Searching for drivers"
--msgstr ""
-+msgstr "Recherche de pilotes"
-
- #: ../system-config-printer.py:2942
--#, fuzzy
+@@ -478,19 +468,18 @@
+ msgstr "L'option « %s » a pour valeur « %s » et ne peut pas être modifiée."
+
+ #: ../system-config-printer.py:2045
+-#, fuzzy, python-format
++#, python-format
+ msgid "Really delete class `%s'?"
+-msgstr "Voulez-vous réellement supprimer la classe %s ?"
++msgstr "Voulez-vous réellement supprimer le groupe « %s » ?"
+
+ #: ../system-config-printer.py:2047
+-#, fuzzy, python-format
++#, python-format
+ msgid "Really delete printer `%s'?"
+-msgstr "Voulez-vous réellement supprimer l'imprimante %s ?"
++msgstr "Voulez-vous réellement supprimer l'imprimante « %s » ?"
+
+ #: ../system-config-printer.py:2049
+-#, fuzzy
+ msgid "Really delete selected destinations?"
+-msgstr "Voulez-vous réellement supprimer l'imprimante %s ?"
++msgstr "Voulez-vous réellement supprimer les destinations sélectionnées ?"
+
+ #: ../system-config-printer.py:2389 ../system-config-printer.py:2399
+ msgid "Share"
+@@ -549,13 +538,15 @@
+
+ #: ../system-config-printer.py:2721
+ msgid "Fax"
+-msgstr ""
++msgstr "Fax"
+
+ #: ../system-config-printer.py:2722
+ msgid ""
+ "This printer supports both printing and sending faxes. Which functionality "
+ "should be used for this queue?"
+ msgstr ""
++"Cette imprimante peut à la fois imprimer et envoyer des fax. Laquelle de ces "
++"fonctions devrait être utilisée pour cette file ?"
+
+ #: ../system-config-printer.py:3059
msgid "Searching for printers"
--msgstr "Nouveau nom pour l'imprimante"
-+msgstr "Recherche d'imprimantes"
-
- #: ../system-config-printer.py:3160
- msgid "Other"
-@@ -375,9 +375,8 @@
- msgstr " (Actuel)"
-
- #: ../system-config-printer.py:3188 ../system-config-printer.py:3449
--#, fuzzy
- msgid "Scanning..."
--msgstr "Mise à l'échelle :"
-+msgstr "Analyse..."
-
- #: ../system-config-printer.py:3360 ../system-config-printer.py:3427
- msgid "Verified"
-@@ -397,15 +396,15 @@
-
- #: ../system-config-printer.py:3483
- msgid "It is not possible to obtain a list of queues from this host."
--msgstr ""
-+msgstr "Impossible d'obtenir la liste des files depuis ce serveur."
-
- #: ../system-config-printer.py:3487
- msgid "No queues"
--msgstr ""
-+msgstr "Pas de files"
-
- #: ../system-config-printer.py:3488
- msgid "There are no queues available."
--msgstr ""
-+msgstr "Aucune file disponible."
-
- #: ../system-config-printer.py:3545
- msgid "A printer connected to the parallel port."
-@@ -438,13 +437,12 @@
- "l'anglais Hardware Abstraction Layer)."
-
- #: ../system-config-printer.py:3787
--#, fuzzy
+@@ -628,9 +619,7 @@
+
+ #: ../system-config-printer.py:3871
+ msgid "Local printer detected by the Hardware Abstraction Layer (HAL)."
+-msgstr ""
+-"Imprimante locale détectée par la couche d'abstraction matériel (HAL, de "
+-"l'anglais Hardware Abstraction Layer)."
++msgstr "Imprimante locale détectée automatiquement par HAL."
+
+ #: ../system-config-printer.py:4115
msgid "-- Select printer model --"
--msgstr "Sélectionner l'imprimante depuis la base de données"
-+msgstr "-- Sélectionner un modèle d'imprimante --"
-
- #: ../system-config-printer.py:3789
- msgid "-- No matches found --"
--msgstr ""
-+msgstr "-- Aucune correspondance trouvée --"
-
- #: ../system-config-printer.py:3954
- msgid " (recommended)"
-@@ -455,22 +453,20 @@
- msgstr "Ce PPD est généré par foomatic."
-
- #: ../system-config-printer.py:3994
--#, fuzzy
- msgid "OpenPrinting"
--msgstr "Impression"
-+msgstr "OpenPrinting"
-
- #: ../system-config-printer.py:3996
- msgid "Distributable"
--msgstr ""
-+msgstr "Redistribuable"
-
- #: ../system-config-printer.py:3998
--#, fuzzy
- msgid "None"
--msgstr "aucun"
-+msgstr "Aucune"
-
- #: ../system-config-printer.py:4006
- msgid "Not specified."
--msgstr ""
-+msgstr "Non spécifié."
-
- #. Foomatic database problem of some sort.
- #: ../system-config-printer.py:4033
-@@ -488,7 +484,7 @@
- #: ../system-config-printer.py:4044
- #, python-format
- msgid "You will need to install the '%s' package in order to use this driver."
--msgstr "Vous devrez installer le paquetage « %s » pour utiliser ce pilote."
-+msgstr "Vous devrez installer le paquet « %s » pour utiliser ce pilote."
-
- #. This error came from trying to open the PPD file.
- #: ../system-config-printer.py:4051
-@@ -498,44 +494,40 @@
- #: ../system-config-printer.py:4053
- msgid "Failed to read PPD file. Possible reason follows:"
- msgstr ""
--"Impossible de lire le fichier PPD. Ceci est peut-être dû aux raisons "
-+"Impossible de lire le fichier PPD. Ceci peut être du aux raisons "
- "suivantes :"
-
- #. Failed to get PPD downloaded from OpenPrinting XXX
- #: ../system-config-printer.py:4064
- msgid "Downloadable drivers"
--msgstr ""
-+msgstr "Pilotes pouvant être téléchargés"
-
- #: ../system-config-printer.py:4065
- msgid "Support for downloadable drivers is not yet completed."
--msgstr ""
-+msgstr "Le support pour le téléchargement des pilotes n'est pas encore complet."
-
- #: ../system-config-printer.py:4115 ../system-config-printer.py:4152
--#, fuzzy
+@@ -700,7 +689,7 @@
+
+ #: ../system-config-printer.py:4414
+ msgid "Failed to download PPD."
+-msgstr ""
++msgstr "Ãchec du téléchargement du fichier PPD."
+
+ #: ../system-config-printer.py:4450 ../system-config-printer.py:4488
msgid "No Installable Options"
--msgstr "Options installables"
-+msgstr "Aucune extension disponible"
-
- #: ../system-config-printer.py:4199
--#, fuzzy
- msgid "Adding"
--msgstr "En attente"
-+msgstr "Ajout"
-
- #: ../system-config-printer.py:4200
--#, fuzzy
- msgid "Adding printer"
--msgstr "Configurez les imprimantes"
-+msgstr "Ajout d'imprimante"
-
- #: ../system-config-printer.py:4352
--#, fuzzy
- msgid "Install driver"
--msgstr "Chercher le pilote"
-+msgstr "Installer le pilote"
-
- #: ../system-config-printer.py:4353
--#, fuzzy, python-format
-+#, python-format
- msgid "Printer '%s' requires the %s package but it is not currently installed."
- msgstr ""
--"L'imprimante « %s » a besoin du paquetage %s mais celui-ci n'est pas "
--"installé. Veuillez l'installer avant d'utiliser cette imprimante."
-+"L'imprimante « %s » a besoin du paquet %s mais celui-ci n'est pas "
-+"installé."
-
- #: ../system-config-printer.py:4360
- msgid "Missing driver"
-@@ -555,16 +547,16 @@
- "To start this tool, select System->Administration->Printing from the main "
- "menu."
- msgstr ""
-+"Pour démarrer cet outils, sélectionnez Système->Administration->Impression "
-+"depuis le menu principal."
-
- #: ../troubleshoot.py:56
--#, fuzzy
- msgid "Authentication"
--msgstr "<b>Authentification</b>"
-+msgstr "Authentification"
-
- #: ../troubleshoot.py:71
--#, fuzzy
- msgid "Password required"
--msgstr "Mise à jour requise"
-+msgstr "Mot de passe requis"
-
- #: ../troubleshoot.py:79 ../system-config-printer.glade.h:195
- #: ../applet.glade.h:5
-@@ -573,136 +565,135 @@
-
- #: ../troubleshoot.py:104
- msgid "Printing troubleshooter"
--msgstr ""
-+msgstr "Dépanneur d'impression"
-
- #: ../troubleshoot.py:401
- msgid "Trouble-shooting Printing"
--msgstr ""
-+msgstr "Dépannage des problèmes d'impression"
-
- #: ../troubleshoot.py:403
- msgid ""
- "In the next few screens I will ask you some questions about your problem "
- "with printing. Based on your answers I will try to suggest a solution."
- msgstr ""
-+"Sur les prochains écrans, je vais vous poser quelques questions sur "
-+"votre problème d'impression. à partir de vos réponses, je vais tenter de "
-+"suggérer une solution."
-
- #: ../troubleshoot.py:407
- msgid "Click 'Forward' to begin."
--msgstr ""
-+msgstr "Cliquez sur « Suivant » pour commencer."
-
- #: ../troubleshoot.py:418
- msgid "Sorry!"
--msgstr ""
-+msgstr "Désolé !"
-
- #: ../troubleshoot.py:419
- msgid ""
- "I have not been able to work out what the problem is, but I have collected "
- "some useful information to put in a bug report."
- msgstr ""
-+"Je n'ai pas pu déterminer quel est le problème, mais j'ai pu réunir des "
-+"informations utiles pour la rédaction d'un rapport de bogue."
-
- #: ../troubleshoot.py:488
--#, fuzzy
- msgid "Queue Not Accepting Jobs"
--msgstr "Validation des tâches d'impression"
-+msgstr "La file n'accepte pas de tâches"
-
- #: ../troubleshoot.py:489
--#, fuzzy
- msgid "The CUPS printer on the server is not accepting jobs."
--msgstr "Ce partage d'imprimante n'est pas accessible."
-+msgstr "L'imprimante CUPS sur ce serveur n'accepte pas les tâches."
-
- #: ../troubleshoot.py:513 ../troubleshoot.py:1259
- msgid "Queue Not Enabled"
--msgstr ""
-+msgstr "File désactivée"
-
- #: ../troubleshoot.py:514
--#, fuzzy
- msgid "The CUPS printer on the server is not enabled."
--msgstr "Ce partage d'imprimante n'est pas accessible."
-+msgstr "L'imprimante CUPS sur ce serveur est désactivée."
-
- #: ../troubleshoot.py:531 ../troubleshoot.py:1253
- #, python-format
- msgid "The reason given is: `%s'."
--msgstr ""
-+msgstr "La raison donnée est : « %s »."
-
- #: ../troubleshoot.py:533 ../troubleshoot.py:1255
- msgid "This may be due to the printer being disconnected or switched off."
--msgstr ""
-+msgstr "L'imprimante est peut-être déconnectée ou éteinte."
-
- #: ../troubleshoot.py:549
- msgid "Queue Not Shared"
--msgstr ""
-+msgstr "File non partagée"
-
- #: ../troubleshoot.py:550
- msgid "The CUPS printer on the server is not shared."
--msgstr ""
-+msgstr "L'imprimante CUPS sur ce serveur n'est pas partagée."
-
- #: ../troubleshoot.py:584
--#, fuzzy
- msgid "Choose Network Printer"
--msgstr "Nouvelle imprimante"
-+msgstr "Sélectionnez l'imprimante réseau"
-
- #: ../troubleshoot.py:585
- msgid ""
- "Please select the network printer you are trying to use from the list below. "
- "If it does not appear in the list, select 'Not listed'."
- msgstr ""
-+"Veuillez sélectionner l'imprimante réseau que vous essayer d'utiliser dans "
-+"la liste ci-dessous. Si elle ne figure pas dans la liste, choisissez « Non listée »."
-
- #: ../troubleshoot.py:590 ../troubleshoot.py:1366
- msgid "Name"
- msgstr "Nom"
-
- #: ../troubleshoot.py:594 ../troubleshoot.py:1370
--#, fuzzy
- msgid "Information"
--msgstr "Emplacement"
-+msgstr "Informations"
-
- #: ../troubleshoot.py:627 ../troubleshoot.py:1394
--#, fuzzy
- msgid "Not listed"
--msgstr "Pas connecté(e)"
-+msgstr "Non listée"
-
- #: ../troubleshoot.py:788
--#, fuzzy
- msgid "Remote Address"
--msgstr "Imprimantes distantes"
-+msgstr "Adresse distante"
-
- #: ../troubleshoot.py:789
- msgid ""
- "Please enter as many details as you can about the network address of this "
- "printer."
- msgstr ""
-+"Veuillez entrer autant de détails que possible à propos de l'adresse de "
-+"cette imprimante."
-
- #: ../troubleshoot.py:797
--#, fuzzy
- msgid "Server name:"
--msgstr "Nom d'utilisateur :"
-+msgstr "Nom du serveur :"
-
- #: ../troubleshoot.py:803
- msgid "Server IP address:"
--msgstr ""
-+msgstr "Adresse IP du serveur :"
-
- #: ../troubleshoot.py:824
--#, fuzzy
- msgid "Printer Location"
--msgstr "Options de l'imprimante"
-+msgstr "Emplacement de l'imprimante"
-
- #: ../troubleshoot.py:825
--#, fuzzy
- msgid "Is the printer connected to this computer or available on the network?"
--msgstr "Une imprimante connectée au port parallèle."
-+msgstr ""
-+"Cette imprimante est-elle connectée à cet ordinateur ou disponible "
-+"sur le réseau ?"
-
- #: ../troubleshoot.py:827
--#, fuzzy
- msgid "Locally connected printer"
--msgstr "Voulez-vous réellement effacer %s ?"
-+msgstr "Imprimante connectée localement"
-
- #: ../troubleshoot.py:828
--#, fuzzy
- msgid "Network printer"
--msgstr "Nouvelle imprimante"
-+msgstr "Imprimante réseau"
-
- #: ../troubleshoot.py:840
- msgid "CUPS Service Stopped"
--msgstr ""
-+msgstr "Service CUPS arrêté"
-
- #: ../troubleshoot.py:841
- msgid ""
-@@ -710,6 +701,9 @@
- "choose System->Administration->Services from the main menu and look for the "
- "`cups' service."
- msgstr ""
-+"Le démon d'impression CUPS semble ne pas être en cours d'exécution. Pour "
-+"l'activer, veuillez sélectionner Système->Administration->Services dans le "
-+"menu principal et recherchez le service « cups »."
-
- #: ../troubleshoot.py:870 ../applet.py:729
- msgid "Pending"
-@@ -732,13 +726,12 @@
- msgstr "Achevé"
-
- #: ../troubleshoot.py:885
--#, fuzzy
- msgid "Test Page"
--msgstr "Imprimer la page de test"
-+msgstr "Page de test"
-
- #: ../troubleshoot.py:897
- msgid "Cancel All Jobs"
--msgstr ""
-+msgstr "Annuler toutes les tâches"
-
- #: ../troubleshoot.py:902 ../applet.py:184
- msgid "Job"
-@@ -754,74 +747,76 @@
-
- #: ../troubleshoot.py:928
- msgid "Did the test page print correctly?"
--msgstr ""
-+msgstr "La page de test s'est-elle imprimée correctement ?"
-
- #: ../troubleshoot.py:935
- msgid "Yes"
--msgstr ""
-+msgstr "Oui"
-
- #: ../troubleshoot.py:936
- msgid "No"
--msgstr ""
-+msgstr "Non"
-
- #: ../troubleshoot.py:1118
--#, fuzzy
- msgid "Status Messages"
--msgstr "Message"
-+msgstr "Messages d'état"
-
- #: ../troubleshoot.py:1119
- msgid "There are status messages associated with this queue."
--msgstr ""
-+msgstr "Il y a des messages d'information associés à cette file."
-
- #: ../troubleshoot.py:1125
--#, fuzzy
- msgid "Printer's state message:"
--msgstr "Ãtat de l'imprimante :"
-+msgstr "Message d'état de l'imprimante :"
-
- #: ../troubleshoot.py:1133
--#, fuzzy
- msgid "Printer's state reasons:"
--msgstr "Ãtat de l'imprimante :"
-+msgstr "Raisons de l'état de l'imprimante :"
-
- #: ../troubleshoot.py:1186
- msgid "Queue Rejecting Jobs"
--msgstr ""
-+msgstr "La file refuse les tâches"
-
- #: ../troubleshoot.py:1211
- #, python-format
- msgid "The queue `%s' is rejecting jobs."
--msgstr ""
-+msgstr "La file « %s » rejette les tâches qui lui sont soumies."
-
- #: ../troubleshoot.py:1215
- #, python-format
- msgid " The reason given is: `%s'."
--msgstr ""
-+msgstr " La raison donnée est : « %s »."
-
- #: ../troubleshoot.py:1218
- msgid ""
- "To make the queue accept jobs, select the `Accepting Jobs' checkbox in the "
- "`Policies' tab for the printer in the printer administration tool."
- msgstr ""
-+"Pour que la file accepte les tâches, veuillez cocher la case "
-+"« Tâches acceptées » dans l'onglet « Comportements » pour l'imprimante "
-+"dans l'outil d'administration des imprimantes."
-
- #: ../troubleshoot.py:1260
- #, python-format
- msgid "The queue `%s' is not enabled."
--msgstr ""
-+msgstr "La file « %s » est désactivée."
-
- #: ../troubleshoot.py:1263
- msgid ""
- "To enable it, select the `Enabled' checkbox in the `Policies' tab for the "
- "printer in the printer administration tool."
- msgstr ""
-+"Pour l'activer, veuillez cocher la case « Activée » dans l'onglet "
-+"« Comportements » pour l'imprimante dans l'outil d'administration "
-+"des imprimantes."
-
- #: ../troubleshoot.py:1278
- msgid "Check Server Firewall"
--msgstr ""
-+msgstr "Vérifier le pare-feu sur le serveur"
-
- #: ../troubleshoot.py:1279
--#, fuzzy
- msgid "It is not possible to connect to the server."
--msgstr "Il y a eu un problème lors de la connexion au serveur CUPS."
-+msgstr "Il est impossible de se connecter au serveur."
-
- #: ../troubleshoot.py:1292
- #, python-format
-@@ -829,17 +824,20 @@
- "Please check to see if a firewall or router configuration is blocking TCP "
- "port %d on server `%s'."
- msgstr ""
-+"Veuillez vérifier si la configuration d'un pare-feu ou d'un routeur bloque "
-+"les connections TCP vers le port %d sur le serveur « %s »."
-
- #: ../troubleshoot.py:1360
--#, fuzzy
- msgid "Choose Printer"
--msgstr "Cloner l'imprimante"
-+msgstr "Choisir l'imprimante"
-
- #: ../troubleshoot.py:1361
- msgid ""
- "Please select the printer you are trying to use from the list below. If it "
- "does not appear in the list, select 'Not listed'."
- msgstr ""
-+"Veuillez sélectionner l'imprimante que vous tentez d'utiliser dans la liste "
-+"ci-dessous. Si elle n'apparaît pas dans la liste, choisissez « Non listée »."
-
- #: ../system-config-printer.glade.h:1
- msgid " "
-@@ -882,33 +880,28 @@
- msgstr "<b>Description</b> (optionnelle)"
-
- #: ../system-config-printer.glade.h:13
--#, fuzzy
- msgid "<b>Download Printer Driver</b>"
--msgstr "<b>Commentaire sur le pilote</b>"
-+msgstr "<b>Télécharger le pilote d'impression</b>"
-
- #: ../system-config-printer.glade.h:14
--#, fuzzy
- msgid "<b>Enter device URI</b>"
--msgstr "Indiquer l'URI du périphérique"
-+msgstr "<b>Indiquer l'URI du périphérique</b>"
-
- #: ../system-config-printer.glade.h:15
--#, fuzzy
- msgid "<b>IPP Printer</b>"
--msgstr "<b>Nom de l'imprimante</b>"
-+msgstr "<b>Imprimante IPP</b>"
-
- #: ../system-config-printer.glade.h:16
- msgid "<b>Image Options</b>"
- msgstr "<b>Options d'image</b>"
-
- #: ../system-config-printer.glade.h:17
--#, fuzzy
- msgid "<b>Installed Options</b>"
--msgstr "<b>Options d'image</b>"
-+msgstr "<b>Extensions installées</b>"
-
- #: ../system-config-printer.glade.h:18
--#, fuzzy
- msgid "<b>License Terms</b>"
--msgstr "<b>Nom de l'imprimante</b>"
-+msgstr "<b>Conditions de la licence</b>"
-
- #: ../system-config-printer.glade.h:19
- msgid "<b>Location of the LPD network printer</b>"
-@@ -923,9 +916,8 @@
- msgstr "<b>Emplacement</b> (optionnel)"
-
- #: ../system-config-printer.glade.h:22
--#, fuzzy
- msgid "<b>Note</b>"
--msgstr "<b>Ãtat</b>"
-+msgstr "<b>Note</b>"
-
- #: ../system-config-printer.glade.h:23
- msgid "<b>Other Options (Advanced)</b>"
-@@ -944,18 +936,16 @@
- msgstr "<b>Imprimantes sur le point d'être membres de ce groupe</b>"
-
- #: ../system-config-printer.glade.h:27
--#, fuzzy
- msgid "<b>SMB Printer</b>"
--msgstr "<b>Nom de l'imprimante</b>"
-+msgstr "<b>Imprimante SMB</b>"
-
- #: ../system-config-printer.glade.h:28
- msgid "<b>Select Connection</b>"
- msgstr "<b>Choisir le type de connexion</b>"
-
- #: ../system-config-printer.glade.h:29
--#, fuzzy
- msgid "<b>Select Driver</b>"
--msgstr "<b>Imprimante par défaut</b>"
-+msgstr "<b>Choisissez le pilote</b>"
-
- #: ../system-config-printer.glade.h:30
- msgid "<b>Settings of the serial port</b>"
-@@ -971,7 +961,7 @@
-
- #: ../system-config-printer.glade.h:33
- msgid "<b>Tests and Maintenance</b>"
--msgstr ""
-+msgstr "<b>Tests et maintenance</b>"
-
- #: ../system-config-printer.glade.h:34
- msgid "<b>Text Options</b>"
-@@ -987,7 +977,7 @@
-
- #: ../system-config-printer.glade.h:37
- msgid "<i>smb://[workgroup/]server[:port]/printer</i>"
--msgstr "<i>smb://[workgroup/]server[:port]/printer</i>"
-+msgstr "<i>smb://[groupe/]serveur[:port]/imprimante</i>"
-
- #: ../system-config-printer.glade.h:38
- msgid ""
-@@ -1009,18 +999,16 @@
- "\n"
-
- #: ../system-config-printer.glade.h:44
--#, fuzzy
- msgid "A CUPS configuration tool."
--msgstr "Configuration de l'imprimante - %s"
-+msgstr "Outil de configuration pour CUPS"
-
- #: ../system-config-printer.glade.h:45
- msgid "Accepting jobs"
--msgstr "Validation des tâches d'impression"
-+msgstr "Tâches acceptés"
-
- #: ../system-config-printer.glade.h:46
--#, fuzzy
- msgid "Access Control"
--msgstr "Contrôle des accès"
-+msgstr "Contrôle d'accès"
-
- #: ../system-config-printer.glade.h:47
- msgid "Add or Remove Members"
-@@ -1031,9 +1019,8 @@
- msgstr "Autoriser l'impression à tous les utilisateurs sauf ceux-ci :"
-
- #: ../system-config-printer.glade.h:49
--#, fuzzy
- msgid "Allow printing from the Internet"
--msgstr "Autoriser l'impression à tous les utilisateurs sauf ceux-ci :"
-+msgstr "Autoriser l'impression depuis le réseau"
-
- #: ../system-config-printer.glade.h:50
- msgid "Allow remote administration"
-@@ -1046,9 +1033,8 @@
+@@ -759,16 +748,12 @@
+ "16"
+
+ #: ../system-config-printer.glade.h:8
+-#, fuzzy
+ msgid "72 points per inch"
+-msgstr ""
+-"points\n"
+-"(72 points par pouce)"
++msgstr "72 points par pouce"
+
+ #: ../system-config-printer.glade.h:9
+-#, fuzzy
+ msgid "<b>Authentication</b>"
+-msgstr "Authentification"
++msgstr "<b>Authentification</b>"
+
+ #: ../system-config-printer.glade.h:10
+ msgid "<b>Banner</b>"
+@@ -936,9 +921,8 @@
"(pas seulement les leurs)"
+ #: ../system-config-printer.glade.h:51
+-#, fuzzy
+ msgid "Basic Server Settings"
+-msgstr "<b>Paramètres de base du serveur</b>"
++msgstr "Paramètres de base du serveur"
+
#: ../system-config-printer.glade.h:52
--#, fuzzy
- msgid "Authentication required"
--msgstr "<b>Authentification</b>"
-+msgstr "Authentification requise"
-
- #: ../system-config-printer.glade.h:53
msgid "Baud Rate"
-@@ -1064,7 +1050,7 @@
-
- #: ../system-config-printer.glade.h:56
- msgid "Browse..."
--msgstr ""
-+msgstr "Parcourir..."
-
- #: ../system-config-printer.glade.h:57
- msgid "CUPS server:"
-@@ -1081,25 +1067,23 @@
- #. Not more than 25 characters
- #: ../system-config-printer.glade.h:61
- msgid "Clean Print Heads"
--msgstr ""
-+msgstr "Nettoyer les têtes"
-
- #: ../system-config-printer.glade.h:62
- msgid "Columns:"
- msgstr "Colonnes : "
-
- #: ../system-config-printer.glade.h:63
--#, fuzzy
- msgid "Comments..."
--msgstr "Commentaire"
-+msgstr "Commentaires..."
-
- #: ../system-config-printer.glade.h:64
- msgid "Connect to CUPS server"
- msgstr "Se connecter au serveur CUPS"
-
- #: ../system-config-printer.glade.h:65
--#, fuzzy
- msgid "Connect to a different print server"
--msgstr "Se connecter au serveur CUPS"
-+msgstr "Se connecter à un autre serveur CUPS"
-
- #: ../system-config-printer.glade.h:66
- msgid "Connecting"
-@@ -1123,28 +1107,20 @@
+@@ -1007,14 +991,14 @@
msgstr "Cloner l'imprimante"
+ #: ../system-config-printer.glade.h:71
+-#, fuzzy
+ msgid "Copyright © 2006-2008 Red Hat, Inc."
+-msgstr "Copyright © 2006-2007 Red Hat, Inc."
++msgstr "Copyright © 2006-2008 Red Hat, Inc."
+
+ #: ../system-config-printer.glade.h:72
+ msgid ""
+ "Create a class from the selected printers (for failover or load-balancing)"
+ msgstr ""
++"Créer un groupe à partir des imprimantes sélectionnées (pour la tolérance de panne ou l'équilibrage de charge)"
+
#: ../system-config-printer.glade.h:73
--#, fuzzy
- msgid "Copy this printer queue"
--msgstr "Cloner l'imprimante"
-+msgstr "Cloner la file d'impression"
-
- #: ../system-config-printer.glade.h:74
--#, fuzzy
- msgid "Copyright © 2006-2007 Red Hat, Inc."
--msgstr "Copyright 2006, 2007 Red Hat, Inc."
-+msgstr "Copyright © 2006, 2007 Red Hat, Inc."
-
- #: ../system-config-printer.glade.h:75
--#, fuzzy
- msgid "Create a new printer group"
--msgstr ""
--"Va créer une nouvelle imprimante %s à \n"
--"%s.\n"
-+msgstr "Créer un nouveau groupe d'imprimantes"
-
- #: ../system-config-printer.glade.h:76
--#, fuzzy
- msgid "Create a new printer queue"
--msgstr ""
--"Va créer une nouvelle imprimante %s à \n"
--"%s.\n"
-+msgstr "Créer une nouvelle file d'impression"
-
- #: ../system-config-printer.glade.h:77
msgid "Data Bits"
-@@ -1209,13 +1185,12 @@
- "DTR/DSR (Matériel)"
-
- #: ../system-config-printer.glade.h:99
--#, fuzzy
- msgid "Default Printer:"
--msgstr "Imprimante par défaut"
-+msgstr "Imprimante par défaut :"
-
- #: ../system-config-printer.glade.h:100
- msgid "Delete this printer queue"
--msgstr ""
-+msgstr "Supprimer cette file d'impression"
-
- #: ../system-config-printer.glade.h:101
- msgid "Deny printing for everyone except these users:"
-@@ -1242,9 +1217,8 @@
- msgstr "DirectJet"
-
- #: ../system-config-printer.glade.h:108
--#, fuzzy
- msgid "Driver details"
--msgstr "Pilotes"
-+msgstr "Détails du pilote"
-
- #: ../system-config-printer.glade.h:109
- msgid "Empty"
-@@ -1252,7 +1226,7 @@
-
- #: ../system-config-printer.glade.h:110
- msgid "Enabled"
--msgstr "Activé"
-+msgstr "Activée"
-
- #: ../system-config-printer.glade.h:111
- msgid "Ending Banner:"
-@@ -1260,7 +1234,7 @@
-
- #: ../system-config-printer.glade.h:112
- msgid "Enter some search terms for the model of your printer."
--msgstr ""
-+msgstr "Entrez des termes de recherche pour votre modèle d'imprimante."
-
- #: ../system-config-printer.glade.h:113
- msgid "Error Policy: \t"
-@@ -1268,7 +1242,7 @@
-
- #: ../system-config-printer.glade.h:114
- msgid "Find _Queue..."
--msgstr ""
-+msgstr "Trouver la _file..."
-
- #: ../system-config-printer.glade.h:115
- msgid "Finishings:"
-@@ -1276,12 +1250,14 @@
-
- #: ../system-config-printer.glade.h:116
- msgid "Flow Control"
--msgstr "Contrôle du flux"
-+msgstr "Contrôle de flux"
-
- #: ../system-config-printer.glade.h:117
- msgid ""
- "For the printer you have selected there are drivers available for download."
- msgstr ""
-+"Pour l'imprimante que vous avez choisie, des pilotes à télécharger sont "
-+"disponibles."
-
- #: ../system-config-printer.glade.h:118
- msgid "Gamma:"
-@@ -1296,9 +1272,8 @@
- msgstr "Maintenir jusqu'Ã Â :"
-
- #: ../system-config-printer.glade.h:121
--#, fuzzy
- msgid "Host:"
--msgstr "Nom de l'hôte"
-+msgstr "Nom de l'hôte :"
-
- #: ../system-config-printer.glade.h:122
- msgid "Hue adjustment:"
-@@ -1318,12 +1293,11 @@
-
- #: ../system-config-printer.glade.h:126
- msgid "IPP Browser"
--msgstr ""
-+msgstr "Navigateur IPP"
-
- #: ../system-config-printer.glade.h:127
--#, fuzzy
- msgid "Installed Options"
--msgstr "Options installables"
-+msgstr "Extensions installées"
-
- #: ../system-config-printer.glade.h:128
- msgid "Job Options"
-@@ -1331,7 +1305,7 @@
-
- #: ../system-config-printer.glade.h:129
- msgid "Job priority:"
--msgstr "Priorité de tâche :"
-+msgstr "Priorité de la tâche :"
-
- #: ../system-config-printer.glade.h:130
- msgid "LPD"
-@@ -1363,16 +1337,15 @@
-
- #: ../system-config-printer.glade.h:140
- msgid "License:"
--msgstr ""
-+msgstr "Licence :"
-
- #: ../system-config-printer.glade.h:141
- msgid "Lines per inch:"
- msgstr "Lignes par pouce :"
-
- #: ../system-config-printer.glade.h:142
--#, fuzzy
- msgid "Local Driver"
--msgstr "Imprimantes locales"
-+msgstr "Pilote local"
-
- #: ../system-config-printer.glade.h:143
- msgid "Location:"
-@@ -1380,26 +1353,25 @@
-
- #. Not more than 25 characters
+@@ -1107,7 +1091,6 @@
+ msgstr "Détails du pilotes"
+
+ #: ../system-config-printer.glade.h:103
+-#, fuzzy
+ msgid "E_nable"
+ msgstr "Activée"
+
+@@ -1239,7 +1222,6 @@
+ msgstr "Fabricant et modèle :"
+
+ #: ../system-config-printer.glade.h:138
+-#, fuzzy
+ msgid "Make and model:"
+ msgstr "Fabricant et modèle :"
+
+@@ -1265,7 +1247,7 @@
+
#: ../system-config-printer.glade.h:145
--#, fuzzy
- msgid "Make Default"
--msgstr "_Définir la valeur par défaut"
-+msgstr "Définir par défaut"
-
- #: ../system-config-printer.glade.h:146
- msgid "Make and Model:"
- msgstr "Fabricant et modèle :"
-
- #: ../system-config-printer.glade.h:147
--#, fuzzy
- msgid ""
- "May contain any printable characters except \"/\", \"#\", and space.\n"
- "Name must be unique on the local machine!"
- msgstr ""
- "Peut contenir n'importe quel caractère imprimable sauf \"/\", \"#\", et "
--"l'espace"
-+"l'espace.\n"
-+"Le nom doit être unique sur la machine locale !"
-
- #: ../system-config-printer.glade.h:149
- msgid "Media:"
--msgstr "Média :"
-+msgstr "Médium :"
-
- #: ../system-config-printer.glade.h:150
- msgid "Members"
-@@ -1407,7 +1379,7 @@
-
- #: ../system-config-printer.glade.h:151
- msgid "Mirror"
--msgstr "Miroir :"
-+msgstr "Miroir"
-
- #: ../system-config-printer.glade.h:152
- msgid "More"
-@@ -1419,7 +1391,7 @@
-
- #: ../system-config-printer.glade.h:156
msgid "New _Printer"
-msgstr "Nouvelle im_primante :"
+msgstr "Nouvelle im_primante"
- #: ../system-config-printer.glade.h:157
+ #: ../system-config-printer.glade.h:146
msgid "New name for the printer"
-@@ -1427,7 +1399,7 @@
-
- #: ../system-config-printer.glade.h:158
- msgid "No, I do not accept this license"
--msgstr ""
-+msgstr "Non, je n'accepte pas cette licence"
-
- #: ../system-config-printer.glade.h:159
- msgid ""
-@@ -1471,7 +1443,7 @@
- "Rognure\n"
- "Balle\n"
- "Créateur de livret\n"
--"Décalage de travaux\n"
-+"Décalage de tâches\n"
- "Agrafe (en haut à gauche)\n"
- "Agrafe (en bas à gauche)\n"
- "Agrafe (en haut à droite)\n"
-@@ -1521,16 +1493,15 @@
-
- #: ../system-config-printer.glade.h:196
- msgid "Please Wait"
--msgstr ""
-+msgstr "Veuillez patienter"
-
- #: ../system-config-printer.glade.h:197
- msgid "Policies"
- msgstr "Comportements"
-
- #: ../system-config-printer.glade.h:198
--#, fuzzy
- msgid "Port number:"
--msgstr "Numéro du port"
-+msgstr "Numéro du port :"
+@@ -1415,9 +1397,8 @@
+ msgstr "Imprimer la page de test"
#: ../system-config-printer.glade.h:199
- msgid ""
-@@ -1545,16 +1516,14 @@
- "Portrait inversé (180°)"
+-#, fuzzy
+ msgid "Printer Properties"
+-msgstr "Rapport de l'imprimante"
++msgstr "Propriétés de l'imprimante"
+
+ #: ../system-config-printer.glade.h:200
+ msgid "Printer State:"
+@@ -1432,9 +1413,8 @@
+ msgstr "Rechercher"
#: ../system-config-printer.glade.h:203
-#, fuzzy
- msgid ""
- "PostScript Printer Description (PPD) files can often be found on the driver "
- "disk that comes with the printer. For PostScript printers they are often "
- "part of the Windows<sup>®</sup> driver."
- msgstr ""
--"Les fichiers de description d'imprimantes PostScript (PPD) peuvent être "
--"trouvés sur le disque des pilotes fournis avec l'imprimante. Pour les "
--"imprimantes PostScript, ils font souvent partie du pilote Windows <sup>®</"
--"sup>."
-+"Les fichiers de description d'imprimantes PostScript (PPD) peuvent souvent "
-+"être trouvés sur le disque des pilotes fournis avec l'imprimante. Pour les "
-+"imprimantes PostScript, ils font souvent partie du pilote Windows<sup>®</sup>."
+ msgid "Prompt user if authentication is required"
+-msgstr "Authentification requise"
++msgstr "Demander un mot de passe à l'utilisateur si nécessaire"
#: ../system-config-printer.glade.h:204
- msgid "Pretty print"
-@@ -1562,7 +1531,6 @@
-
- #. Not more than 25 characters
- #: ../system-config-printer.glade.h:206
--#, fuzzy
- msgid "Print Self-Test Page"
- msgstr "Imprimer la page de test"
-
-@@ -1571,30 +1539,28 @@
- msgstr "Ãtat de l'imprimante :"
-
- #: ../system-config-printer.glade.h:211
--#, fuzzy
- msgid "Printer model:"
--msgstr "L'imprimante a été ajoutée"
-+msgstr "Modèle d'imprimante :"
-
- #: ../system-config-printer.glade.h:212
- msgid "Probe"
- msgstr "Rechercher"
-
- #: ../system-config-printer.glade.h:213
--#, fuzzy
msgid "Provide PPD file"
- msgstr "Fournir un fichier PPD"
-
- #: ../system-config-printer.glade.h:214
- msgid "Queue:"
--msgstr ""
-+msgstr "File :"
-
- #: ../system-config-printer.glade.h:215
- msgid "Refresh the list of printer queues"
--msgstr ""
-+msgstr "Mettre à jour la liste des files d'impression"
-
- #: ../system-config-printer.glade.h:216
- msgid "Require encryption"
--msgstr "Cryptage requis"
-+msgstr "Chiffrement requis"
-
- #: ../system-config-printer.glade.h:217
- msgid "Reset"
-@@ -1618,7 +1584,7 @@
+@@ -1505,19 +1485,16 @@
+ msgstr "Série"
+
+ #: ../system-config-printer.glade.h:221
+-#, fuzzy
+ msgid "Set As De_fault"
+-msgstr "_Définir la valeur par défaut"
++msgstr "_Définir par défaut"
#: ../system-config-printer.glade.h:222
- msgid "SMB Browser"
--msgstr ""
-+msgstr "Navigateur SMB"
+-#, fuzzy
+ msgid "Set As Default"
+-msgstr "_Définir la valeur par défaut"
++msgstr "_Définir par défaut"
#: ../system-config-printer.glade.h:223
- msgid "Saturation:"
-@@ -1626,7 +1592,7 @@
+-#, fuzzy
+ msgid "Set authentication details now"
+-msgstr "Authentification requise"
++msgstr "Paramétrer les détails d'authentification maintenant"
#: ../system-config-printer.glade.h:224
- msgid "Save debugging information for troubleshooting"
--msgstr "Conserver les informations de déboggage pour un dépannage"
-+msgstr "Conserver les informations de déboguage pour un dépannage"
-
- #: ../system-config-printer.glade.h:225
- msgid "Scale to fit"
-@@ -1638,19 +1604,17 @@
+ msgid "Settings"
+@@ -1533,7 +1510,7 @@
#: ../system-config-printer.glade.h:227
- msgid "Search for a printer driver to download"
--msgstr ""
-+msgstr "Rechercher un pilote d'imprimante à télécharger"
+ msgid "Short name for this printer such as \"laserjet\""
+-msgstr ""
++msgstr "Nom court pour cette imprimante, par exemple « laser »"
#: ../system-config-printer.glade.h:228
--#, fuzzy
- msgid "Search terms:"
--msgstr "Nouveau nom pour l'imprimante"
-+msgstr "Termes de la recherche :"
-
- #: ../system-config-printer.glade.h:229
- msgid "Select A File"
- msgstr "Choisissez un fichier"
-
- #: ../system-config-printer.glade.h:230
--#, fuzzy
- msgid "Select printer from database"
- msgstr "Sélectionner l'imprimante depuis la base de données"
-
-@@ -1676,7 +1640,7 @@
-
- #: ../system-config-printer.glade.h:236
- msgid "Sides:"
--msgstr "Cotés :"
-+msgstr "Côtés :"
-
- #: ../system-config-printer.glade.h:237
- msgid ""
-@@ -1694,7 +1658,7 @@
-
- #: ../system-config-printer.glade.h:239
- msgid "Supplier:"
--msgstr ""
-+msgstr "Fournisseur :"
-
- #: ../system-config-printer.glade.h:240
- msgid "System-Config-Printer"
-@@ -1720,12 +1684,18 @@
- "be covered by their commercial support. See the support and license terms "
- "of the driver's supplier."
- msgstr ""
-+"Ces pilotes ne proviennent pas du fournisseur de votre système d'exploitation "
-+"et ne seront pas couverts par leur support. Veuillez consulter les termes "
-+"de support et de licence du fournisseur du pilote."
-
- #: ../system-config-printer.glade.h:243
- msgid ""
- "This driver supports additional hardware that may be installed in the "
- "printer."
- msgstr ""
-+"Ce pilote supporte des extensions matérielles qui peuvent être installées "
-+"dans l'imprimante."
-+
-
- #: ../system-config-printer.glade.h:244
- msgid ""
-@@ -1779,7 +1749,7 @@
+ msgid "Show printers shared by other systems"
+@@ -1671,9 +1648,8 @@
+ "Utiliser le nouveau fichier PPD (Postscript Printer Description) tel quel."
+
+ #: ../system-config-printer.glade.h:250
+-#, fuzzy
+ msgid "View Print _Queue"
+-msgstr "Nouvelle imprimante"
++msgstr "Voir la _file d'impression"
+
+ #: ../system-config-printer.glade.h:251
+ msgid ""
+@@ -1692,19 +1668,16 @@
+ msgstr "Oui, j'accepte cette licence"
#: ../system-config-printer.glade.h:254
- msgid "URI:"
--msgstr ""
-+msgstr "URI :"
+-#, fuzzy
+ msgid "_Connect..."
+-msgstr "Connexion"
++msgstr "_Connexion..."
#: ../system-config-printer.glade.h:255
- msgid "Use the new PPD (Postscript Printer Description) as is."
-@@ -1799,15 +1769,16 @@
- "With this choice no driver download will be performed. In the next steps a "
- "locally installed driver will be selected."
- msgstr ""
-+"Avec ce choix, aucun pilote ne sera téléchargé. Dans les étapes suivantes, "
-+"un pilote installé localement sera sélectionné."
-
- #: ../system-config-printer.glade.h:259
- msgid "Word wrap"
- msgstr "Retour à la ligne automatique"
-
- #: ../system-config-printer.glade.h:260
--#, fuzzy
- msgid "Yes, I accept this license"
--msgstr "Validation des tâches d'impression"
-+msgstr "Oui, j'accepte cette licence"
-
- #: ../system-config-printer.glade.h:261
+-#, fuzzy
+ msgid "_Create Class"
+-msgstr "Groupes distants"
++msgstr "Créer un _groupe"
+
+ #: ../system-config-printer.glade.h:256
+-#, fuzzy
+ msgid "_Disable"
+-msgstr "Distribuable"
++msgstr "_Désactiver"
+
+ #: ../system-config-printer.glade.h:257
msgid "_Do not apply"
-@@ -1835,11 +1806,11 @@
-
- #: ../system-config-printer.glade.h:267
+@@ -1727,18 +1700,16 @@
+ msgstr "_Installer"
+
+ #: ../system-config-printer.glade.h:262
+-#, fuzzy
+ msgid "_Rename"
+-msgstr "_Relâcher"
++msgstr "_Renommer"
+
+ #: ../system-config-printer.glade.h:263
msgid "_Search"
--msgstr ""
-+msgstr "_Recherche"
-
- #: ../system-config-printer.glade.h:268
+ msgstr "_Recherche"
+
+ #: ../system-config-printer.glade.h:264
+-#, fuzzy
+ msgid "_Server Settings..."
+-msgstr "Paramètres du serveur"
++msgstr "Paramètres du _serveur..."
+
+ #: ../system-config-printer.glade.h:265
msgid "_Troubleshoot"
--msgstr ""
-+msgstr "_Dépannage"
-
- #: ../system-config-printer.glade.h:269
- msgid "_Verify..."
-@@ -1858,25 +1829,35 @@
- msgstr "points"
-
- #: ../system-config-printer.glade.h:273
--#, fuzzy
- msgid ""
- "points\n"
- "(72 points per inch)"
--msgstr "points (72 points par pouce)"
-+msgstr ""
-+"points\n"
-+"(72 points par pouce)"
-
- #: ../system-config-printer.glade.h:275
--#, fuzzy
- msgid "system-config-printer"
--msgstr "System-Config-Printer"
-+msgstr "system-config-printer"
-
- #. TRANSLATORS: Replace this string with your names, one name per line. Thank you very much for your effort on translating system-config-printer and all our other tools!
- #: ../system-config-printer.glade.h:277
- msgid "translator-credits"
- msgstr ""
-+"Bettina De Monti\n"
-+"Audrey Simons\n"
-+"Stephane Raimbault\n"
-+"Jean-Paul Aubry\n"
-+"Thomas Canniot\n"
-+"Damien Durand\n"
-+"Fabien Decroux\n"
-+"Alain Portal\n"
-+"Jonathan Ernst\n"
-+"Josselin Mouette"
-
- #: ../system-config-printer.desktop.in.h:1
- msgid "Configure printers"
--msgstr "Configurez les imprimantes"
-+msgstr "Configurer les imprimantes"
-
- #: ../system-config-printer.desktop.in.h:2
- msgid "Printing"
-@@ -1956,7 +1937,7 @@
-
- #: ../applet.py:96
- msgid "Not connected?"
--msgstr "Pas connecté(e) ?"
-+msgstr "Non connecté(e) ?"
-
- #: ../applet.py:97
+@@ -1913,28 +1884,31 @@
+
+ #: ../troubleshoot/CheckLocalServerPublishing.py:28
+ msgid "Server Not Exporting Printers"
+-msgstr ""
++msgstr "Serveur n'exportant pas d'imprimante"
+
+ #: ../troubleshoot/CheckLocalServerPublishing.py:29
+ msgid ""
+ "Although one or more printers are marked as being shared, this print server "
+ "is not exporting shared printers to the network."
+ msgstr ""
++"Bien qu'une ou plusieurs imprimantes soient indiquées comme étant partagées, "
++"ce serveur d'impression n'exporte pas les imprimantes partagées sur le réseau."
+
+ #: ../troubleshoot/CheckLocalServerPublishing.py:33
+ msgid ""
+ "Enable the 'Share published printers connected to this system' option in the "
+ "server settings using the printing administration tool."
+ msgstr ""
++"Activer l'option « Partager les imprimantes publiées connectées à ce système » "
++"dans les paramètres du serveur en utilisant l'outil d'administration de l'impression."
+
+ #: ../troubleshoot/CheckPPDSanity.py:45 ../applet.py:146
+ msgid "Install"
+ msgstr "Installer"
+
+ #: ../troubleshoot/CheckPPDSanity.py:80
+-#, fuzzy
+ msgid "Invalid PPD File"
+-msgstr "Fournir un fichier PPD"
++msgstr "Fichier PPD invalide"
+
+ #: ../troubleshoot/CheckPPDSanity.py:89
#, python-format
-@@ -2051,19 +2032,17 @@
- msgstr "Pilote d'imprimante manquant"
-
- #: ../applet.py:1032
--#, fuzzy
- msgid "Install printer driver"
--msgstr "Chercher le pilote"
-+msgstr "Installer le pilote d'impression"
-
- #: ../applet.py:1033
- #, python-format
- msgid "`%s' requires driver installation: %s."
--msgstr ""
-+msgstr "« %s » nécessite l'installation d'un pilote : %s."
-
- #: ../applet.py:1036
--#, fuzzy
- msgid "Install"
--msgstr "_Installer"
-+msgstr "Installer"
-
- #: ../applet.py:1039
- #, python-format
-@@ -2113,9 +2092,8 @@
- msgstr "_Maintenir"
-
- #: ../applet.glade.h:13
--#, fuzzy
- msgid "_Refresh"
--msgstr "_Relâcher"
-+msgstr "_Rafraîchir"
-
- #: ../applet.glade.h:14
- msgid "_Release"
-@@ -2139,76 +2117,9 @@
-
- #: ../manage-print-jobs.desktop.in.h:2
- msgid "Manage Print Jobs"
--msgstr "Gèrer les tâches d'impression"
-+msgstr "Gérer les tâches d'impression"
-
- #: ../my-default-printer.desktop.in.h:2
- msgid "Select default printer"
- msgstr "Sélectionner l'imprimante par défaut"
-
--#, fuzzy
--#~ msgid ""
--#~ "THe remote server did not accept the print job, most likely because the "
--#~ "printer is not shared."
--#~ msgstr ""
--#~ "Le serveur distant n'accepte pas cette tâche d'impression, "
--#~ "vraisemblablement parce que l'imprimante n'est pas partagée."
--
--#~ msgid "Hostname"
--#~ msgstr "Nom de l'hôte"
--
--#~ msgid "Printername"
--#~ msgstr "Nom de l'imprimante"
--
--#~ msgid "Default printer is %s"
--#~ msgstr "L'imprimante par défaut est %s"
--
--#~ msgid "Going to create a new class %s."
--#~ msgstr "Va créer un nouveau groupe %s."
--
--#~ msgid " PPD "
--#~ msgstr " PPD "
--
--#~ msgid "<b>Comment about the Printer</b>"
--#~ msgstr "<b>Commentaire sur l'imprimante</b>"
--
--#~ msgid "<b>Information about the PPD</b>"
--#~ msgstr "<b>Commentaire sur le PPD</b>"
--
--#~ msgid "About"
--#~ msgstr "Ã propos de"
--
--#~ msgid "About System-Config-Printer"
--#~ msgstr "Ã propos de System-Config-Printer"
--
--#~ msgid "Apply"
--#~ msgstr "Appliquer"
--
--#~ msgid "Authors"
--#~ msgstr "Auteurs"
--
--#~ msgid "Change PPD"
--#~ msgstr "Changer le PPD"
--
--#~ msgid "Class Members"
--#~ msgstr "Membres du groupe"
--
--#~ msgid "Comments: "
--#~ msgstr "Commentaires : "
--
--#~ msgid "Copyright"
--#~ msgstr "Copyright"
--
--#~ msgid "Device"
--#~ msgstr "Périphérique"
--
--#~ msgid "Driver"
--#~ msgstr "Pilote"
--
--#~ msgid "Make Default Printer"
--#~ msgstr "Faire de cette imprimante l'imprimante par défaut"
--
--#~ msgid "PPD"
--#~ msgstr "PPD"
--
--#~ msgid "System-Config-Printer %s"
--#~ msgstr "System-Config-Printer %s"
+@@ -1942,31 +1916,32 @@
+ "The PPD file for printer `%s' does not conform to the specification. "
+ "Possible reason follows:"
+ msgstr ""
++"Le fichier PPD pour l'imprimante « %s » n'est pas conforme à la spécification. "
++"La raison possible est la suivante :"
+
+ #. Perhaps cupstestppd is not in the path.
+ #: ../troubleshoot/CheckPPDSanity.py:95
+-#, fuzzy, python-format
++#, python-format
+ msgid "There is a problem with the PPD file for printer `%s'."
+-msgstr "Il y a problème sur l'imprimante « %s »."
++msgstr "Il y a un problème avec le fichier PPD pour l'imprimante « %s »."
+
+ #: ../troubleshoot/CheckPPDSanity.py:105
+-#, fuzzy
+ msgid "Missing Printer Driver"
+-msgstr "Pilote d'imprimante manquant"
++msgstr "Pilote d'impression manquant"
+
+ #: ../troubleshoot/CheckPPDSanity.py:108
+-#, fuzzy, python-format
++#, python-format
+ msgid "Printer `%s' requires the %s package but it is not currently installed."
+ msgstr ""
+-"L'imprimante « %s » a besoin du paquetage %s mais celui-ci n'est pas "
++"L'imprimante « %s » a besoin du paquet %s mais celui-ci n'est pas "
+ "installé."
+
+ #: ../troubleshoot/CheckPPDSanity.py:113
+-#, fuzzy, python-format
++#, python-format
+ msgid ""
+ "Printer `%s' requires the `%s' program but it is not currently installed."
+ msgstr ""
+-"L'imprimante « %s » a besoin du paquetage %s mais celui-ci n'est pas "
++"L'imprimante « %s » a besoin du programme « %s » mais celui-ci n'est pas "
+ "installé."
+
+ #: ../troubleshoot/ChooseNetworkPrinter.py:29
+@@ -2010,12 +1985,10 @@
+ "dessous. Si elle n'apparaît pas dans la liste, choisissez « Non listée »."
+
+ #: ../troubleshoot/DeviceListed.py:30
+-#, fuzzy
+ msgid "Choose Device"
+-msgstr "Modifier l'URI du périphérique"
++msgstr "Choisissez le périphérique"
+
+ #: ../troubleshoot/DeviceListed.py:31
+-#, fuzzy
+ msgid ""
+ "Please select the device you want to use from the list below. If it does not "
+ "appear in the list, select 'Not listed'."
+@@ -2161,7 +2134,7 @@
+
+ #: ../troubleshoot/PrintTestPage.py:322
+ msgid "Error submitting test page"
+-msgstr ""
++msgstr "Erreur lors de la soumission de la page de test"
+
+ #: ../troubleshoot/QueueNotEnabled.py:57
+ #: ../troubleshoot/QueueRejectingJobs.py:67
Modified: packages/experimental/system-config-printer/debian/patches/05_vi_po.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/system-config-printer/debian/patches/05_vi_po.patch?rev=16199&op=diff
==============================================================================
--- packages/experimental/system-config-printer/debian/patches/05_vi_po.patch (original)
+++ packages/experimental/system-config-printer/debian/patches/05_vi_po.patch Sun Jun 8 12:52:40 2008
@@ -1,6 +1,6 @@
---- po/vi.po.orig 2008-02-19 23:51:06.833381203 +0100
-+++ po/vi.po 2008-02-19 23:51:20.233381153 +0100
-@@ -1,324 +1,342 @@
+--- po/vi.po.orig 2008-06-08 12:44:54.209286376 +0200
++++ po/vi.po 2008-06-08 13:01:47.265282529 +0200
+@@ -1,56 +1,56 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) 2003 THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
@@ -15,10 +15,11 @@
-"Project-Id-Version: printconf VERSION\n"
+"Project-Id-Version: system-config-printer 0.7.81\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/bugzilla\n"
- "POT-Creation-Date: 2008-02-13 18:13+0000\n"
+-"POT-Creation-Date: 2008-05-27 18:07+0100\n"
-"PO-Revision-Date: 2003-07-27 20:29+0700\n"
-"Last-Translator: pclouds <pclouds at gmx.net>\n"
-"Language-Team: GnomeVI <gnomevi-list at lists.sourceforge.net>\n"
++"POT-Creation-Date: 2008-06-08 12:49+0200\n"
+"PO-Revision-Date: 2008-02-18 23:01+1030\n"
+"Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
+"Language-Team: Vietnamese <vi-VN at googlegroups.com>\n"
@@ -28,364 +29,533 @@
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: LocFactoryEditor 1.7b1\n"
- #: ../cupshelpers.py:33
+ #: ../authconn.py:30 ../system-config-printer.glade.h:249
+-#, fuzzy
+ msgid "Username:"
+ msgstr "Tên ngÆ°á»i dùng:"
+
+ #: ../authconn.py:31 ../system-config-printer.glade.h:184 ../applet.glade.h:4
+ msgid "Password:"
+-msgstr "Máºt khẩu:"
++msgstr "Máºt khẩu :"
+
+ #: ../authconn.py:32
+ #, fuzzy
+ msgid "Domain:"
+-msgstr "LỠtrên (pt):"
++msgstr "LỠtrên:"
+
+ #: ../authconn.py:34
+-#, fuzzy
+ msgid "Authentication"
+ msgstr "Xác thực"
+
+ #: ../cupshelpers.py:28
msgid "Idle"
-msgstr ""
+msgstr "Nghá»"
--#: ../cupshelpers.py:34 ../troubleshoot.py:872 ../applet.py:731
-+#: ../cupshelpers.py:34
-+#: ../troubleshoot.py:872
-+#: ../applet.py:731
+ #: ../cupshelpers.py:29 ../jobviewer.py:388
+ #: ../troubleshoot/PrintTestPage.py:42
msgid "Processing"
-msgstr ""
+msgstr "Äang xá» lý"
- #: ../cupshelpers.py:35
+ #: ../cupshelpers.py:30
msgid "Busy"
-msgstr ""
+msgstr "Báºn"
--#: ../cupshelpers.py:36 ../troubleshoot.py:873 ../applet.py:732
-+#: ../cupshelpers.py:36
-+#: ../troubleshoot.py:873
-+#: ../applet.py:732
+ #: ../cupshelpers.py:31 ../jobviewer.py:389
+ #: ../troubleshoot/PrintTestPage.py:43
msgid "Stopped"
- msgstr ""
-+"BỠdừng"
-
--#: ../cupshelpers.py:53 ../troubleshoot.py:648 ../troubleshoot.py:649
--#: ../troubleshoot.py:652 ../troubleshoot.py:653 ../troubleshoot.py:1415
--#: ../troubleshoot.py:1416 ../troubleshoot.py:1419 ../troubleshoot.py:1420
-+#: ../cupshelpers.py:53
-+#: ../troubleshoot.py:648
-+#: ../troubleshoot.py:649
-+#: ../troubleshoot.py:652
-+#: ../troubleshoot.py:653
-+#: ../troubleshoot.py:1415
-+#: ../troubleshoot.py:1416
-+#: ../troubleshoot.py:1419
-+#: ../troubleshoot.py:1420
- #: ../applet.py:741
+-msgstr ""
++msgstr "BỠdừng"
+
+ #: ../cupshelpers.py:63 ../jobviewer.py:297 ../jobviewer.py:362
+ #: ../jobviewer.py:363 ../jobviewer.py:376 ../jobviewer.py:399
+@@ -63,73 +63,70 @@
+ #: ../troubleshoot/ChoosePrinter.py:89 ../troubleshoot/ChoosePrinter.py:90
+ #: ../troubleshoot/DeviceListed.py:84 ../troubleshoot/DeviceListed.py:85
msgid "Unknown"
-msgstr ""
+msgstr "Không rõ"
--#: ../my-default-printer.py:136 ../my-default-printer.desktop.in.h:1
--#, fuzzy
-+#: ../my-default-printer.py:136
-+#: ../my-default-printer.desktop.in.h:1
+ #: ../errordialogs.py:59 ../errordialogs.py:71
+ msgid "Not authorized"
+-msgstr ""
++msgstr "Chưa xác thực"
+
+ #: ../errordialogs.py:60
+ msgid "The password may be incorrect."
+-msgstr ""
++msgstr "Máºt khẩu có thá» không Äúng."
+
+ #: ../errordialogs.py:62 ../errordialogs.py:76
+-#, fuzzy
+ msgid "CUPS server error"
+-msgstr "Server:"
++msgstr "Lá»i máy phục vụ CUPS"
+
+ #: ../errordialogs.py:63 ../troubleshoot/PrintTestPage.py:323
+-#, fuzzy, python-format
++#, python-format
+ msgid "There was an error during the CUPS operation: '%s'."
+-msgstr "Lá»i khi in trang thá»."
++msgstr "Gặp lá»i trong thao tác CUPS: « %s »"
+
+ #: ../errordialogs.py:72
+ msgid ""
+ "The password may be incorrect, or the server may be configured to deny "
+ "remote administration."
+ msgstr ""
++"Có lẽ máºt khẩu không Äúng, hoặc máy phục vụ có cấu hình mà từ chá»i quản lý "
++"từ xa."
+
+ #: ../errordialogs.py:78
+ msgid "Bad request"
+-msgstr ""
++msgstr "Yêu cầu sai"
+
+ #: ../errordialogs.py:80
+-#, fuzzy
+ msgid "Not found"
+-msgstr "_Kết ná»i cục bá»"
++msgstr "Không tìm thấy"
+
+ #: ../errordialogs.py:82
+ msgid "Request timeout"
+-msgstr ""
++msgstr "Quá hạn yêu cầu"
+
+ #: ../errordialogs.py:84
+-#, fuzzy
+ msgid "Upgrade required"
+-msgstr "Máºt khẩu:"
++msgstr "Cần thiết nâng cấp"
+
+ #: ../errordialogs.py:86
+-#, fuzzy
+ msgid "Server error"
+-msgstr "Máy in: "
++msgstr "Lá»i máy phục vụ"
+
+ #: ../errordialogs.py:88 ../system-config-printer.py:662
+-#, fuzzy
+ msgid "Not connected"
+-msgstr "_Kết ná»i cục bá»"
++msgstr "ChÆ°a kết ná»i"
+
+ #: ../errordialogs.py:90
+ #, python-format
+ msgid "status %d"
+-msgstr ""
++msgstr "trạng thái %d"
+
+ #: ../errordialogs.py:92
+ #, python-format
+ msgid "There was an HTTP error: %s."
+-msgstr ""
++msgstr "Gặp lá»i HTTP: %s"
+
+ #: ../jobviewer.py:89 ../troubleshoot/PrintTestPage.py:78
+ msgid "Job"
+-msgstr ""
++msgstr "Công viá»c"
+
+ #: ../jobviewer.py:90
+ #, fuzzy
+@@ -137,29 +134,26 @@
+ msgstr "NgÆ°á»i dùng"
+
+ #: ../jobviewer.py:91 ../troubleshoot/PrintTestPage.py:82
+-#, fuzzy
+ msgid "Document"
+-msgstr "Ghi chú"
++msgstr "Tà i liá»u"
+
+ #: ../jobviewer.py:92 ../jobviewer.py:153 ../my-default-printer.py:157
+ #: ../system-config-printer.py:269 ../system-config-printer.py:2720
+ #: ../troubleshoot/PrintTestPage.py:80
+-#, fuzzy
+ msgid "Printer"
+-msgstr "Máy in: "
++msgstr "Máy in"
+
+ #: ../jobviewer.py:93
+-#, fuzzy
+ msgid "Size"
+-msgstr "Cỡ giấy"
++msgstr "KÃch cỡ"
+
+ #: ../jobviewer.py:94
+ msgid "Time submitted"
+-msgstr ""
++msgstr "Giá» Äã gá»i"
+
+ #: ../jobviewer.py:95 ../troubleshoot/PrintTestPage.py:83
+ msgid "Status"
+-msgstr ""
++msgstr "Trạng thái"
+
+ #: ../jobviewer.py:125
+ #, python-format
+@@ -171,79 +165,75 @@
+ msgstr ""
+
+ #: ../jobviewer.py:132
++#, fuzzy
+ msgid "all jobs"
+-msgstr ""
++msgstr "Thôi má»i công viá»c"
+
+ #: ../jobviewer.py:133
+-#, python-format
++#, fuzzy, python-format
+ msgid "Document Print Status (%s)"
+-msgstr ""
++msgstr "Trạng thái in của tà i liá»u"
+
+ #: ../jobviewer.py:166
+ msgid "Message"
+-msgstr ""
++msgstr "Thông Äiá»p"
+
+ #: ../jobviewer.py:309
+ msgid "1 hour ago"
+-msgstr ""
++msgstr "1 giá» trÆ°á»c"
+
+ #: ../jobviewer.py:311
+ msgid "1 hour and 1 minute ago"
+-msgstr ""
++msgstr "1 giá» và 1 phút trÆ°á»c"
+
+ #: ../jobviewer.py:313
+ #, python-format
+ msgid "1 hour and %d minutes ago"
+-msgstr ""
++msgstr "1 giá» và %d phút trÆ°á»c"
+
+ #: ../jobviewer.py:316
+ #, python-format
+ msgid "%d hours ago"
+-msgstr ""
++msgstr "%d giá» trÆ°á»c"
+
+ #: ../jobviewer.py:318
+ #, python-format
+ msgid "%d hours and 1 minute ago"
+-msgstr ""
++msgstr "%d giá» 1 phút trÆ°á»c"
+
+ #: ../jobviewer.py:320
+ #, python-format
+ msgid "%d hours and %d minutes ago"
+-msgstr ""
++msgstr "%d giá» và %d phút trÆ°á»c"
+
+ #: ../jobviewer.py:326
+ msgid "a minute ago"
+-msgstr ""
++msgstr "má»t phút trÆ°á»c"
+
+ #: ../jobviewer.py:328
+ #, python-format
+ msgid "%d minutes ago"
+-msgstr ""
++msgstr "%d phút trÆ°á»c"
+
+ #: ../jobviewer.py:386 ../troubleshoot/PrintTestPage.py:40
+-#, fuzzy
+ msgid "Pending"
+-msgstr "Máy in: "
++msgstr "Treo"
+
+ #: ../jobviewer.py:387 ../troubleshoot/PrintTestPage.py:41
+-#, fuzzy
+ msgid "Held"
+-msgstr "Trợ _giúp"
++msgstr "Äã giữ lại"
+
+ #: ../jobviewer.py:390 ../troubleshoot/PrintTestPage.py:44
+-#, fuzzy
+ msgid "Canceled"
+-msgstr "_Hủy bá»"
++msgstr "BỠthôi"
+
+ #: ../jobviewer.py:391 ../troubleshoot/PrintTestPage.py:45
+-#, fuzzy
+ msgid "Aborted"
+-msgstr "Giá»i thiá»u"
++msgstr "Bá» hủy bá»"
+
+ #: ../jobviewer.py:392 ../troubleshoot/PrintTestPage.py:46
+-#, fuzzy
+ msgid "Completed"
+-msgstr "Ghi chú"
++msgstr "Hoà n tất"
+
+ #: ../jobviewer.py:439
+ #, python-format
+@@ -252,24 +242,21 @@
+
+ #: ../jobviewer.py:639
+ msgid "No documents queued"
+-msgstr ""
++msgstr "Không có tà i liá»u Äang Äợi in"
+
+ #: ../jobviewer.py:641
+ msgid "1 document queued"
+-msgstr ""
++msgstr "Có 1 tà i liá»u Äang Äợi in"
+
+ #: ../jobviewer.py:643
+ #, python-format
+ msgid "%d documents queued"
+-msgstr ""
++msgstr "Có %d tà i liá»u Äang Äợi in"
+
+ #: ../jobviewer.py:869
+ #, fuzzy, python-format
+ msgid "There was a problem sending document `%s' (job %d) to the printer."
+-msgstr ""
+-"Lá»i gá»i %s\n"
+-"Äến hà ng Äợi `%s':\n"
+-"\n"
++msgstr "Gặp lá»i khi kết ná»i Äến máy phục vụ CUPS."
+
+ #: ../jobviewer.py:872
+ #, python-format
+@@ -285,127 +272,120 @@
+ #: ../jobviewer.py:881 ../jobviewer.py:897
+ #, fuzzy
+ msgid "Print Error"
+-msgstr "Máy in: "
++msgstr "Lá»i máy in"
+
+ #: ../jobviewer.py:882
+ msgid "_Diagnose"
+ msgstr ""
+
+ #: ../jobviewer.py:903
+-#, python-format
++#, fuzzy, python-format
+ msgid "The printer called `%s' has been disabled."
+-msgstr ""
++msgstr "Hà nh Äợi « %s » chÆ°a Äược báºt."
+
+ #: ../my-default-printer.py:141 ../my-default-printer.desktop.in.h:1
+-#, fuzzy
msgid "Default Printer"
-msgstr "Äây là mô tả của máy in."
+msgstr "Máy in mặc Äá»nh"
--#: ../my-default-printer.py:140 ../my-default-printer.py:171
--#, fuzzy
-+#: ../my-default-printer.py:140
-+#: ../my-default-printer.py:171
+ #: ../my-default-printer.py:145 ../my-default-printer.py:181
+-#, fuzzy
msgid "_Use System Default"
-msgstr "Äặt là m _mặc Äá»nh"
+msgstr "_Dùng mặc Äá»nh của há» thá»ng"
--#: ../my-default-printer.py:141 ../my-default-printer.py:173
--#, fuzzy
-+#: ../my-default-printer.py:141
-+#: ../my-default-printer.py:173
+ #: ../my-default-printer.py:146 ../my-default-printer.py:183
+-#, fuzzy
msgid "_Set Default"
-msgstr "_Mặc Äá»nh"
+msgstr "Äặt _mặc Äá»nh"
--#: ../my-default-printer.py:151 ../troubleshoot.py:904 ../applet.py:186
-+#: ../my-default-printer.py:151
-+#: ../troubleshoot.py:904
-+#: ../applet.py:186
- #: ../applet.py:226
--#, fuzzy
- msgid "Printer"
--msgstr "Máy in: "
-+msgstr "Máy in"
-
--#: ../my-default-printer.py:155 ../system-config-printer.py:2373
--#: ../troubleshoot.py:592 ../troubleshoot.py:1368
--#, fuzzy
-+#: ../my-default-printer.py:155
-+#: ../system-config-printer.py:2373
-+#: ../troubleshoot.py:592
-+#: ../troubleshoot.py:1368
+ #: ../my-default-printer.py:162 ../system-config-printer.py:2430
+ #: ../troubleshoot/ChooseNetworkPrinter.py:37
+ #: ../troubleshoot/ChoosePrinter.py:38
+-#, fuzzy
msgid "Location"
-msgstr "_Hà nh Äá»ng"
-+msgstr ""
-+"Vá» trÃ"
++msgstr "Vá» trÃ"
#: ../optionwidgets.py:116
msgid "Conflicts with:"
-msgstr ""
+msgstr "Xung Äá»t vá»i:"
- #: ../system-config-printer.py:360
--#, fuzzy
- msgid "Server Settings"
--msgstr "Tùy chá»n driver"
-+msgstr "Thiết láºp máy phục vụ"
-
--#: ../system-config-printer.py:366 ../system-config-printer.py:368
-+#: ../system-config-printer.py:366
-+#: ../system-config-printer.py:368
+ #: ../system-config-printer.py:275
+ #, fuzzy
+ msgid "Class"
+-msgstr "BÃ danh"
++msgstr "Hạng má»i"
+
+ #. Set up "Problems?" link button
+ #: ../system-config-printer.py:305
++#, fuzzy
+ msgid "Problems?"
+-msgstr ""
++msgstr "Dò"
+
+ #: ../system-config-printer.py:345 ../system-config-printer.py:347
msgid "Members of this class"
-msgstr ""
+msgstr "Các bỠphạn của hạng nà y"
--#: ../system-config-printer.py:367 ../system-config-printer.py:369
-+#: ../system-config-printer.py:367
-+#: ../system-config-printer.py:369
+ #: ../system-config-printer.py:346 ../system-config-printer.py:348
msgid "Others"
-msgstr ""
+msgstr "Khác"
- #: ../system-config-printer.py:370
+ #: ../system-config-printer.py:349
-#, fuzzy
msgid "Devices"
msgstr "Thiết bá»"
- #: ../system-config-printer.py:371
+ #: ../system-config-printer.py:350
msgid "Makes"
-msgstr ""
+msgstr "Nhà chế tạo"
- #: ../system-config-printer.py:372
+ #: ../system-config-printer.py:351
-#, fuzzy
msgid "Models"
-msgstr "Kiá»u"
+msgstr "Mô hình"
- #: ../system-config-printer.py:373
+ #: ../system-config-printer.py:352
-#, fuzzy
msgid "Drivers"
-msgstr "Driver"
+msgstr "Trình Äiá»u khiá»n"
--#: ../system-config-printer.py:374 ../system-config-printer.glade.h:107
--#, fuzzy
-+#: ../system-config-printer.py:374
-+#: ../system-config-printer.glade.h:107
+ #: ../system-config-printer.py:353 ../system-config-printer.glade.h:101
+-#, fuzzy
msgid "Downloadable Drivers"
-msgstr "Driver hiá»n có:"
+msgstr "Trình Äiá»u khiá»n có thá» tải vá»"
- #: ../system-config-printer.py:375
+ #: ../system-config-printer.py:354
-#, fuzzy
msgid "Users"
msgstr "NgÆ°á»i dùng"
- #: ../system-config-printer.py:402
+ #: ../system-config-printer.py:388
msgid "Automatic rotation"
-msgstr ""
+msgstr "Tá»± Äá»ng xoay"
- #: ../system-config-printer.py:556
+ #: ../system-config-printer.py:554
+ #, fuzzy, python-format
+ msgid "Printer Properties - `%s' on %s"
+-msgstr "Tùy chá»n bá» lá»c"
++msgstr "Tùy chá»n máy in"
+
+ #: ../system-config-printer.py:657
#, python-format
msgid "Printer configuration - %s"
-msgstr "Cấu hình máy in - %s"
+msgstr "Cấu hình máy in â %s"
- #: ../system-config-printer.py:559
+ #: ../system-config-printer.py:660
#, python-format
msgid "Connected to %s"
-msgstr ""
+msgstr "Äã kết ná»i Äến %s"
--#: ../system-config-printer.py:561 ../system-config-printer.py:1273
--#, fuzzy
-+#: ../system-config-printer.py:561
-+#: ../system-config-printer.py:1273
- msgid "Not connected"
--msgstr "_Kết ná»i cục bá»"
-+msgstr "ChÆ°a kết ná»i"
-
- #: ../system-config-printer.py:672
--#, fuzzy
- msgid "Local Printers"
+ #: ../system-config-printer.py:751
+ #, fuzzy
+ msgid "Remote class"
+-msgstr "Máy in JetDirect"
++msgstr "Hạng từ xa"
+
+ #: ../system-config-printer.py:753
+ #, fuzzy
+ msgid "Remote printer"
+-msgstr "Máy in JetDirect"
++msgstr "Máy in từ xa"
+
+ #: ../system-config-printer.py:757
++#, fuzzy
+ msgid "Local class"
+-msgstr ""
++msgstr "Hạng cục bá»"
+
+ #: ../system-config-printer.py:759
+ #, fuzzy
+ msgid "Local printer"
-msgstr "Hiá»u chá»nh Máy in cục bá»"
+msgstr "Máy in cục bá»"
- #: ../system-config-printer.py:673
- msgid "Local Classes"
--msgstr ""
-+msgstr "Hạng cục bá»"
-
- #: ../system-config-printer.py:674
--#, fuzzy
- msgid "Remote Printers"
--msgstr "Máy in JetDirect"
-+msgstr "Máy in từ xa"
-
- #: ../system-config-printer.py:675
- msgid "Remote Classes"
--msgstr ""
-+msgstr "Hạng từ xa"
-
- #: ../system-config-printer.py:783
+ #: ../system-config-printer.py:829
#, python-format
- msgid ""
+@@ -413,15 +393,16 @@
"Connecting to server:\n"
"%s"
--msgstr ""
-+msgstr "Äang kết ná»i Äến máy phục vụ :\n"
+ msgstr ""
++"Äang kết ná»i Äến máy phục vụ :\n"
+"%s"
- #: ../system-config-printer.py:1202
+ #: ../system-config-printer.py:1190
msgid "Installable Options"
-msgstr ""
+msgstr "Tùy chá»n có thá» cà i Äặt"
--#: ../system-config-printer.py:1203 ../system-config-printer.glade.h:209
--#, fuzzy
-+#: ../system-config-printer.py:1203
-+#: ../system-config-printer.glade.h:209
+ #: ../system-config-printer.py:1191 ../system-config-printer.glade.h:198
+-#, fuzzy
msgid "Printer Options"
-msgstr "Tùy chá»n bá» lá»c"
+msgstr "Tùy chá»n máy in"
#: ../system-config-printer.py:1212
msgid ""
- "There are conflicting options.\n"
+@@ -429,39 +410,44 @@
"Changes can only be applied after\n"
"these conflicts are resolved."
--msgstr ""
-+msgstr "Có các tùy chá»n xung Äá»t vá»i nhau.\n"
+ msgstr ""
++"Có các tùy chá»n xung Äá»t vá»i nhau.\n"
+"Chá» có thỠáp dụng các thay Äá»i\n"
+"má»t khi giải quyết các sá»± xung Äá»t nà y."
--#: ../system-config-printer.py:1241 ../system-config-printer.py:1257
-+#: ../system-config-printer.py:1241
-+#: ../system-config-printer.py:1257
- #: ../applet.py:349
- msgid "Not authorized"
--msgstr ""
-+msgstr "Chưa xác thực"
-
--#: ../system-config-printer.py:1242 ../applet.py:350
-+#: ../system-config-printer.py:1242
-+#: ../applet.py:350
- msgid "The password may be incorrect."
--msgstr ""
-+msgstr "Máºt khẩu có thá» không Äúng."
-
--#: ../system-config-printer.py:1245 ../system-config-printer.py:1278
-+#: ../system-config-printer.py:1245
-+#: ../system-config-printer.py:1278
- #: ../applet.py:353
- msgid "CUPS server error"
--msgstr ""
-+msgstr "Lá»i máy phục vụ CUPS"
-
--#: ../system-config-printer.py:1246 ../applet.py:354
--#, fuzzy, python-format
-+#: ../system-config-printer.py:1246
-+#: ../applet.py:354
-+#, python-format
- msgid "There was an error during the CUPS operation: '%s'."
--msgstr "Lá»i khi in trang thá»."
-+msgstr "Gặp lá»i trong thao tác CUPS: « %s »"
-
- #: ../system-config-printer.py:1258
- msgid ""
- "The password may be incorrect, or the server may be configured to deny "
- "remote administration."
- msgstr ""
-+"Có lẽ máºt khẩu không Äúng, hoặc máy phục vụ có cấu hình mà từ chá»i quản lý từ xa."
-
- #: ../system-config-printer.py:1263
- msgid "Bad request"
--msgstr ""
-+msgstr "Yêu cầu sai"
-
- #: ../system-config-printer.py:1265
--#, fuzzy
- msgid "Not found"
--msgstr "_Kết ná»i cục bá»"
-+msgstr "Không tìm thấy"
-
- #: ../system-config-printer.py:1267
- msgid "Request timeout"
--msgstr ""
-+msgstr "Quá hạn yêu cầu"
-
- #: ../system-config-printer.py:1269
- msgid "Upgrade required"
--msgstr ""
-+msgstr "Cần thiết nâng cấp"
-
- #: ../system-config-printer.py:1271
- msgid "Server error"
--msgstr ""
-+msgstr "Lá»i máy phục vụ"
-
- #: ../system-config-printer.py:1275
- #, python-format
- msgid "status %d"
--msgstr ""
-+msgstr "trạng thái %d"
-
- #: ../system-config-printer.py:1279
- #, python-format
- msgid "There was an HTTP error: %s."
--msgstr ""
-+msgstr "Gặp lá»i HTTP: %s"
-
- #: ../system-config-printer.py:1303
+ #: ../system-config-printer.py:1239
msgid "This will delete this class!"
-msgstr ""
+msgstr "Äây sẽ xoá hạng nà y !"
- #: ../system-config-printer.py:1304
+ #: ../system-config-printer.py:1240
msgid "Proceed anyway?"
-msgstr ""
+msgstr "Vẫn còn tiếp tục không?"
--#: ../system-config-printer.py:1518 ../system-config-printer.py:1552
-+#: ../system-config-printer.py:1518
-+#: ../system-config-printer.py:1552
+ #: ../system-config-printer.py:1419 ../system-config-printer.py:1449
msgid "Submitted"
-msgstr ""
+msgstr "Äã gá»i"
- #: ../system-config-printer.py:1519
+ #: ../system-config-printer.py:1420
#, python-format
msgid "Test page submitted as job %d"
-msgstr ""
+msgstr "Trang thá» Äã Äược gá»i dÆ°á»i dạng công viá»c %d"
--#: ../system-config-printer.py:1530 ../system-config-printer.py:1562
-+#: ../system-config-printer.py:1530
-+#: ../system-config-printer.py:1562
- #: ../system-config-printer.py:3482
+ #: ../system-config-printer.py:1429 ../system-config-printer.py:1458
+ #: ../system-config-printer.py:3801
msgid "Not possible"
-msgstr ""
+msgstr "Không thá» là m Äược"
--#: ../system-config-printer.py:1531 ../system-config-printer.py:1563
-+#: ../system-config-printer.py:1531
-+#: ../system-config-printer.py:1563
+ #: ../system-config-printer.py:1430 ../system-config-printer.py:1459
msgid ""
"The remote server did not accept the print job, most likely because the "
"printer is not shared."
--msgstr ""
-+msgstr "Máy phục vụ từ xa không chấp nháºn công viá»c in, rất có thá» vì máy in Äó không dùng chung."
-
- #: ../system-config-printer.py:1553
+ msgstr ""
++"Máy phục vụ từ xa không chấp nháºn công viá»c in, rất có thá» vì máy in Äó "
++"không dùng chung."
+
+ #: ../system-config-printer.py:1450
#, python-format
msgid "Maintenance command submitted as job %d"
-msgstr ""
+msgstr "Câu lá»nh bảo trì Äã Äược gá»i dÆ°á»i dạng công viá»c %d"
--#: ../system-config-printer.py:1649 ../system-config-printer.py:1791
-+#: ../system-config-printer.py:1649
-+#: ../system-config-printer.py:1791
- msgid "Error"
+ #. The underlying cupsGetPPD2() function returned NULL without
+ #. setting an IPP error, so it'll be something like a failed
+@@ -471,32 +457,28 @@
msgstr "Lá»i"
- #: ../system-config-printer.py:1650
+ #: ../system-config-printer.py:1504
-#, fuzzy
msgid "There was a problem connecting to the CUPS server."
-msgstr ""
@@ -394,249 +564,193 @@
-"\n"
+msgstr "Gặp lá»i khi kết ná»i Äến máy phục vụ CUPS."
- #: ../system-config-printer.py:1703
--#, fuzzy
- msgid "This is the default printer"
--msgstr "Äây là mô tả của máy in."
-+msgstr "Äây là máy in mặc Äá»nh"
-
- #: ../system-config-printer.py:1707
- msgid "No default printer set."
--msgstr ""
-+msgstr "ChÆ°a Äặt máy in mặc Äá»nh."
-
- #: ../system-config-printer.py:1792
+ #: ../system-config-printer.py:1629
#, python-format
msgid "Option '%s' has value '%s' and cannot be edited."
-msgstr ""
+msgstr "Tùy chá»n « %s » có giá trỠ« %s » nên không thá» sá»a Äược."
- #: ../system-config-printer.py:1832
--#, fuzzy
- msgid "Cancel Tests"
--msgstr "Hủy bá»"
-+msgstr "Thôi thá»"
-
--#. Not more than 25 characters
--#: ../system-config-printer.py:1836 ../troubleshoot.py:894
-+#: ../system-config-printer.py:1836
-+#: ../troubleshoot.py:894
- #: ../system-config-printer.glade.h:208
--#, fuzzy
-+#. Not more than 25 characters
- msgid "Print Test Page"
--msgstr "Ghi chú máy in:"
-+msgstr "In tráng thá»"
-
- #: ../system-config-printer.py:2066
--#, fuzzy, python-format
-+#, python-format
- msgid "Really delete printer %s?"
--msgstr "Tháºt sá»± muá»n xóa \"%s\" chứ?"
-+msgstr ""
-+"Thực sự xoá máy in %s không?"
-
- #: ../system-config-printer.py:2068
--#, fuzzy, python-format
-+#, python-format
- msgid "Really delete class %s?"
+ #: ../system-config-printer.py:2045
+ #, fuzzy, python-format
+ msgid "Really delete class `%s'?"
-msgstr "Tháºt sá»± muá»n xóa \"%s\" chứ?"
+msgstr "Thực sự xoá hạng %s không?"
--#. SMB list columns
- #: ../system-config-printer.py:2345
-+#. SMB list columns
+ #: ../system-config-printer.py:2047
+ #, fuzzy, python-format
+ msgid "Really delete printer `%s'?"
+-msgstr "Tháºt sá»± muá»n xóa \"%s\" chứ?"
++msgstr "Thực sự xoá máy in %s không?"
+
+ #: ../system-config-printer.py:2049
+ #, fuzzy
+ msgid "Really delete selected destinations?"
+-msgstr "Tháºt sá»± muá»n xóa \"%s\" chứ?"
++msgstr "Thực sự xoá máy in %s không?"
+
+ #: ../system-config-printer.py:2389 ../system-config-printer.py:2399
msgid "Share"
- msgstr "Chia sẻ"
-
- #: ../system-config-printer.py:2351
- msgid "Comment"
--msgstr "Ghi chú"
-+msgstr ""
-+"Ghi chú"
-
--#. IPP list columns
- #: ../system-config-printer.py:2367
-+#. IPP list columns
- msgid "Queue"
- msgstr "Hà ng Äợi"
-
-@@ -326,441 +344,435 @@
- msgid ""
+@@ -516,45 +498,41 @@
"PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
"PPD.GZ)"
--msgstr ""
-+msgstr "Táºp tin Mô tả Máy in PostScript (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *.PPD.GZ)"
-
- #: ../system-config-printer.py:2390
+ msgstr ""
++"Táºp tin Mô tả Máy in PostScript (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *.PPD.GZ)"
+
+ #: ../system-config-printer.py:2447
msgid "All files (*)"
-msgstr ""
+msgstr "Má»i táºp tin (*)"
--#: ../system-config-printer.py:2425 ../system-config-printer.py:3741
-+#: ../system-config-printer.py:2425
-+#: ../system-config-printer.py:3741
- #: ../system-config-printer.py:3775
+ #: ../system-config-printer.py:2485 ../system-config-printer.py:4069
+ #: ../system-config-printer.py:4103
-#, fuzzy
msgid "Search"
-msgstr "Cảnh báo"
+msgstr "Tìm kiếm"
--#: ../system-config-printer.py:2428 ../system-config-printer.glade.h:155
--#, fuzzy
-+#: ../system-config-printer.py:2428
-+#: ../system-config-printer.glade.h:155
+ #: ../system-config-printer.py:2488 ../system-config-printer.glade.h:144
+-#, fuzzy
msgid "New Printer"
-msgstr "Máy in:"
+msgstr "Máy in má»i"
--#: ../system-config-printer.py:2438 ../system-config-printer.glade.h:154
-+#: ../system-config-printer.py:2438
-+#: ../system-config-printer.glade.h:154
+ #: ../system-config-printer.py:2499
msgid "New Class"
-msgstr ""
+msgstr "Hạng má»i"
- #: ../system-config-printer.py:2443
+ #: ../system-config-printer.py:2504
msgid "Change Device URI"
- msgstr ""
-+"Äá»i URI thiết bá»"
-
- #: ../system-config-printer.py:2452
+-msgstr ""
++msgstr "Äá»i URI thiết bá»"
+
+ #: ../system-config-printer.py:2513
-#, fuzzy
msgid "Change Driver"
-msgstr "Äá»i kiá»u"
+msgstr "Äá»i trình Äiá»u khiá»n"
--#: ../system-config-printer.py:2551 ../system-config-printer.py:2775
--#: ../system-config-printer.py:2941 ../system-config-printer.py:3764
--#, fuzzy
-+#: ../system-config-printer.py:2551
-+#: ../system-config-printer.py:2775
-+#: ../system-config-printer.py:2941
-+#: ../system-config-printer.py:3764
+ #: ../system-config-printer.py:2607 ../system-config-printer.py:2872
+ #: ../system-config-printer.py:3058 ../system-config-printer.py:4092
+-#, fuzzy
msgid "Searching"
-msgstr "Cảnh báo"
+msgstr "Tìm kiếm"
--#: ../system-config-printer.py:2552 ../system-config-printer.py:2776
--#, fuzzy
-+#: ../system-config-printer.py:2552
-+#: ../system-config-printer.py:2776
+ #: ../system-config-printer.py:2608 ../system-config-printer.py:2873
+-#, fuzzy
msgid "Searching for drivers"
-msgstr "Thuá»c tÃnh chia sẻ"
+msgstr "Äang tìm kiếm trình Äiá»u khiá»n"
- #: ../system-config-printer.py:2942
+ #: ../system-config-printer.py:2721
+ msgid "Fax"
+@@ -567,125 +545,119 @@
+ msgstr ""
+
+ #: ../system-config-printer.py:3059
-#, fuzzy
msgid "Searching for printers"
-msgstr "Thuá»c tÃnh chia sẻ"
+msgstr "Äang tìm kiếm máy in"
- #: ../system-config-printer.py:3160
+ #: ../system-config-printer.py:3305
msgid "Other"
-msgstr ""
+msgstr "Khác"
- #: ../system-config-printer.py:3162
+ #: ../system-config-printer.py:3307
msgid " (Current)"
-msgstr ""
+msgstr "(Hiá»n thá»i)"
--#: ../system-config-printer.py:3188 ../system-config-printer.py:3449
-+#: ../system-config-printer.py:3188
-+#: ../system-config-printer.py:3449
+ #: ../system-config-printer.py:3336 ../system-config-printer.py:3342
+ #: ../system-config-printer.py:3769
msgid "Scanning..."
-msgstr ""
+msgstr "Äang quét..."
--#: ../system-config-printer.py:3360 ../system-config-printer.py:3427
--#, fuzzy
-+#: ../system-config-printer.py:3360
-+#: ../system-config-printer.py:3427
+ #: ../system-config-printer.py:3687 ../system-config-printer.py:3750
+-#, fuzzy
msgid "Verified"
-msgstr "(Không xác Äá»nh)"
+msgstr "Äã thẩm tra"
--#: ../system-config-printer.py:3361 ../system-config-printer.py:3428
-+#: ../system-config-printer.py:3361
-+#: ../system-config-printer.py:3428
+ #: ../system-config-printer.py:3688 ../system-config-printer.py:3751
msgid "This print share is accessible."
-msgstr ""
+msgstr "Có thá» tá»i vùng in chung nà y."
--#: ../system-config-printer.py:3368 ../system-config-printer.py:3434
-+#: ../system-config-printer.py:3368
-+#: ../system-config-printer.py:3434
+ #: ../system-config-printer.py:3694 ../system-config-printer.py:3756
msgid "Inaccessible"
-msgstr ""
+msgstr "Không tá»i Äược"
--#: ../system-config-printer.py:3369 ../system-config-printer.py:3435
-+#: ../system-config-printer.py:3369
-+#: ../system-config-printer.py:3435
+ #: ../system-config-printer.py:3695 ../system-config-printer.py:3757
msgid "This print share is not accessible."
-msgstr ""
+msgstr "Không thá» tá»i vùng in chung nà y."
- #: ../system-config-printer.py:3483
+ #: ../system-config-printer.py:3802
msgid "It is not possible to obtain a list of queues from this host."
-msgstr ""
+msgstr "Không thá» lấy danh sách các hà ng Äợi từ máy nà y."
- #: ../system-config-printer.py:3487
+ #: ../system-config-printer.py:3805
-#, fuzzy
msgid "No queues"
-msgstr "Tạ_o hà ng Äợi má»i"
+msgstr "Không có hà ng Äợi"
- #: ../system-config-printer.py:3488
+ #: ../system-config-printer.py:3806
-#, fuzzy
msgid "There are no queues available."
-msgstr "Không có tùy chá»n nà y cho driver nà y."
+msgstr "Không có hà ng Äợi công bá»."
- #: ../system-config-printer.py:3545
+ #: ../system-config-printer.py:3861
msgid "A printer connected to the parallel port."
-msgstr ""
+msgstr "Má»t máy in Äược kết ná»i Äến cá»ng song song."
- #: ../system-config-printer.py:3547
+ #: ../system-config-printer.py:3863
msgid "A printer connected to a USB port."
-msgstr ""
+msgstr "Má»t máy in Äược kết ná»i Äến má»t cá»ng USB."
- #: ../system-config-printer.py:3549
+ #: ../system-config-printer.py:3865
msgid ""
"HPLIP software driving a printer, or the printer function of a multi-"
"function device."
--msgstr ""
-+msgstr "Phần má»m HPLIP Äiá»u khiá»n máy in, hoặc chức nÄng in của má»t thiết bá» Äa chức nÄng."
-
- #: ../system-config-printer.py:3552
+ msgstr ""
++"Phần má»m HPLIP Äiá»u khiá»n máy in, hoặc chức nÄng in của má»t thiết bá» Äa chức "
++"nÄng."
+
+ #: ../system-config-printer.py:3868
msgid ""
"HPLIP software driving a fax machine, or the fax function of a multi-"
"function device."
--msgstr ""
-+msgstr "Phần má»m HPLIP Äiá»u khiá»n máy Äiá»n thÆ°, hoặc chức nÄng Äiá»n thÆ° của má»t thiết bá» Äa chức nÄng."
-
- #: ../system-config-printer.py:3555
+ msgstr ""
++"Phần má»m HPLIP Äiá»u khiá»n máy Äiá»n thÆ°, hoặc chức nÄng Äiá»n thÆ° của má»t "
++"thiết bá» Äa chức nÄng."
+
+ #: ../system-config-printer.py:3871
msgid "Local printer detected by the Hardware Abstraction Layer (HAL)."
-msgstr ""
+msgstr "Máy in cục bá» Äược phát hiá»n bá»i Lá»p TrÃch yếu Phần cứng (HAL)."
- #: ../system-config-printer.py:3787
+ #: ../system-config-printer.py:4115
-#, fuzzy
msgid "-- Select printer model --"
-msgstr "Bạn phải chá»n kiá»u máy in."
+msgstr "â Chá»n mô hình máy in â"
- #: ../system-config-printer.py:3789
+ #: ../system-config-printer.py:4117
msgid "-- No matches found --"
-msgstr ""
+msgstr "â Không tìm thấy â"
- #: ../system-config-printer.py:3954
+ #: ../system-config-printer.py:4290
-#, fuzzy
msgid " (recommended)"
-msgstr ""
@@ -644,511 +758,119 @@
-"dùng là %s)"
+msgstr " (khuyến khÃch)"
- #: ../system-config-printer.py:3968
+ #: ../system-config-printer.py:4304
msgid "This PPD is generated by foomatic."
-msgstr ""
+msgstr "PPD nà y Äược foomatic tạo ra."
- #: ../system-config-printer.py:3994
+ #: ../system-config-printer.py:4330
-#, fuzzy
msgid "OpenPrinting"
-msgstr "Máy in: "
+msgstr "OpenPrinting"
- #: ../system-config-printer.py:3996
+ #: ../system-config-printer.py:4332
msgid "Distributable"
-msgstr ""
+msgstr "Có thá» phân phá»i"
- #: ../system-config-printer.py:3998
+ #: ../system-config-printer.py:4334
msgid "None"
-msgstr "Không"
+msgstr "Không có"
- #: ../system-config-printer.py:4006
+ #: ../system-config-printer.py:4342
-#, fuzzy
msgid "Not specified."
-msgstr "Bạn phải xác Äá»nh thiết bá»."
-+msgstr ""
-+"Chưa ghi rõ."
-
--#. Foomatic database problem of some sort.
- #: ../system-config-printer.py:4033
-+#. Foomatic database problem of some sort.
++msgstr "Chưa ghi rõ."
+
+ #. Foomatic database problem of some sort.
+ #: ../system-config-printer.py:4382
msgid "Database error"
-msgstr ""
+msgstr "Lá»i cÆ¡ sá» dữ liá»u"
- #: ../system-config-printer.py:4034
+ #: ../system-config-printer.py:4383
#, python-format
msgid "The '%s' driver cannot be used with printer '%s %s'."
- msgstr ""
-+"Trình Äiá»u khiá»n « %s » không thá» dùng Äược vá»i máy in « %s %s »."
-
-+#: ../system-config-printer.py:4044
-+#, python-format
+-msgstr ""
++msgstr "Trình Äiá»u khiá»n « %s » không thá» dùng Äược vá»i máy in « %s %s »."
+
#. This printer references some XML that is not
#. installed by default. Point the user at the
- #. package they need to install.
--#: ../system-config-printer.py:4044
--#, python-format
+@@ -693,22 +665,21 @@
+ #: ../system-config-printer.py:4393
+ #, python-format
msgid "You will need to install the '%s' package in order to use this driver."
-msgstr ""
+msgstr "Bạn sẽ cần phải cà i Äặt gói « %s » Äá» sá» dụng trình Äiá»u khiá»n nà y."
--#. This error came from trying to open the PPD file.
- #: ../system-config-printer.py:4051
-+#. This error came from trying to open the PPD file.
+ #. This error came from trying to open the PPD file.
+ #: ../system-config-printer.py:4400
msgid "PPD error"
- msgstr ""
-+"Lá»i PPD"
-
- #: ../system-config-printer.py:4053
+-msgstr ""
++msgstr "Lá»i PPD"
+
+ #: ../system-config-printer.py:4402
msgid "Failed to read PPD file. Possible reason follows:"
-msgstr ""
+msgstr "Lá»i Äá»c táºp tin PPD. Lý do có thá» là :"
--#. Failed to get PPD downloaded from OpenPrinting XXX
- #: ../system-config-printer.py:4064
--#, fuzzy
-+#. Failed to get PPD downloaded from OpenPrinting XXX
+ #. Failed to get PPD downloaded from OpenPrinting XXX
+ #: ../system-config-printer.py:4413
+-#, fuzzy
msgid "Downloadable drivers"
-msgstr "Driver hiá»n có:"
+msgstr "Trình Äiá»u khiá»n có thá» tải vá»"
- #: ../system-config-printer.py:4065
- msgid "Support for downloadable drivers is not yet completed."
--msgstr ""
-+msgstr "ChÆ°a hoà n tất há» trợ cho trình Äiá»u khiá»n có thá» tải vá»."
-
--#: ../system-config-printer.py:4115 ../system-config-printer.py:4152
-+#: ../system-config-printer.py:4115
-+#: ../system-config-printer.py:4152
+ #: ../system-config-printer.py:4414
+ msgid "Failed to download PPD."
+@@ -716,32 +687,28 @@
+
+ #: ../system-config-printer.py:4450 ../system-config-printer.py:4488
msgid "No Installable Options"
-msgstr ""
+msgstr "Không có tùy chá»n có thá» cà i Äặt"
- #: ../system-config-printer.py:4199
+ #: ../system-config-printer.py:4534
-#, fuzzy
msgid "Adding"
-msgstr "Máy in: "
+msgstr "Thêm"
- #: ../system-config-printer.py:4200
+ #: ../system-config-printer.py:4535
-#, fuzzy
msgid "Adding printer"
-msgstr "Thêm hà ng Äợi in má»i"
+msgstr "Äang thêm máy in"
- #: ../system-config-printer.py:4352
+ #: ../system-config-printer.py:4696
-#, fuzzy
msgid "Install driver"
-msgstr "Driver máy in"
+msgstr "Cà i Äặt trình Äiá»u khiá»n"
- #: ../system-config-printer.py:4353
+ #: ../system-config-printer.py:4697
#, python-format
msgid "Printer '%s' requires the %s package but it is not currently installed."
- msgstr ""
-+"Máy in « %s » cần thiết gói %s mà chÆ°a Äược cà i Äặt."
-
- #: ../system-config-printer.py:4360
+-msgstr ""
++msgstr "Máy in « %s » cần thiết gói %s mà chÆ°a Äược cà i Äặt."
+
+ #: ../system-config-printer.py:4722
-#, fuzzy
msgid "Missing driver"
-msgstr "Driver máy in"
+msgstr "Thiếu trình Äiá»u khiá»n"
- #: ../system-config-printer.py:4361
+ #: ../system-config-printer.py:4723
#, python-format
- msgid ""
+@@ -749,10 +716,12 @@
"Printer '%s' requires the '%s' program but it is not currently installed. "
"Please install it before using this printer."
--msgstr ""
-+msgstr "Máy in « %s » cần thiết chÆ°Æ¡ng trình « %s » mà chÆ°a Äược cà i Äặt. Hãy cà i Äặt nó trÆ°á»c khi sá» dụng máy in nà y."
-
- #: ../troubleshoot.py:46
- msgid ""
- "To start this tool, select System->Administration->Printing from the main "
- "menu."
--msgstr ""
-+msgstr "Äá» khá»i chạy công cụ nà y, chá»n « Há» thá»ng > Quản trá» > In » trong trình ÄÆ¡n chÃnh."
-
- #: ../troubleshoot.py:56
--#, fuzzy
- msgid "Authentication"
- msgstr "Xác thực"
-
- #: ../troubleshoot.py:71
--#, fuzzy
- msgid "Password required"
--msgstr "Máºt khẩu:"
-+msgstr "Cần thiết máºt khẩu"
-
--#: ../troubleshoot.py:79 ../system-config-printer.glade.h:195
-+#: ../troubleshoot.py:79
-+#: ../system-config-printer.glade.h:195
- #: ../applet.glade.h:5
- msgid "Password:"
--msgstr "Máºt khẩu:"
-+msgstr "Máºt khẩu :"
-
- #: ../troubleshoot.py:104
- msgid "Printing troubleshooter"
--msgstr ""
-+msgstr "Bá» giải Äáp thắc mắc viá»c in"
-
- #: ../troubleshoot.py:401
- msgid "Trouble-shooting Printing"
--msgstr ""
-+msgstr "Giải Äáp thắc mắc viá»c in"
-
- #: ../troubleshoot.py:403
- msgid ""
- "In the next few screens I will ask you some questions about your problem "
- "with printing. Based on your answers I will try to suggest a solution."
--msgstr ""
-+msgstr "Và i mà n hình kế tiếp sẽ há»i má»t sá» câu vá» vấn Äá» in của bạn. Dá»±a và o các trả lá»i, chÆ°Æ¡ng trình sẽ thá» Äá» nghá» cách giải quyết."
-
- #: ../troubleshoot.py:407
- msgid "Click 'Forward' to begin."
--msgstr ""
-+msgstr "Nhấn và o « Tiếp » Äá» bắt Äầu."
-
- #: ../troubleshoot.py:418
- msgid "Sorry!"
- msgstr ""
-+"Tiếc là "
-
- #: ../troubleshoot.py:419
- msgid ""
- "I have not been able to work out what the problem is, but I have collected "
- "some useful information to put in a bug report."
--msgstr ""
-+msgstr "chÆ°Æ¡ng trình nà y không thá» giải quyết vấn Äá» nà y, nhÆ°ng Äã thu tháºp má»t và i thông tin có Ãch Äá» kèm thêm và o má»t báo cáo lá»i."
-
- #: ../troubleshoot.py:488
--#, fuzzy
- msgid "Queue Not Accepting Jobs"
--msgstr "Tùy chá»n hà ng Äợi"
-+msgstr "Hà ng Äợi không chấp nháºn công viá»c"
-
- #: ../troubleshoot.py:489
- msgid "The CUPS printer on the server is not accepting jobs."
--msgstr ""
-+msgstr "Máy in CUPS trên máy phục vụ không Äang chấp nháºn công viá»c in."
-
--#: ../troubleshoot.py:513 ../troubleshoot.py:1259
--#, fuzzy
-+#: ../troubleshoot.py:513
-+#: ../troubleshoot.py:1259
- msgid "Queue Not Enabled"
--msgstr "Tên hà ng Äợi"
-+msgstr "ChÆ°a báºt hà ng Äợi"
-
- #: ../troubleshoot.py:514
- msgid "The CUPS printer on the server is not enabled."
--msgstr ""
-+msgstr "Máy in CUPS trên máy phục vụ chÆ°a Äược hiá»u lá»±c."
-
--#: ../troubleshoot.py:531 ../troubleshoot.py:1253
-+#: ../troubleshoot.py:531
-+#: ../troubleshoot.py:1253
- #, python-format
- msgid "The reason given is: `%s'."
--msgstr ""
-+msgstr "Lý do là : « %s »"
-
--#: ../troubleshoot.py:533 ../troubleshoot.py:1255
-+#: ../troubleshoot.py:533
-+#: ../troubleshoot.py:1255
- msgid "This may be due to the printer being disconnected or switched off."
--msgstr ""
-+msgstr "Có lẽ vì máy in bá» ngắt kết ná»i hoặc bá» tắt."
-
- #: ../troubleshoot.py:549
--#, fuzzy
- msgid "Queue Not Shared"
--msgstr "Tên hà ng Äợi"
-+msgstr ""
-+"Hà ng Äợi không dùng chung"
-
- #: ../troubleshoot.py:550
- msgid "The CUPS printer on the server is not shared."
--msgstr ""
-+msgstr "Máy in CUPS trên máy phục vụ không Äược dùng chung."
-
- #: ../troubleshoot.py:584
--#, fuzzy
- msgid "Choose Network Printer"
--msgstr "Máy in:"
-+msgstr "Chá»n máy in mạng"
-
- #: ../troubleshoot.py:585
- msgid ""
- "Please select the network printer you are trying to use from the list below. "
- "If it does not appear in the list, select 'Not listed'."
--msgstr ""
-+msgstr "Trong danh sách bên dÆ°á»i, hãy chá»n máy in mạng bạn Äang thá» dùng. Không có trong danh sách thì chá»n mục « Không có trong danh sách »."
-
--#: ../troubleshoot.py:590 ../troubleshoot.py:1366
-+#: ../troubleshoot.py:590
-+#: ../troubleshoot.py:1366
- msgid "Name"
- msgstr "Tên"
-
--#: ../troubleshoot.py:594 ../troubleshoot.py:1370
--#, fuzzy
-+#: ../troubleshoot.py:594
-+#: ../troubleshoot.py:1370
- msgid "Information"
--msgstr "_Hà nh Äá»ng"
-+msgstr "Thông tin"
-
--#: ../troubleshoot.py:627 ../troubleshoot.py:1394
--#, fuzzy
-+#: ../troubleshoot.py:627
-+#: ../troubleshoot.py:1394
- msgid "Not listed"
--msgstr "_Kết ná»i cục bá»"
-+msgstr "Không có trong danh sách"
-
- #: ../troubleshoot.py:788
--#, fuzzy
- msgid "Remote Address"
--msgstr "Máy in JetDirect"
-+msgstr "Äá»a chá» á» xa"
-
- #: ../troubleshoot.py:789
- msgid ""
- "Please enter as many details as you can about the network address of this "
- "printer."
- msgstr ""
-+"Hãy nháºp cà ng nhiá»u chi tiết cà ng có thá» vá» Äá»a chá» mạng của máy in nà y."
-
- #: ../troubleshoot.py:797
--#, fuzzy
- msgid "Server name:"
--msgstr "Tên ngÆ°á»i dùng:"
-+msgstr "Tên máy phục vụ :"
-
- #: ../troubleshoot.py:803
--#, fuzzy
- msgid "Server IP address:"
--msgstr "Tên hoặc Äá»a chá» IP của server:"
-+msgstr "Äá»a chá» IP của máy phục vụ :"
-
- #: ../troubleshoot.py:824
--#, fuzzy
- msgid "Printer Location"
--msgstr "Tùy chá»n bá» lá»c"
-+msgstr "VỠtrà máy in"
-
- #: ../troubleshoot.py:825
- msgid "Is the printer connected to this computer or available on the network?"
--msgstr ""
-+msgstr "Máy in có kết ná»i Äến máy nà y hoặc có sẵn trên mạng?"
-
- #: ../troubleshoot.py:827
--#, fuzzy
- msgid "Locally connected printer"
--msgstr "Tháºt sá»± muá»n xóa \"%s\" chứ?"
-+msgstr "Máy in có kết ná»i cục bá»"
-
- #: ../troubleshoot.py:828
--#, fuzzy
- msgid "Network printer"
--msgstr "Máy in:"
-+msgstr "Máy in mạng"
-
- #: ../troubleshoot.py:840
- msgid "CUPS Service Stopped"
--msgstr ""
-+msgstr "Dá»ch vụ CUPS bá» dừng"
-
- #: ../troubleshoot.py:841
- msgid ""
- "The CUPS print spooler does not appear to be running. To correct this, "
- "choose System->Administration->Services from the main menu and look for the "
- "`cups' service."
--msgstr ""
-+msgstr "Có vẻ là bá» cuá»n và o á»ng CUPS không Äang chạy. Äá» sá»a chữa trÆ°á»ng hợp nà y, hãy chá»n « Há» thá»ng > Quản trá» > Dá»ch vụ » trong trình ÄÆ¡n chÃnh, và tìm dá»ch vụ « cups »."
-
--#: ../troubleshoot.py:870 ../applet.py:729
--#, fuzzy
-+#: ../troubleshoot.py:870
-+#: ../applet.py:729
- msgid "Pending"
--msgstr "Máy in: "
-+msgstr "Treo"
-
--#: ../troubleshoot.py:871 ../applet.py:730
--#, fuzzy
-+#: ../troubleshoot.py:871
-+#: ../applet.py:730
- msgid "Held"
--msgstr "Trợ _giúp"
-+msgstr "Äã giữ lại"
-
--#: ../troubleshoot.py:874 ../applet.py:733
--#, fuzzy
-+#: ../troubleshoot.py:874
-+#: ../applet.py:733
- msgid "Canceled"
--msgstr "_Hủy bá»"
-+msgstr "BỠthôi"
-
--#: ../troubleshoot.py:875 ../applet.py:734
--#, fuzzy
-+#: ../troubleshoot.py:875
-+#: ../applet.py:734
- msgid "Aborted"
--msgstr "Giá»i thiá»u"
-+msgstr "Bá» hủy bá»"
-
--#: ../troubleshoot.py:876 ../applet.py:735
--#, fuzzy
-+#: ../troubleshoot.py:876
-+#: ../applet.py:735
- msgid "Completed"
--msgstr "Ghi chú"
-+msgstr "Hoà n tất"
-
- #: ../troubleshoot.py:885
--#, fuzzy
- msgid "Test Page"
--msgstr "Ghi chú máy in:"
-+msgstr "Trang thá»"
-
- #: ../troubleshoot.py:897
- msgid "Cancel All Jobs"
--msgstr ""
-+msgstr "Thôi má»i công viá»c"
-
--#: ../troubleshoot.py:902 ../applet.py:184
-+#: ../troubleshoot.py:902
-+#: ../applet.py:184
- msgid "Job"
--msgstr ""
-+msgstr "Công viá»c"
-
--#: ../troubleshoot.py:906 ../applet.py:185
--#, fuzzy
-+#: ../troubleshoot.py:906
-+#: ../applet.py:185
- msgid "Document"
--msgstr "Ghi chú"
-+msgstr "Tà i liá»u"
-
--#: ../troubleshoot.py:907 ../applet.py:189
-+#: ../troubleshoot.py:907
-+#: ../applet.py:189
- msgid "Status"
--msgstr ""
-+msgstr "Trạng thái"
-
- #: ../troubleshoot.py:928
- msgid "Did the test page print correctly?"
--msgstr ""
-+msgstr "Trang thá» Äã in Äúng không?"
-
- #: ../troubleshoot.py:935
- msgid "Yes"
-@@ -772,87 +784,79 @@
-
- #: ../troubleshoot.py:1118
- msgid "Status Messages"
--msgstr ""
-+msgstr "Thông Äiá»p trạng thái"
-
- #: ../troubleshoot.py:1119
- msgid "There are status messages associated with this queue."
--msgstr ""
-+msgstr "Có thông Äiá»p trạng thái liên quan Äến hà ng Äợi nà y."
-
- #: ../troubleshoot.py:1125
--#, fuzzy
- msgid "Printer's state message:"
--msgstr "Ghi chú máy in:"
-+msgstr "Thông Äiá»p tình trạng của máy in:"
-
- #: ../troubleshoot.py:1133
--#, fuzzy
- msgid "Printer's state reasons:"
--msgstr "Ghi chú máy in:"
-+msgstr "Lý do tình trạng của máy in:"
-
- #: ../troubleshoot.py:1186
--#, fuzzy
- msgid "Queue Rejecting Jobs"
--msgstr "Tùy chá»n hà ng Äợi"
-+msgstr "Hà ng Äợi từ chá»i công viá»c"
-
- #: ../troubleshoot.py:1211
- #, python-format
- msgid "The queue `%s' is rejecting jobs."
--msgstr ""
-+msgstr "Hà ng Äợi « %s » Äang từ chá»i công viá»c."
-
- #: ../troubleshoot.py:1215
- #, python-format
- msgid " The reason given is: `%s'."
--msgstr ""
-+msgstr " Nó cung cấp lý do : « %s »"
-
- #: ../troubleshoot.py:1218
- msgid ""
- "To make the queue accept jobs, select the `Accepting Jobs' checkbox in the "
- "`Policies' tab for the printer in the printer administration tool."
--msgstr ""
-+msgstr "Äá» là m cho hà ng Äợi lại chấp nháºn công viá»c, báºt tùy chá»n « Chấp nháºn công viá»c » trên thẻ « ChÃnh sách » cho máy in trong công cụ quản trá» máy in."
-
- #: ../troubleshoot.py:1260
- #, python-format
- msgid "The queue `%s' is not enabled."
--msgstr ""
-+msgstr "Hà nh Äợi « %s » chÆ°a Äược báºt."
-
- #: ../troubleshoot.py:1263
- msgid ""
- "To enable it, select the `Enabled' checkbox in the `Policies' tab for the "
- "printer in the printer administration tool."
--msgstr ""
-+msgstr "Äá» hiá»u lá»±c nó, Äánh dấu trong há»p chá»n cạnh mục « Báºt » trên thẻ « ChÃnh sách » cho máy in trong công cụ quản trá» máy in."
-
- #: ../troubleshoot.py:1278
- msgid "Check Server Firewall"
--msgstr ""
-+msgstr "Kiá»m tra tÆ°á»ng lá»a máy phục vụ"
-
- #: ../troubleshoot.py:1279
--#, fuzzy
- msgid "It is not possible to connect to the server."
--msgstr ""
--"Lá»i gá»i %s\n"
--"Äến hà ng Äợi `%s':\n"
--"\n"
-+msgstr "Không thá» kết ná»i tá»i máy phục vụ."
-
- #: ../troubleshoot.py:1292
- #, python-format
- msgid ""
- "Please check to see if a firewall or router configuration is blocking TCP "
- "port %d on server `%s'."
--msgstr ""
-+msgstr "Hãy kiá»m tra nếu má»t tÆ°á»ng lá»a hoặc cấu hình cầu dẫn có chặn cá»ng TCP %d trên máy phục vụ « %s » không."
-
- #: ../troubleshoot.py:1360
--#, fuzzy
- msgid "Choose Printer"
--msgstr "Máy in:"
-+msgstr "Chá»n máy in"
-
- #: ../troubleshoot.py:1361
- msgid ""
- "Please select the printer you are trying to use from the list below. If it "
- "does not appear in the list, select 'Not listed'."
--msgstr ""
-+msgstr "Trong danh sách bên dÆ°á»i, hãy chá»n máy in bạn Äang thá» dùng. Không có trong danh sách thì chá»n mục « Không có trong danh sách »."
+ msgstr ""
++"Máy in « %s » cần thiết chÆ°Æ¡ng trình « %s » mà chÆ°a Äược cà i Äặt. Hãy cà i Äặt "
++"nó trÆ°á»c khi sá» dụng máy in nà y."
#: ../system-config-printer.glade.h:1
msgid " "
@@ -1157,12 +879,11 @@
#: ../system-config-printer.glade.h:2
msgid ""
-@@ -862,139 +866,132 @@
- "6\n"
+@@ -763,11 +732,19 @@
"9\n"
"16"
--msgstr ""
-+msgstr "1\n"
+ msgstr ""
++"1\n"
+"2\n"
+"4\n"
+"6\n"
@@ -1170,170 +891,182 @@
+"16"
#: ../system-config-printer.glade.h:8
+ #, fuzzy
+ msgid "72 points per inch"
+-msgstr "72pt má»i inch"
++msgstr ""
++"Äiá»m\n"
++"(72 chấm trên má»i insÆ¡)"
+
+ #: ../system-config-printer.glade.h:9
+ #, fuzzy
+@@ -776,135 +753,123 @@
+
+ #: ../system-config-printer.glade.h:10
msgid "<b>Banner</b>"
-msgstr ""
+msgstr "<b>BÄng cá»</b>"
- #: ../system-config-printer.glade.h:9
+ #: ../system-config-printer.glade.h:11
-#, fuzzy
msgid "<b>Basic Server Settings</b>"
-msgstr "Tùy chá»n driver"
+msgstr "<b>Thiết láºp máy phục vụ cÆ¡ bản</b>"
- #: ../system-config-printer.glade.h:10
+ #: ../system-config-printer.glade.h:12
-#, fuzzy
msgid "<b>Common Options</b>"
-msgstr "Mô tả"
+msgstr "<b>Tùy chá»n chung</b>"
- #: ../system-config-printer.glade.h:11
+ #: ../system-config-printer.glade.h:13
-#, fuzzy
msgid "<b>Description</b>"
-msgstr "Mô tả"
+msgstr "<b>Mô tả</b>"
- #: ../system-config-printer.glade.h:12
+ #: ../system-config-printer.glade.h:14
msgid "<b>Description</b> (optional)"
-msgstr ""
+msgstr "<b>Mô tả</b> (tùy chá»n)"
- #: ../system-config-printer.glade.h:13
+ #: ../system-config-printer.glade.h:15
-#, fuzzy
msgid "<b>Download Printer Driver</b>"
-msgstr "Kiá»u máy in"
+msgstr "<b>Tải vá» trình Äiá»u khiá»n máy in</b>"
- #: ../system-config-printer.glade.h:14
+ #: ../system-config-printer.glade.h:16
-#, fuzzy
msgid "<b>Enter device URI</b>"
-msgstr "Thiết bỠMáy in"
+msgstr "<b>Nháºp URI thiết bá»</b>"
- #: ../system-config-printer.glade.h:15
+ #: ../system-config-printer.glade.h:17
-#, fuzzy
msgid "<b>IPP Printer</b>"
-msgstr "Kiá»u máy in"
+msgstr "<b>Máy in IPP</b>"
- #: ../system-config-printer.glade.h:16
+ #: ../system-config-printer.glade.h:18
-#, fuzzy
msgid "<b>Image Options</b>"
-msgstr "Mô tả"
+msgstr "<b>Tùy chá»n ảnh</b>"
- #: ../system-config-printer.glade.h:17
+ #: ../system-config-printer.glade.h:19
-#, fuzzy
msgid "<b>Installed Options</b>"
-msgstr "Mô tả"
+msgstr "<b>Tùy chá»n Äã cà i Äặt</b>"
- #: ../system-config-printer.glade.h:18
+ #: ../system-config-printer.glade.h:20
-#, fuzzy
msgid "<b>License Terms</b>"
-msgstr "Kiá»u máy in"
+msgstr "<b>Äiá»u kiá»n giấy phép</b>"
- #: ../system-config-printer.glade.h:19
+ #: ../system-config-printer.glade.h:21
msgid "<b>Location of the LPD network printer</b>"
-msgstr ""
+msgstr "<b>VỠtrà của máy in mạng LPD</b>"
- #: ../system-config-printer.glade.h:20
+ #: ../system-config-printer.glade.h:22
msgid "<b>Location of the network printer</b>"
-msgstr ""
+msgstr "<b>VỠtrà của máy in mạng</b>"
- #: ../system-config-printer.glade.h:21
+ #: ../system-config-printer.glade.h:23
msgid "<b>Location</b> (optional)"
-msgstr ""
+msgstr "<b>Vá» trÃ</b> (tùy chá»n)"
- #: ../system-config-printer.glade.h:22
+ #: ../system-config-printer.glade.h:24
-#, fuzzy
msgid "<b>Note</b>"
-msgstr "Kiá»u máy in"
+msgstr "<b>Ghi chú</b>"
- #: ../system-config-printer.glade.h:23
+ #: ../system-config-printer.glade.h:25
msgid "<b>Other Options (Advanced)</b>"
-msgstr ""
+msgstr "<b>Tùy chá»n khác (cấp cao)</b>"
- #: ../system-config-printer.glade.h:24
+ #: ../system-config-printer.glade.h:26
msgid "<b>Policies</b>"
-msgstr ""
+msgstr "<b>ChÃnh sách</b>"
- #: ../system-config-printer.glade.h:25
+ #: ../system-config-printer.glade.h:27
-#, fuzzy
msgid "<b>Printer Name</b>"
-msgstr "Kiá»u máy in"
+msgstr "<b>Tên máy in</b>"
- #: ../system-config-printer.glade.h:26
+ #: ../system-config-printer.glade.h:28
msgid "<b>Printers to be members of this Class</b>"
-msgstr ""
+msgstr "<b>Các máy in nên là bỠphạn của hạng nà y</b>"
- #: ../system-config-printer.glade.h:27
+ #: ../system-config-printer.glade.h:29
-#, fuzzy
msgid "<b>SMB Printer</b>"
-msgstr "Kiá»u máy in"
+msgstr "<b>Máy in SMB</b>"
- #: ../system-config-printer.glade.h:28
+ #: ../system-config-printer.glade.h:30
msgid "<b>Select Connection</b>"
-msgstr ""
+msgstr "<b>Chá»n kết ná»i</b>"
- #: ../system-config-printer.glade.h:29
+ #: ../system-config-printer.glade.h:31
-#, fuzzy
msgid "<b>Select Driver</b>"
-msgstr "Kiá»u máy in"
+msgstr "<b>Chá»n trình Äiá»u khiá»n</b>"
- #: ../system-config-printer.glade.h:30
+ #: ../system-config-printer.glade.h:32
msgid "<b>Settings of the serial port</b>"
-msgstr ""
+msgstr "<b>Thiết láºp của cá»ng ná»i tiếp</b>"
- #: ../system-config-printer.glade.h:31
+ #: ../system-config-printer.glade.h:33
msgid "<b>Settings</b>"
- msgstr ""
-+"<b>Thiết láºp</b>"
-
- #: ../system-config-printer.glade.h:32
+-msgstr ""
++msgstr "<b>Thiết láºp</b>"
+
+ #: ../system-config-printer.glade.h:34
msgid "<b>State</b>"
-msgstr ""
+msgstr "<b>Tình trạng</b>"
- #: ../system-config-printer.glade.h:33
+ #: ../system-config-printer.glade.h:35
msgid "<b>Tests and Maintenance</b>"
-msgstr ""
+msgstr "<b>ThỠvà Bảo trì</b>"
- #: ../system-config-printer.glade.h:34
+ #: ../system-config-printer.glade.h:36
-#, fuzzy
msgid "<b>Text Options</b>"
-msgstr "Mô tả"
+msgstr "<b>Tùy chá»n VÄn bản</b>"
- #: ../system-config-printer.glade.h:35
+ #: ../system-config-printer.glade.h:37
msgid ""
"<i>Not published\n"
"See server settings</i>"
--msgstr ""
-+msgstr "<i>ChÆ°a công bá»\n"
+ msgstr ""
++"<i>ChÆ°a công bá»\n"
+"Xem thiết láºp máy phục vụ</i>"
- #: ../system-config-printer.glade.h:37
+ #: ../system-config-printer.glade.h:39
msgid "<i>smb://[workgroup/]server[:port]/printer</i>"
-msgstr ""
+msgstr "<i>smb://[nhóm là m viá»c/]máy phục vụ[:cá»ng]/printer</i>"
- #: ../system-config-printer.glade.h:38
- msgid ""
-@@ -1002,149 +999,144 @@
+ #: ../system-config-printer.glade.h:40
+ msgid ""
+@@ -912,99 +877,97 @@
"\n"
"Any changes you have made will be lost unless you apply them."
msgstr ""
@@ -1341,193 +1074,165 @@
+"\n"
+"Không thì các thay Äá»i sẽ bá» mất."
--#: ../system-config-printer.glade.h:41 ../applet.glade.h:1
-+#: ../system-config-printer.glade.h:41
-+#: ../applet.glade.h:1
- msgid ""
- "<span weight=\"bold\" size=\"larger\">Password required</span>\n"
- "\n"
--msgstr ""
-+msgstr "<span weight=\"bold\" size=\"larger\">Cần máºt khẩu</span>\n"
-+"\n"
-
- #: ../system-config-printer.glade.h:44
+ #: ../system-config-printer.glade.h:43
-#, fuzzy
msgid "A CUPS configuration tool."
-msgstr "Cấu hình máy in"
+msgstr "Má»t công cụ cấu hình CUPS."
+ #: ../system-config-printer.glade.h:44
+ msgid "Accepting jobs"
+-msgstr ""
++msgstr "Chấp nháºn công viá»c"
+
#: ../system-config-printer.glade.h:45
- msgid "Accepting jobs"
--msgstr ""
-+msgstr "Chấp nháºn công viá»c"
+ msgid "Access Control"
+-msgstr ""
++msgstr "Äiá»u khiá»n Truy cáºp"
#: ../system-config-printer.glade.h:46
- msgid "Access Control"
--msgstr ""
-+msgstr "Äiá»u khiá»n Truy cáºp"
+ msgid "Add or Remove Members"
+-msgstr ""
++msgstr "Thêm hoặc gỡ bỠbỠphạn"
#: ../system-config-printer.glade.h:47
- msgid "Add or Remove Members"
--msgstr ""
-+msgstr "Thêm hoặc gỡ bỠbỠphạn"
+ msgid "Allow printing for everyone except these users:"
+-msgstr ""
++msgstr "Cho phép in cho má»i ngÆ°á»i trừ những ngÆ°á»i dùng nà y:"
#: ../system-config-printer.glade.h:48
- msgid "Allow printing for everyone except these users:"
--msgstr ""
-+msgstr "Cho phép in cho má»i ngÆ°á»i trừ những ngÆ°á»i dùng nà y:"
+ msgid "Allow printing from the Internet"
+-msgstr ""
++msgstr "Cho phép in từ Internet"
#: ../system-config-printer.glade.h:49
- msgid "Allow printing from the Internet"
--msgstr ""
-+msgstr "Cho phép in từ Internet"
+ msgid "Allow remote administration"
+-msgstr ""
++msgstr "Cho phép quản trỠtừ xa"
#: ../system-config-printer.glade.h:50
- msgid "Allow remote administration"
--msgstr ""
-+msgstr "Cho phép quản trỠtừ xa"
+ msgid "Allow users to cancel any job (not just their own)"
+ msgstr ""
++"Cho phép ngÆ°á»i dùng thôi bất cứ công viá»c nà o (không phải chá» công viá»c "
++"riêng của há»)"
#: ../system-config-printer.glade.h:51
- msgid "Allow users to cancel any job (not just their own)"
--msgstr ""
-+msgstr "Cho phép ngÆ°á»i dùng thôi bất cứ công viá»c nà o (không phải chá» công viá»c riêng của há»)"
+ #, fuzzy
+ msgid "Basic Server Settings"
+-msgstr "Tùy chá»n driver"
++msgstr "<b>Thiết láºp máy phục vụ cÆ¡ bản</b>"
#: ../system-config-printer.glade.h:52
--#, fuzzy
- msgid "Authentication required"
--msgstr "Xác thực"
-+msgstr "Cần thiết xác thực"
+ msgid "Baud Rate"
+-msgstr ""
++msgstr "Tá»c Äá» truyá»n"
#: ../system-config-printer.glade.h:53
- msgid "Baud Rate"
- msgstr ""
-+"Tá»c Äá» truyá»n"
-
- #: ../system-config-printer.glade.h:54
-#, fuzzy
msgid "Bottom margin:"
-msgstr "Lá» dÆ°á»i (pt):"
+msgstr "Lá» dÆ°á»i:"
+ #: ../system-config-printer.glade.h:54
+ msgid "Brightness:"
+-msgstr ""
++msgstr "Äá» sáng:"
+
#: ../system-config-printer.glade.h:55
- msgid "Brightness:"
--msgstr ""
-+msgstr "Äá» sáng:"
+ msgid "Browse..."
+-msgstr ""
++msgstr "Duyá»t..."
#: ../system-config-printer.glade.h:56
- msgid "Browse..."
--msgstr ""
-+msgstr "Duyá»t..."
-
- #: ../system-config-printer.glade.h:57
-#, fuzzy
msgid "CUPS server:"
-msgstr "Server:"
+msgstr "Máy phục vụ CUPS: "
- #: ../system-config-printer.glade.h:58
+ #: ../system-config-printer.glade.h:57
-#, fuzzy
msgid "Change..."
-msgstr "_Chia sẻ..."
+msgstr "Äá»i..."
- #: ../system-config-printer.glade.h:59
+ #: ../system-config-printer.glade.h:58
-#, fuzzy
msgid "Characters per inch:"
-msgstr "Ký tá»± má»i inch"
+msgstr "Ký tá»± trên má»i insÆ¡ :"
--#. Not more than 25 characters
+ #. Not more than 25 characters
+ #: ../system-config-printer.glade.h:60
+ msgid "Clean Print Heads"
+-msgstr ""
++msgstr "Là m sách các Äầu in"
+
#: ../system-config-printer.glade.h:61
-+#. Not more than 25 characters
- msgid "Clean Print Heads"
--msgstr ""
-+msgstr "Là m sách các Äầu in"
-
- #: ../system-config-printer.glade.h:62
-#, fuzzy
msgid "Columns:"
-msgstr "Ghi chú"
+msgstr "Cá»t:"
- #: ../system-config-printer.glade.h:63
+ #: ../system-config-printer.glade.h:62
-#, fuzzy
msgid "Comments..."
-msgstr "Ghi chú"
+msgstr "Ghi chú..."
+ #: ../system-config-printer.glade.h:63
+ msgid "Connect to CUPS server"
+-msgstr ""
++msgstr "Kết ná»i Äến máy phục vụ CUPS"
+
#: ../system-config-printer.glade.h:64
- msgid "Connect to CUPS server"
--msgstr ""
-+msgstr "Kết ná»i Äến máy phục vụ CUPS"
-
- #: ../system-config-printer.glade.h:65
- msgid "Connect to a different print server"
--msgstr ""
-+msgstr "Kết ná»i Äến máy phục vụ in khác"
+ msgid "Connecting"
+-msgstr ""
++msgstr "Kết ná»i"
#: ../system-config-printer.glade.h:66
- msgid "Connecting"
- msgstr ""
-+"Kết ná»i"
-
- #: ../system-config-printer.glade.h:68
#, no-c-format
- msgid ""
+@@ -1012,19 +975,21 @@
"Connecting to Server:\n"
"%s\n"
--msgstr ""
-+msgstr "Äang kết ná»i Äến máy phục vụ :\n"
+ msgstr ""
++"Äang kết ná»i Äến máy phục vụ :\n"
+"%s\n"
- #: ../system-config-printer.glade.h:71
+ #: ../system-config-printer.glade.h:69
msgid "Copies:"
-msgstr ""
+msgstr "Bản sao :"
- #: ../system-config-printer.glade.h:72
+ #: ../system-config-printer.glade.h:70
-#, fuzzy
msgid "Copy Printer"
-msgstr "Máy in:"
+msgstr "Chép máy in"
+ #: ../system-config-printer.glade.h:71
++#, fuzzy
+ msgid "Copyright © 2006-2008 Red Hat, Inc."
+-msgstr ""
++msgstr "Tác quyá»n © nÄm 2006-2007 Red Hat, Inc."
+
+ #: ../system-config-printer.glade.h:72
+ msgid ""
+@@ -1032,9 +997,8 @@
+ msgstr ""
+
#: ../system-config-printer.glade.h:73
--#, fuzzy
- msgid "Copy this printer queue"
--msgstr "Sá»a hà ng Äợi in"
-+msgstr "Chép hà ng Äợi máy in nà y"
-
- #: ../system-config-printer.glade.h:74
- msgid "Copyright © 2006-2007 Red Hat, Inc."
--msgstr ""
-+msgstr "Tác quyá»n © nÄm 2006-2007 Red Hat, Inc."
-
- #: ../system-config-printer.glade.h:75
--#, fuzzy
- msgid "Create a new printer group"
--msgstr "Tạo hà ng Äợi má»i"
-+msgstr "Tạo nhóm máy in má»i"
-
- #: ../system-config-printer.glade.h:76
--#, fuzzy
- msgid "Create a new printer queue"
--msgstr "Tạo hà ng Äợi má»i"
-+msgstr "Tạo hà ng Äợi máy in má»i"
-
- #: ../system-config-printer.glade.h:77
-#, fuzzy
msgid "Data Bits"
-msgstr "Chi tiết"
+msgstr "Bit dữ liá»u"
- #: ../system-config-printer.glade.h:78
- msgid ""
-@@ -1157,15 +1149,24 @@
- "38400\n"
+ #: ../system-config-printer.glade.h:74
+ msgid ""
+@@ -1048,14 +1012,25 @@
"57600\n"
"115200"
--msgstr ""
-+msgstr "Mặc Äá»nh\n"
+ msgstr ""
++"Mặc Äá»nh\n"
+"1200\n"
+"2400\n"
+"4800\n"
@@ -1537,227 +1242,206 @@
+"57600\n"
+"115200"
- #: ../system-config-printer.glade.h:87
+ #: ../system-config-printer.glade.h:83
-#, fuzzy
msgid ""
"Default\n"
"8\n"
"7"
-msgstr "Mặc Äá»nh"
-+msgstr "Mặc Äá»nh\n"
++msgstr ""
++"Mặc Äá»nh\n"
+"8\n"
+"7"
- #: ../system-config-printer.glade.h:90
- msgid ""
-@@ -1173,7 +1174,10 @@
- "None\n"
+ #: ../system-config-printer.glade.h:86
+ msgid ""
+@@ -1064,6 +1039,10 @@
"Odd\n"
"Even"
--msgstr ""
-+msgstr "Mặc Äá»nh\n"
+ msgstr ""
++"Mặc Äá»nh\n"
+"Không có\n"
+"Lẻ\n"
+"Chẵn"
- #: ../system-config-printer.glade.h:94
- msgid ""
-@@ -1182,149 +1186,143 @@
- "XON/XOFF (Software)\n"
+ #: ../system-config-printer.glade.h:90
+ msgid ""
+@@ -1073,133 +1052,130 @@
"RTS/CTS (Hardware)\n"
"DTR/DSR (Hardware)"
--msgstr ""
-+msgstr "Mặc Äá»nh\n"
+ msgstr ""
++"Mặc Äá»nh\n"
+"Không có\n"
+"XON/XOFF (Phần má»m)\n"
+"RTS/CTS (Phần cứng)\n"
+"DTR/DSR (Phần cứng)"
- #: ../system-config-printer.glade.h:99
--#, fuzzy
- msgid "Default Printer:"
--msgstr "Äây là mô tả của máy in."
-+msgstr "Máy in mặc Äá»nh:"
-
- #: ../system-config-printer.glade.h:100
--#, fuzzy
- msgid "Delete this printer queue"
--msgstr "Xóa hà ng Äợi Äược chá»n"
-+msgstr ""
-+"Xoá hà ng Äợi máy in nà y"
-
- #: ../system-config-printer.glade.h:101
+ #: ../system-config-printer.glade.h:95
msgid "Deny printing for everyone except these users:"
-msgstr ""
+msgstr "Từ chá»i in cho má»i ngÆ°á»i trừ những ngÆ°á»i nà y:"
- #: ../system-config-printer.glade.h:102
+ #: ../system-config-printer.glade.h:96
-#, fuzzy
msgid "Description:"
-msgstr "Mô tả"
+msgstr "Mô tả:"
- #: ../system-config-printer.glade.h:103
+ #: ../system-config-printer.glade.h:97 ../troubleshoot/DeviceListed.py:40
-#, fuzzy
msgid "Device URI"
-msgstr "Thiết bá»: "
+msgstr "URI thiết bá»"
- #: ../system-config-printer.glade.h:104
+ #: ../system-config-printer.glade.h:98
-#, fuzzy
msgid "Device URI:"
-msgstr "Thiết bá»:"
+msgstr "URI thiết bá»:"
- #: ../system-config-printer.glade.h:105
+ #: ../system-config-printer.glade.h:99
-#, fuzzy
msgid "Device description."
-msgstr "Mô tả"
+msgstr "Mô tả của thiết bá»."
+# Name: don't translate/Tên: Äừng dá»ch ?
- #: ../system-config-printer.glade.h:106
+ #: ../system-config-printer.glade.h:100
msgid "DirectJet"
-msgstr ""
+msgstr "DirectJet"
- #: ../system-config-printer.glade.h:108
+ #: ../system-config-printer.glade.h:102
-#, fuzzy
msgid "Driver details"
-msgstr "Driver"
+msgstr "Chi tiết trình Äiá»u khiá»n"
+ #: ../system-config-printer.glade.h:103
++#, fuzzy
+ msgid "E_nable"
+-msgstr ""
++msgstr "Báºt"
+
+ #: ../system-config-printer.glade.h:104
+ msgid "Empty"
+-msgstr ""
++msgstr "Rá»ng"
+
+ #: ../system-config-printer.glade.h:105
+ msgid "Enabled"
+-msgstr ""
++msgstr "Báºt"
+
+ #: ../system-config-printer.glade.h:106
+ msgid "Ending Banner:"
+-msgstr ""
++msgstr "BÄng cá» cuá»i:"
+
+ #: ../system-config-printer.glade.h:107
+ msgid "Error Policy: \t"
+-msgstr ""
++msgstr "ChÃnh sách lá»i: \t"
+
+ #: ../system-config-printer.glade.h:108
+ msgid "Find _Queue..."
+-msgstr ""
++msgstr "Tìm _hà ng Äợi..."
+
#: ../system-config-printer.glade.h:109
- msgid "Empty"
--msgstr ""
-+msgstr "Rá»ng"
-
- #: ../system-config-printer.glade.h:110
- msgid "Enabled"
--msgstr ""
-+msgstr "Báºt"
-
- #: ../system-config-printer.glade.h:111
- msgid "Ending Banner:"
--msgstr ""
-+msgstr "BÄng cá» cuá»i:"
-
- #: ../system-config-printer.glade.h:112
- msgid "Enter some search terms for the model of your printer."
--msgstr ""
-+msgstr "Nháºp chuá»i tìm kiếm Äá»i vá»i mẫu máy in của bạn."
-
- #: ../system-config-printer.glade.h:113
- msgid "Error Policy: \t"
--msgstr ""
-+msgstr "ChÃnh sách lá»i: \t"
-
- #: ../system-config-printer.glade.h:114
- msgid "Find _Queue..."
--msgstr ""
-+msgstr "Tìm _hà ng Äợi..."
-
- #: ../system-config-printer.glade.h:115
-#, fuzzy
msgid "Finishings:"
-msgstr "Hoà n tất"
+msgstr "Äá» kết thúc:"
- #: ../system-config-printer.glade.h:116
+ #: ../system-config-printer.glade.h:110
msgid "Flow Control"
-msgstr ""
+msgstr "Äiá»u khiá»n luá»ng"
- #: ../system-config-printer.glade.h:117
+ #: ../system-config-printer.glade.h:111
msgid ""
"For the printer you have selected there are drivers available for download."
-msgstr ""
+msgstr "Äá»i vá»i máy in bạn chá»n có trình Äiá»u khiá»n sẵn sà ng Äá» tải vá»."
- #: ../system-config-printer.glade.h:118
+ #: ../system-config-printer.glade.h:112
msgid "Gamma:"
-msgstr ""
+msgstr "Gamma (γ):"
- #: ../system-config-printer.glade.h:119
--#, fuzzy
- msgid "Goto Server"
--msgstr "Server"
-+msgstr ""
-+"Tá»i máy phục vụ"
-
- #: ../system-config-printer.glade.h:120
+ #: ../system-config-printer.glade.h:113
msgid "Hold until:"
-msgstr ""
+msgstr "Giữ Äến:"
- #: ../system-config-printer.glade.h:121
+ #: ../system-config-printer.glade.h:114
-#, fuzzy
msgid "Host:"
-msgstr "IP Máy"
+msgstr "Máy:"
- #: ../system-config-printer.glade.h:122
+ #: ../system-config-printer.glade.h:115
msgid "Hue adjustment:"
-msgstr ""
+msgstr "Äiá»u chá»nh sắc Äá» :"
- #: ../system-config-printer.glade.h:123
+ #: ../system-config-printer.glade.h:116
msgid "Human-readable description such as \"HP LaserJet with Duplexer\""
-msgstr ""
+msgstr "Mô tả cho ngÆ°á»i Äá»c v.d. « HP LaserJet in mặt Äôi »"
- #: ../system-config-printer.glade.h:124
+ #: ../system-config-printer.glade.h:117
msgid "Human-readable location such as \"Lab 1\""
-msgstr ""
+msgstr "Vá» trà cho ngÆ°á»i Äoc, v.d. « Phòng 3 »"
- #: ../system-config-printer.glade.h:125
+ #: ../system-config-printer.glade.h:118
-#, fuzzy
msgid "IPP"
-msgstr "IP:"
+msgstr "IPP"
- #: ../system-config-printer.glade.h:126
+ #: ../system-config-printer.glade.h:119
msgid "IPP Browser"
-msgstr ""
+msgstr "Bá» duyá»t IPP"
- #: ../system-config-printer.glade.h:127
+ #: ../system-config-printer.glade.h:120
-#, fuzzy
msgid "Installed Options"
-msgstr "Tùy chá»n bá» lá»c"
+msgstr "Tùy chá»n Äã cà i Äặt"
- #: ../system-config-printer.glade.h:128
+ #: ../system-config-printer.glade.h:121
msgid "Job Options"
-msgstr ""
+msgstr "Tùy chá»n công viá»c"
- #: ../system-config-printer.glade.h:129
+ #: ../system-config-printer.glade.h:122
msgid "Job priority:"
-msgstr ""
+msgstr "Ưu tiên công viá»c:"
- #: ../system-config-printer.glade.h:130
+ #: ../system-config-printer.glade.h:123
msgid "LPD"
-msgstr ""
+msgstr "LPD"
- #: ../system-config-printer.glade.h:131
+ #: ../system-config-printer.glade.h:124
-#, fuzzy
msgid "Left margin:"
-msgstr "LỠtrái (pt):"
+msgstr "LỠtrái:"
- #: ../system-config-printer.glade.h:132
- msgid ""
-@@ -1336,77 +1334,80 @@
- "Top to bottom, right to left\n"
+ #: ../system-config-printer.glade.h:125
+ msgid ""
+@@ -1212,68 +1188,71 @@
"Bottom to top, left to right\n"
"Bottom to top, right to left"
--msgstr ""
-+msgstr "Từ trái sang phải, trên xuá»ng dÆ°á»i\n"
+ msgstr ""
++"Từ trái sang phải, trên xuá»ng dÆ°á»i\n"
+"Từ trái sang phải, dÆ°á»i lên trên\n"
+"Từ phải sang trái, trên xuá»ng dÆ°á»i\n"
+"Từ phải sang trái, dÆ°á»i lên trên\n"
@@ -1766,102 +1450,90 @@
+"Từ dÆ°á»i lên trên, trái sang phải\n"
+"Từ dÆ°á»i lên trên, phải sang trái"
- #: ../system-config-printer.glade.h:140
+ #: ../system-config-printer.glade.h:133
msgid "License:"
- msgstr ""
-+"Giấy phép:"
-
- #: ../system-config-printer.glade.h:141
+-msgstr ""
++msgstr "Giấy phép:"
+
+ #: ../system-config-printer.glade.h:134
-#, fuzzy
msgid "Lines per inch:"
-msgstr "Hà ng má»i inch"
+msgstr "Dòng trên má»i insÆ¡ :"
- #: ../system-config-printer.glade.h:142
+ #: ../system-config-printer.glade.h:135
-#, fuzzy
msgid "Local Driver"
-msgstr "Hiá»u chá»nh Máy in cục bá»"
+msgstr "Trình Äiá»u khiá»n cục bá»"
- #: ../system-config-printer.glade.h:143
+ #: ../system-config-printer.glade.h:136
-#, fuzzy
msgid "Location:"
-msgstr "_Hà nh Äá»ng"
-+msgstr ""
-+"Vá» trÃ:"
-
--#. Not more than 25 characters
- #: ../system-config-printer.glade.h:145
--#, fuzzy
-+#. Not more than 25 characters
- msgid "Make Default"
--msgstr "_Mặc Äá»nh"
-+msgstr "Äặt mặc Äá»nh"
-
- #: ../system-config-printer.glade.h:146
++msgstr "Vá» trÃ:"
+
+ #: ../system-config-printer.glade.h:137
msgid "Make and Model:"
-msgstr ""
+msgstr "Hãng/Mô hình:"
- #: ../system-config-printer.glade.h:147
- msgid ""
- "May contain any printable characters except \"/\", \"#\", and space.\n"
- "Name must be unique on the local machine!"
--msgstr ""
-+msgstr "Có thá» chứa bất cứ ký tá»± in Äược nà o trừ « / », « # » và dấu cách.\n"
-+"Tên phải là duy nhất trên máy cục bá»."
-
- #: ../system-config-printer.glade.h:149
+ #: ../system-config-printer.glade.h:138
++#, fuzzy
+ msgid "Make and model:"
+-msgstr ""
++msgstr "Hãng/Mô hình:"
+
+ #: ../system-config-printer.glade.h:139
msgid "Media:"
-msgstr ""
+msgstr "Váºt chứa:"
- #: ../system-config-printer.glade.h:150
+ #: ../system-config-printer.glade.h:140
msgid "Members"
-msgstr ""
+msgstr "BỠphạn"
- #: ../system-config-printer.glade.h:151
+ #: ../system-config-printer.glade.h:141
-#, fuzzy
msgid "Mirror"
-msgstr "Lá»i"
+msgstr "Phản chiếu"
- #: ../system-config-printer.glade.h:152
+ #: ../system-config-printer.glade.h:142
msgid "More"
-msgstr ""
+msgstr "Nhiá»u"
- #: ../system-config-printer.glade.h:153
+ #: ../system-config-printer.glade.h:143
msgid "New Clas_s"
-msgstr ""
+msgstr "Hạng _má»i"
- #: ../system-config-printer.glade.h:156
+ #: ../system-config-printer.glade.h:145
-#, fuzzy
msgid "New _Printer"
-msgstr "Máy in:"
+msgstr "Máy _in má»i"
- #: ../system-config-printer.glade.h:157
+ #: ../system-config-printer.glade.h:146
-#, fuzzy
msgid "New name for the printer"
-msgstr "Máy in JetDirect"
+msgstr "Tên má»i cho máy in"
- #: ../system-config-printer.glade.h:158
+ #: ../system-config-printer.glade.h:147
msgid "No, I do not accept this license"
-msgstr ""
+msgstr "Tôi không Äá»ng ý vá»i giấy phép nà y"
- #: ../system-config-printer.glade.h:159
- msgid ""
-@@ -1438,46 +1439,76 @@
- "Bind (top)\n"
+ #: ../system-config-printer.glade.h:148
+ msgid ""
+@@ -1306,6 +1285,34 @@
"Bind (right)\n"
"Bind (bottom)"
--msgstr ""
-+msgstr "Không có\n"
+ msgstr ""
++"Không có\n"
+"Ráºp sách\n"
+"Giùi lá»\n"
+"Äóng bìa\n"
@@ -1890,449 +1562,506 @@
+"Äóng sách (phải)\n"
+"Äóng sách (dÆ°á»i)"
- #: ../system-config-printer.glade.h:187
- msgid ""
- "One-sided\n"
+ #: ../system-config-printer.glade.h:176
+ msgid ""
+@@ -1313,38 +1320,41 @@
"Two-sided (long edge)\n"
"Two-sided (short edge)"
--msgstr ""
-+msgstr "Mặt ÄÆ¡n\n"
+ msgstr ""
++"Mặt ÄÆ¡n\n"
+"Mặt Äôi (cạnh dà i)\n"
+"Mặt Äôi (cạnh ngắn)"
- #: ../system-config-printer.glade.h:190
+ #: ../system-config-printer.glade.h:179
msgid "Operation Policy:"
-msgstr ""
+msgstr "ChÃnh sách thao tác:"
- #: ../system-config-printer.glade.h:191
+ #: ../system-config-printer.glade.h:180
msgid "Orientation:"
-msgstr ""
+msgstr "HÆ°á»ng:"
- #: ../system-config-printer.glade.h:192
+ #: ../system-config-printer.glade.h:181
msgid "Pages per side layout:"
-msgstr ""
+msgstr "Bá» trà các trang trên má»i mặt"
- #: ../system-config-printer.glade.h:193
+ #: ../system-config-printer.glade.h:182
msgid "Pages per side:"
-msgstr ""
+msgstr "Trang trên má»i mặt:"
- #: ../system-config-printer.glade.h:194
+ #: ../system-config-printer.glade.h:183
msgid "Parity"
- msgstr ""
-+"TÃnh chẵn lẻ"
-
- #: ../system-config-printer.glade.h:196
+-msgstr ""
++msgstr "TÃnh chẵn lẻ"
+
+ #: ../system-config-printer.glade.h:185
msgid "Please Wait"
-msgstr ""
+msgstr "Hãy Äợi"
- #: ../system-config-printer.glade.h:197
+ #: ../system-config-printer.glade.h:186
msgid "Policies"
-msgstr ""
+msgstr "ChÃnh sách"
- #: ../system-config-printer.glade.h:198
+ #: ../system-config-printer.glade.h:187
msgid "Port number:"
-msgstr ""
+msgstr "Sá» hiá»u cá»ng:"
- #: ../system-config-printer.glade.h:199
- msgid ""
-@@ -1485,42 +1516,42 @@
- "Landscape (90°)\n"
+ #: ../system-config-printer.glade.h:188
+ msgid ""
+@@ -1353,6 +1363,10 @@
"Reverse landscape (270°)\n"
"Reverse portrait (180°)"
--msgstr ""
-+msgstr "Thẳng Äứng (không xoay)\n"
+ msgstr ""
++"Thẳng Äứng (không xoay)\n"
+"Nằm ngang (90º)\n"
+"Nằm ngang ngược (270º)\n"
+"Thẳng Äứng ngược (180º)"
- #: ../system-config-printer.glade.h:203
- msgid ""
- "PostScript Printer Description (PPD) files can often be found on the driver "
+ #: ../system-config-printer.glade.h:192
+ msgid ""
+@@ -1360,50 +1374,49 @@
"disk that comes with the printer. For PostScript printers they are often "
"part of the Windows<sup>®</sup> driver."
--msgstr ""
-+msgstr "Các táºp tin mô tả máy in PostScript (PPD) thÆ°á»ng nằm trên ÄÄ©a trình Äiá»u khiá»n có sẵn vá»i máy in. Äá»i vá»i máy in PostScript, táºp tin nhÆ° váºy thÆ°á»ng thuá»c vá» trình Äiá»u khiá»n Windows<sup>®</sup>."
-
- #: ../system-config-printer.glade.h:204
+ msgstr ""
++"Các táºp tin mô tả máy in PostScript (PPD) thÆ°á»ng nằm trên ÄÄ©a trình Äiá»u "
++"khiá»n có sẵn vá»i máy in. Äá»i vá»i máy in PostScript, táºp tin nhÆ° váºy thÆ°á»ng "
++"thuá»c vá» trình Äiá»u khiá»n Windows<sup>®</sup>."
+
+ #: ../system-config-printer.glade.h:193
msgid "Pretty print"
-msgstr ""
+msgstr "In xinh"
--#. Not more than 25 characters
- #: ../system-config-printer.glade.h:206
--#, fuzzy
-+#. Not more than 25 characters
+ #. Not more than 25 characters
+ #: ../system-config-printer.glade.h:195
+-#, fuzzy
msgid "Print Self-Test Page"
-msgstr "Ghi chú máy in:"
+msgstr "In tráng tá»± thá»"
- #: ../system-config-printer.glade.h:210
+ #. Not more than 25 characters
+ #: ../system-config-printer.glade.h:197 ../troubleshoot/PrintTestPage.py:68
+-#, fuzzy
+ msgid "Print Test Page"
+-msgstr "Ghi chú máy in:"
++msgstr "In tráng thá»"
+
+ #: ../system-config-printer.glade.h:199
+ #, fuzzy
+ msgid "Printer Properties"
+-msgstr "Tùy chá»n bá» lá»c"
++msgstr "Báo cáo máy in"
+
+ #: ../system-config-printer.glade.h:200
-#, fuzzy
msgid "Printer State:"
-msgstr "Ghi chú máy in:"
+msgstr "Tình trạng máy in:"
- #: ../system-config-printer.glade.h:211
+ #: ../system-config-printer.glade.h:201
-#, fuzzy
msgid "Printer model:"
-msgstr "Kiá»u máy in"
+msgstr "Mô hình máy in:"
- #: ../system-config-printer.glade.h:212
+ #: ../system-config-printer.glade.h:202
msgid "Probe"
-msgstr ""
+msgstr "Dò"
- #: ../system-config-printer.glade.h:213
+ #: ../system-config-printer.glade.h:203
+ #, fuzzy
+ msgid "Prompt user if authentication is required"
+-msgstr "Xác thực"
++msgstr "Cần thiết xác thực"
+
+ #: ../system-config-printer.glade.h:204
msgid "Provide PPD file"
-msgstr ""
+msgstr "Cung cấp táºp tin PPD"
- #: ../system-config-printer.glade.h:214
+ #: ../system-config-printer.glade.h:205
msgid "Queue:"
-@@ -1528,118 +1559,112 @@
-
- #: ../system-config-printer.glade.h:215
- msgid "Refresh the list of printer queues"
--msgstr ""
-+msgstr "Cáºp nháºt danh sách các hà ng Äợi máy in"
-
- #: ../system-config-printer.glade.h:216
+@@ -1411,96 +1424,90 @@
+
+ #: ../system-config-printer.glade.h:206
msgid "Require encryption"
- msgstr ""
-+"Yêu cầu máºt mã"
-
- #: ../system-config-printer.glade.h:217
+-msgstr ""
++msgstr "Yêu cầu máºt mã"
+
+ #: ../system-config-printer.glade.h:207
-#, fuzzy
msgid "Reset"
-msgstr "Thá»"
+msgstr "Äặt lại"
- #: ../system-config-printer.glade.h:218
+ #: ../system-config-printer.glade.h:208
-#, fuzzy
msgid "Reset to system default"
-msgstr "Äặt là m _mặc Äá»nh"
+msgstr "Äặt vá» mặc Äá»nh của há» thá»ng"
- #: ../system-config-printer.glade.h:219
+ #: ../system-config-printer.glade.h:209
-#, fuzzy
msgid "Right margin:"
-msgstr "LỠphải (pt):"
+msgstr "LỠphải:"
+ #: ../system-config-printer.glade.h:210
+ msgid "SCSI"
+-msgstr ""
++msgstr "SCSI"
+
+ #: ../system-config-printer.glade.h:211
+ msgid "SMB"
+-msgstr ""
++msgstr "SMB"
+
+ #: ../system-config-printer.glade.h:212
+ msgid "SMB Browser"
+-msgstr ""
++msgstr "Bá» duyá»t SMB"
+
+ #: ../system-config-printer.glade.h:213
+ msgid "Saturation:"
+-msgstr ""
++msgstr "Äá» bão hoà :"
+
+ #: ../system-config-printer.glade.h:214
+ msgid "Save debugging information for troubleshooting"
+-msgstr ""
++msgstr "LÆ°u lại thông tin gỡ lá»i Äá» giải Äáp thắc mắc"
+
+ #: ../system-config-printer.glade.h:215
+ msgid "Scale to fit"
+-msgstr ""
++msgstr "Co giãn Äá» vừa"
+
+ #: ../system-config-printer.glade.h:216
+ msgid "Scaling:"
+-msgstr ""
++msgstr "Co giãn:"
+
+ #: ../system-config-printer.glade.h:217
+ msgid "Search for a printer driver to download"
+-msgstr ""
++msgstr "Tìm kiếm má»t trình Äiá»u khiá»n máy in Äá» tải vá»"
+
+ #: ../system-config-printer.glade.h:218
+ msgid "Select A File"
+-msgstr ""
++msgstr "Chá»n táºp tin"
+
+ #: ../system-config-printer.glade.h:219
+ msgid "Select printer from database"
+-msgstr ""
++msgstr "Chá»n máy in từ cÆ¡ sá» dữ liá»u"
+
#: ../system-config-printer.glade.h:220
- msgid "SCSI"
--msgstr ""
-+msgstr "SCSI"
-
- #: ../system-config-printer.glade.h:221
- msgid "SMB"
--msgstr ""
-+msgstr "SMB"
-
- #: ../system-config-printer.glade.h:222
- msgid "SMB Browser"
--msgstr ""
-+msgstr "Bá» duyá»t SMB"
-
- #: ../system-config-printer.glade.h:223
- msgid "Saturation:"
--msgstr ""
-+msgstr "Äá» bão hoà :"
-
- #: ../system-config-printer.glade.h:224
- msgid "Save debugging information for troubleshooting"
--msgstr ""
-+msgstr "LÆ°u lại thông tin gỡ lá»i Äá» giải Äáp thắc mắc"
-
- #: ../system-config-printer.glade.h:225
- msgid "Scale to fit"
--msgstr ""
-+msgstr "Co giãn Äá» vừa"
-
- #: ../system-config-printer.glade.h:226
- msgid "Scaling:"
- msgstr ""
-+"Co giãn:"
-
- #: ../system-config-printer.glade.h:227
- msgid "Search for a printer driver to download"
--msgstr ""
-+msgstr "Tìm kiếm má»t trình Äiá»u khiá»n máy in Äá» tải vá»"
-
- #: ../system-config-printer.glade.h:228
--#, fuzzy
- msgid "Search terms:"
--msgstr "Chia sẻ: "
-+msgstr "Chuá»i tìm kiếm:"
-
- #: ../system-config-printer.glade.h:229
- msgid "Select A File"
--msgstr ""
-+msgstr "Chá»n táºp tin"
-
- #: ../system-config-printer.glade.h:230
- msgid "Select printer from database"
--msgstr ""
-+msgstr "Chá»n máy in từ cÆ¡ sá» dữ liá»u"
-
- #: ../system-config-printer.glade.h:231
-#, fuzzy
msgid "Serial"
-msgstr "Chung"
+msgstr "Ná»i tiếp"
- #: ../system-config-printer.glade.h:232
+ #: ../system-config-printer.glade.h:221
+ #, fuzzy
+ msgid "Set As De_fault"
+-msgstr "_Mặc Äá»nh"
++msgstr "Äặt _mặc Äá»nh"
+
+ #: ../system-config-printer.glade.h:222
+ #, fuzzy
+ msgid "Set As Default"
+-msgstr "_Mặc Äá»nh"
++msgstr "Äặt _mặc Äá»nh"
+
+ #: ../system-config-printer.glade.h:223
+ #, fuzzy
+ msgid "Set authentication details now"
+-msgstr "Xác thực"
++msgstr "Cần thiết xác thực"
+
+ #: ../system-config-printer.glade.h:224
-#, fuzzy
msgid "Settings"
msgstr "Thiết láºp"
- #: ../system-config-printer.glade.h:233
+ #: ../system-config-printer.glade.h:225
msgid "Share published printers connected to this system"
-msgstr ""
+msgstr "Chia sẻ các máy in công bá» có kết ná»i Äến há» thá»ng nà y"
- #: ../system-config-printer.glade.h:234
+ #: ../system-config-printer.glade.h:226
-#, fuzzy
msgid "Shared"
-msgstr "Chia sẻ"
+msgstr "Dùng chung"
- #: ../system-config-printer.glade.h:235
+ #: ../system-config-printer.glade.h:227
+ msgid "Short name for this printer such as \"laserjet\""
+@@ -1508,11 +1515,11 @@
+
+ #: ../system-config-printer.glade.h:228
msgid "Show printers shared by other systems"
-msgstr ""
+msgstr "Hiá»n thá» các máy in dùng chung vá»i há» thá»ng khác"
- #: ../system-config-printer.glade.h:236
+ #: ../system-config-printer.glade.h:229
msgid "Sides:"
-msgstr ""
+msgstr "Mặt:"
- #: ../system-config-printer.glade.h:237
- msgid ""
- "Specify the default job options for this printer. Jobs arriving at this "
+ #: ../system-config-printer.glade.h:230
+ msgid ""
+@@ -1520,19 +1527,20 @@
"print server will have these options added if they are not already set by "
"the application."
--msgstr ""
-+msgstr "Ghi rõ các tùy chá»n công viá»c mặc Äá»nh cho máy in nà y. Các công viá»c Äến máy in nà y sẽ cÅ©ng tuân theo các tùy chá»n nà y nếu ứng dụng chÆ°a Äặt."
-
- #: ../system-config-printer.glade.h:238
+ msgstr ""
++"Ghi rõ các tùy chá»n công viá»c mặc Äá»nh cho máy in nà y. Các công viá»c Äến máy "
++"in nà y sẽ cÅ©ng tuân theo các tùy chá»n nà y nếu ứng dụng chÆ°a Äặt."
+
+ #: ../system-config-printer.glade.h:231
msgid "Starting Banner:"
-msgstr ""
+msgstr "BÄng cá» Äầu :"
- #: ../system-config-printer.glade.h:239
+ #: ../system-config-printer.glade.h:232
msgid "Supplier:"
-msgstr ""
+msgstr "Nhà cung cấp:"
- #: ../system-config-printer.glade.h:240
+ #: ../system-config-printer.glade.h:233
-#, fuzzy
msgid "System-Config-Printer"
-msgstr "Cấu hình máy in"
+msgstr "System-Config-Printer"
- #: ../system-config-printer.glade.h:241
- msgid ""
-@@ -1648,27 +1673,27 @@
- "for a large number of (non PostScript) printers. But in general manufacturer "
+ #: ../system-config-printer.glade.h:234
+ msgid ""
+@@ -1542,6 +1550,10 @@
"provided PPD files provide better access to the specific features of the "
"printer."
--msgstr ""
-+msgstr "CÆ¡ sá» dữ liá»u máy in foomatic chứa má»t sá» táºp tin mô tả máy in PostScript (PPD) Äược hãng chế tạo cung cấp, cÅ©ng có thá» tạo ra táºp tin PPD cho rất nhiá»u máy in không phải PostScript. Tuy nhiên, nói chung táºp tin PPD Äược hãng chế tạo cung cấp là thÃch hợp hÆ¡n vá»i các tÃnh nÄng cụ thá» của máy in."
-
- #: ../system-config-printer.glade.h:242
- msgid ""
- "These drivers do not come from your operating system supplier and will not "
+ msgstr ""
++"CÆ¡ sá» dữ liá»u máy in foomatic chứa má»t sá» táºp tin mô tả máy in PostScript "
++"(PPD) Äược hãng chế tạo cung cấp, cÅ©ng có thá» tạo ra táºp tin PPD cho rất "
++"nhiá»u máy in không phải PostScript. Tuy nhiên, nói chung táºp tin PPD Äược "
++"hãng chế tạo cung cấp là thÃch hợp hÆ¡n vá»i các tÃnh nÄng cụ thá» của máy in."
+
+ #: ../system-config-printer.glade.h:235
+ msgid ""
+@@ -1549,12 +1561,17 @@
"be covered by their commercial support. See the support and license terms "
"of the driver's supplier."
--msgstr ""
-+msgstr "Những trình Äiá»u khiá»n nà y không thuá»c vá» nhà cung cấp há» Äiá»u hà nh thì không Äược há» há» trợ. Xem các Äiá»u kiá»n vá» há» trợ và giấy phép của nhà cung cấp trình Äiá»u khiá»n."
-
- #: ../system-config-printer.glade.h:243
+ msgstr ""
++"Những trình Äiá»u khiá»n nà y không thuá»c vá» nhà cung cấp há» Äiá»u hà nh thì "
++"không Äược há» há» trợ. Xem các Äiá»u kiá»n vá» há» trợ và giấy phép của nhà cung "
++"cấp trình Äiá»u khiá»n."
+
+ #: ../system-config-printer.glade.h:236
msgid ""
"This driver supports additional hardware that may be installed in the "
"printer."
--msgstr ""
-+msgstr "Trình Äiá»u khiá»n nà y há» trợ phần cứng bá» sung mà có thá» Äược cà i Äặt trong máy in."
-
- #: ../system-config-printer.glade.h:244
- msgid ""
- "This is done by assuming that options with the same name do have the same "
+ msgstr ""
++"Trình Äiá»u khiá»n nà y há» trợ phần cứng bá» sung mà có thá» Äược cà i Äặt trong "
++"máy in."
+
+ #: ../system-config-printer.glade.h:237
+ msgid ""
+@@ -1562,6 +1579,9 @@
"meaning. Settings of options that are not present in the new PPD will be "
"lost and options only present in the new PPD will be set to default."
--msgstr ""
-+msgstr "Äiá»u nà y Äược là m bằng cách giả sá» rằng các tùy chá»n cùng tên thì có cùng má»t nghÄ©a. Các thiết láºp của tùy chá»n không có trong PPD má»i sẽ bá» mất và các tùy chá»n chá» có trong PPD má»i sẽ Äược Äặt thà nh mặc Äá»nh."
-
- #: ../system-config-printer.glade.h:245
- msgid ""
-@@ -1686,40 +1711,46 @@
+ msgstr ""
++"Äiá»u nà y Äược là m bằng cách giả sá» rằng các tùy chá»n cùng tên thì có cùng "
++"má»t nghÄ©a. Các thiết láºp của tùy chá»n không có trong PPD má»i sẽ bá» mất và "
++"các tùy chá»n chá» có trong PPD má»i sẽ Äược Äặt thà nh mặc Äá»nh."
+
+ #: ../system-config-printer.glade.h:238
+ msgid ""
+@@ -1579,274 +1599,284 @@
"this program; if not, write to the Free Software Foundation, Inc., 675 Mass "
"Ave, Cambridge, MA 02139, USA."
msgstr ""
-+"ChÆ°Æ¡ng trình nà y là phần má»m tá»± do; bạn có thá» phát hà nh lại nó và /hoặc sá»a Äá»i nó vá»i Äiá»u kiá»n của Giấy Phép Công Cá»ng GNU nhÆ° Äược xuất bản bá»i Tá» Chức Phần Má»m Tá»± Do; hoặc phiên bản 2 của Giấy Phép nà y, hoặc (tùy chá»n) bất kỳ phiên bản sau nà o.\n"
++"ChÆ°Æ¡ng trình nà y là phần má»m tá»± do; bạn có thá» phát hà nh lại nó và /hoặc sá»a "
++"Äá»i nó vá»i Äiá»u kiá»n của Giấy Phép Công Cá»ng GNU nhÆ° Äược xuất bản bá»i Tá» "
++"Chức Phần Má»m Tá»± Do; hoặc phiên bản 2 của Giấy Phép nà y, hoặc (tùy chá»n) bất "
++"kỳ phiên bản sau nà o.\n"
+"\n"
-+"ChÆ°Æ¡ng trình nà y Äược phát hà nh vì mong muá»n nó có Ãch, nhÆ°ng KHÃNG Cà BẢO HÃNH Gà CẢ, THẬM CHà KHÃNG Cà BẢO ÄẢM ÄƯỢC NGỤ à KHẢ NÄNG BÃN HAY KHẢ NÄNG LÃM ÄƯỢC VIá»C DỨT KHOÃT. Xem Giấy Phép Công Cá»ng GNU Äá» biết thêm chi tiết.\n"
++"ChÆ°Æ¡ng trình nà y Äược phát hà nh vì mong muá»n nó có Ãch, nhÆ°ng KHÃNG Cà BẢO "
++"HÃNH Gà CẢ, THẬM CHà KHÃNG Cà BẢO ÄẢM ÄƯỢC NGỤ à KHẢ NÄNG BÃN HAY KHẢ NÄNG "
++"LÃM ÄƯỢC VIá»C DỨT KHOÃT. Xem Giấy Phép Công Cá»ng GNU Äá» biết thêm chi tiết.\n"
+"\n"
-+"Bạn Äã nháºn má»t bản sao của Giấy Phép Công Cá»ng GNU cùng vá»i chÆ°Æ¡ng trình nà y; nếu không, hãy viết thÆ° cho Tá» Chức Phần Má»m Tá»± Do,\n"
++"Bạn Äã nháºn má»t bản sao của Giấy Phép Công Cá»ng GNU cùng vá»i chÆ°Æ¡ng trình "
++"nà y; nếu không, hãy viết thÆ° cho Tá» Chức Phần Má»m Tá»± Do,\n"
+"Free Software Foundation, Inc.,\n"
+"51 Franklin Street, Fifth Floor,\n"
+"Boston, MA 02110-1301, USA (Mỹ)."
- #: ../system-config-printer.glade.h:250
+ #: ../system-config-printer.glade.h:243
msgid ""
"This way all current option settings will be lost. The default settings of "
"the new PPD will be used. "
--msgstr ""
-+msgstr "Bằng cách nà y, má»i thiết láºp tùy chá»n hiá»n thá»i Äá»u sẽ bá» mất. Thiết láºp mặc Äá»nh của PPD má»i sẽ Äược dùng."
-
- #: ../system-config-printer.glade.h:251
+ msgstr ""
++"Bằng cách nà y, má»i thiết láºp tùy chá»n hiá»n thá»i Äá»u sẽ bá» mất. Thiết láºp mặc "
++"Äá»nh của PPD má»i sẽ Äược dùng."
+
+ #: ../system-config-printer.glade.h:244
msgid "To add a new option, enter its name in the box below and click to add."
--msgstr ""
-+msgstr "Äá» thêm má»t tùy chá»n má»i, nháºp tên của nó và o há»p bên dÆ°á»i, rá»i nhấn chuá»t Äá» thêm."
-
- #: ../system-config-printer.glade.h:252
+ msgstr ""
++"Äá» thêm má»t tùy chá»n má»i, nháºp tên của nó và o há»p bên dÆ°á»i, rá»i nhấn chuá»t "
++"Äá» thêm."
+
+ #: ../system-config-printer.glade.h:245
-#, fuzzy
msgid "Top margin:"
-msgstr "LỠtrên (pt):"
+msgstr "LỠtrên:"
- #: ../system-config-printer.glade.h:253
+ #: ../system-config-printer.glade.h:246
msgid "Try to copy the option settings over from the old PPD. "
-msgstr ""
+msgstr "Thá» sao chép thiết láºp tùy chá»n từ PPD cÅ©."
- #: ../system-config-printer.glade.h:254
+ #: ../system-config-printer.glade.h:247
msgid "URI:"
-msgstr ""
+msgstr "URI:"
- #: ../system-config-printer.glade.h:255
+ #: ../system-config-printer.glade.h:248
msgid "Use the new PPD (Postscript Printer Description) as is."
-msgstr ""
+msgstr "Dùng PPD má»i nhÆ° thế."
- #: ../system-config-printer.glade.h:256
- msgid "User name:"
- msgstr "Tên ngÆ°á»i dùng:"
-
- #: ../system-config-printer.glade.h:257
--#, fuzzy
- msgid "Username:"
- msgstr "Tên ngÆ°á»i dùng:"
-
-@@ -1727,1374 +1758,543 @@
+ #: ../system-config-printer.glade.h:250
+ #, fuzzy
+ msgid "View Print _Queue"
+-msgstr "Hà ng Äợi in thô"
++msgstr "Máy in má»i"
+
+ #: ../system-config-printer.glade.h:251
msgid ""
"With this choice no driver download will be performed. In the next steps a "
"locally installed driver will be selected."
--msgstr ""
-+msgstr "Theo tùy chá»n nà y thì không tải vá» trình Äiá»u khiá»n. Trong những bÆ°á»c tiếp theo, má»t trình ÄÆ¡n Äã cà i Äặt cục bá» sẽ Äược chá»n."
-
- #: ../system-config-printer.glade.h:259
+ msgstr ""
++"Theo tùy chá»n nà y thì không tải vá» trình Äiá»u khiá»n. Trong những bÆ°á»c tiếp "
++"theo, má»t trình ÄÆ¡n Äã cà i Äặt cục bá» sẽ Äược chá»n."
+
+ #: ../system-config-printer.glade.h:252
msgid "Word wrap"
-msgstr ""
+msgstr "Ngắt từ"
- #: ../system-config-printer.glade.h:260
+ #: ../system-config-printer.glade.h:253
msgid "Yes, I accept this license"
- msgstr ""
-+"Có, tôi Äá»ng ý vá»i giấy phép nà y"
-
- #: ../system-config-printer.glade.h:261
+-msgstr ""
++msgstr "Có, tôi Äá»ng ý vá»i giấy phép nà y"
+
+ #: ../system-config-printer.glade.h:254
+ #, fuzzy
+ msgid "_Connect..."
+-msgstr "Ghi chú"
++msgstr "Kết ná»i"
+
+ #: ../system-config-printer.glade.h:255
+ #, fuzzy
+ msgid "_Create Class"
+-msgstr "Máy in JetDirect"
++msgstr "Hạng từ xa"
+
+ #: ../system-config-printer.glade.h:256
++#, fuzzy
+ msgid "_Disable"
+-msgstr ""
++msgstr "Có thá» phân phá»i"
+
+ #: ../system-config-printer.glade.h:257
msgid "_Do not apply"
-msgstr ""
+msgstr "Äừng áp _dụng"
- #: ../system-config-printer.glade.h:262
+ #: ../system-config-printer.glade.h:258
-#, fuzzy
msgid "_Edit"
-msgstr "Sá»a"
+msgstr "_Sá»a"
--#: ../system-config-printer.glade.h:263 ../applet.glade.h:10
-+#: ../system-config-printer.glade.h:263
-+#: ../applet.glade.h:10
+ #: ../system-config-printer.glade.h:259 ../applet.glade.h:9
msgid "_File"
-msgstr ""
+msgstr "_Táºp tin"
- #: ../system-config-printer.glade.h:264
--#, fuzzy
- msgid "_Goto Server"
--msgstr "Server"
-+msgstr "Tá»i máy _phục vụ"
-
- #: ../system-config-printer.glade.h:265
+ #: ../system-config-printer.glade.h:260
msgid "_Help"
-msgstr "Trợ _giúp"
+msgstr "Trợ g_iúp"
- #: ../system-config-printer.glade.h:266
+ #: ../system-config-printer.glade.h:261
msgid "_Install"
- msgstr ""
-+"Cà _i Äặt"
-
- #: ../system-config-printer.glade.h:267
+-msgstr ""
++msgstr "Cà _i Äặt"
+
+ #: ../system-config-printer.glade.h:262
+ #, fuzzy
+ msgid "_Rename"
+-msgstr "_Loại bá»"
++msgstr "_Nhả"
+
+ #: ../system-config-printer.glade.h:263
-#, fuzzy
msgid "_Search"
-msgstr "Cảnh báo"
+msgstr "_Tìm"
- #: ../system-config-printer.glade.h:268
+ #: ../system-config-printer.glade.h:264
+ #, fuzzy
+ msgid "_Server Settings..."
+-msgstr "Tùy chá»n driver"
++msgstr "Thiết láºp máy phục vụ"
+
+ #: ../system-config-printer.glade.h:265
msgid "_Troubleshoot"
-msgstr ""
+msgstr "Giải Äáp _thắc mắc"
- #: ../system-config-printer.glade.h:269
+ #: ../system-config-printer.glade.h:266
-#, fuzzy
msgid "_Verify..."
-msgstr "Xác Äá»nh..."
+msgstr "Thẩm t_ra..."
- #: ../system-config-printer.glade.h:270
+ #: ../system-config-printer.glade.h:267
-#, fuzzy
msgid "default"
-msgstr "Mặc Äá»nh"
+msgstr "mặc Äá»nh"
- #: ../system-config-printer.glade.h:271
+ #: ../system-config-printer.glade.h:268
msgid "none"
-msgstr "không"
+msgstr "không có"
- #: ../system-config-printer.glade.h:272
+ #: ../system-config-printer.glade.h:269
msgid "points"
-msgstr ""
+msgstr "Äiá»m"
- #: ../system-config-printer.glade.h:273
--#, fuzzy
- msgid ""
- "points\n"
- "(72 points per inch)"
--msgstr "72pt má»i inch"
-+msgstr "Äiá»m\n"
-+"(72 chấm trên má»i insÆ¡)"
-
- #: ../system-config-printer.glade.h:275
+ #: ../system-config-printer.glade.h:270
-#, fuzzy
msgid "system-config-printer"
-msgstr "Cấu hình máy in"
+msgstr "system-config-printer"
--#. TRANSLATORS: Replace this string with your names, one name per line. Thank you very much for your effort on translating system-config-printer and all our other tools!
- #: ../system-config-printer.glade.h:277
-+#. TRANSLATORS: Replace this string with your names, one name per line. Thank you very much for your effort on translating system-config-printer and all our other tools!
+ #. TRANSLATORS: Replace this string with your names, one name per line. Thank you very much for your effort on translating system-config-printer and all our other tools!
+ #: ../system-config-printer.glade.h:272
msgid "translator-credits"
--msgstr ""
-+msgstr "Nhóm Viá»t hoá Phần má»m Tá»± do <http://vnoss.net/dokuwiki/doku.php?id=projects:l10n>"
+ msgstr ""
++"Nhóm Viá»t hoá Phần má»m Tá»± do <http://vnoss.net/dokuwiki/doku.php?id=projects:"
++"l10n>"
#: ../system-config-printer.desktop.in.h:1
-#, fuzzy
@@ -2345,312 +2074,616 @@
-msgstr "Máy in: "
+msgstr "In ấn"
- #: ../applet.py:80
+ #: ../statereason.py:85
msgid "Toner low"
-msgstr ""
+msgstr "Ãt má»±c sắc Äiá»u"
- #: ../applet.py:81
+ #: ../statereason.py:86
#, python-format
msgid "Printer '%s' is low on toner."
-msgstr ""
+msgstr "Máy in « %s » chá» có má»t Ãt má»±c sắc Äiá»u còn lại."
- #: ../applet.py:82
+ #: ../statereason.py:87
msgid "Toner empty"
-msgstr ""
+msgstr "Cạn má»±c sắc Äiá»u"
- #: ../applet.py:83
+ #: ../statereason.py:88
#, python-format
msgid "Printer '%s' has no toner left."
- msgstr ""
-+"Máy in « %s » không có má»±c sắc Äiá»u còn lại."
-
- #: ../applet.py:84
+-msgstr ""
++msgstr "Máy in « %s » không có má»±c sắc Äiá»u còn lại."
+
+ #: ../statereason.py:89
msgid "Cover open"
-msgstr ""
+msgstr "Cái nắp còn má»"
- #: ../applet.py:85
+ #: ../statereason.py:90
#, python-format
msgid "The cover is open on printer '%s'."
-msgstr ""
+msgstr "Cái nắp còn mỠtrên máy in « %s »."
- #: ../applet.py:86
+ #: ../statereason.py:91
msgid "Door open"
-msgstr ""
+msgstr "Cá»a còn má»"
- #: ../applet.py:87
+ #: ../statereason.py:92
#, python-format
msgid "The door is open on printer '%s'."
-msgstr ""
+msgstr "Cá»a còn má» trên máy in « %s »."
- #: ../applet.py:88
+ #: ../statereason.py:93
msgid "Paper low"
-msgstr ""
+msgstr "Ãt giấy"
- #: ../applet.py:89
+ #: ../statereason.py:94
#, python-format
msgid "Printer '%s' is low on paper."
-msgstr ""
+msgstr "Máy in « %s » chỠcó và i tỠgiấy còn lại."
- #: ../applet.py:90
+ #: ../statereason.py:95
msgid "Out of paper"
-msgstr ""
+msgstr "Cạn giấy"
- #: ../applet.py:91
+ #: ../statereason.py:96
#, python-format
msgid "Printer '%s' is out of paper."
-msgstr ""
+msgstr "Máy in « %s » không có tỠgiấy còn lại."
- #: ../applet.py:92
+ #: ../statereason.py:97
msgid "Ink low"
-msgstr ""
+msgstr "Ãt má»±c"
- #: ../applet.py:93
+ #: ../statereason.py:98
#, python-format
msgid "Printer '%s' is low on ink."
-msgstr ""
+msgstr "Máy in « %s » chá» có má»t Ãt má»±c còn lại."
- #: ../applet.py:94
+ #: ../statereason.py:99
msgid "Ink empty"
-msgstr ""
+msgstr "Cạn mực"
- #: ../applet.py:95
+ #: ../statereason.py:100
#, python-format
msgid "Printer '%s' has no ink left."
- msgstr ""
-+"Máy in « %s » không có mực còn lại."
-
- #: ../applet.py:96
+-msgstr ""
++msgstr "Máy in « %s » không có mực còn lại."
+
+ #: ../statereason.py:101
+ #, fuzzy
+ msgid "Printer off-line"
+-msgstr "Tùy chá»n bá» lá»c"
++msgstr "VỠtrà máy in"
+
+ #: ../statereason.py:102
+-#, python-format
++#, fuzzy, python-format
+ msgid "Printer `%s' is currently off-line."
+-msgstr ""
++msgstr "Máy in « %s » không có tỠgiấy còn lại."
+
+ #: ../statereason.py:103
-#, fuzzy
msgid "Not connected?"
-msgstr "_Kết ná»i cục bá»"
+msgstr "ChÆ°a kết ná»i ?"
- #: ../applet.py:97
+ #: ../statereason.py:104
#, python-format
msgid "Printer '%s' may not be connected."
-msgstr ""
+msgstr "Có lẽ máy in « %s » không có kết ná»i."
- #: ../applet.py:104
+ #: ../statereason.py:105 ../statereason.py:121
+-#, fuzzy
+ msgid "Printer error"
+-msgstr "Máy in: "
++msgstr "Lá»i máy in"
+
+ #: ../statereason.py:106
+ #, fuzzy, python-format
+ msgid "There is a problem on printer `%s'."
+-msgstr ""
+-"Lá»i gá»i %s\n"
+-"Äến hà ng Äợi `%s':\n"
+-"\n"
++msgstr "Cá»a còn má» trên máy in « %s »."
+
+ #: ../statereason.py:117
-#, fuzzy
msgid "Printer report"
-msgstr "Tùy chá»n bá» lá»c"
+msgstr "Báo cáo máy in"
- #: ../applet.py:106
+ #: ../statereason.py:119
-#, fuzzy
msgid "Printer warning"
-msgstr "Máy in: "
+msgstr "Cảnh báo máy in"
- #: ../applet.py:108
--#, fuzzy
- msgid "Printer error"
--msgstr "Máy in: "
-+msgstr "Lá»i máy in"
-
- #: ../applet.py:109
+ #: ../statereason.py:122
#, python-format
msgid "Printer '%s': '%s'."
-msgstr ""
+msgstr "Máy in « %s »: « %s »"
- #: ../applet.py:187
--#, fuzzy
- msgid "Size"
--msgstr "Cỡ giấy"
-+msgstr "KÃch cỡ"
-
- #: ../applet.py:188
- msgid "Time submitted"
--msgstr ""
-+msgstr "Giá» Äã gá»i"
-
- #: ../applet.py:239
- msgid "Message"
- msgstr ""
-+"Thông Äiá»p"
-
- #: ../applet.py:592
- msgid "1 hour ago"
--msgstr ""
-+msgstr "1 giá» trÆ°á»c"
-
- #: ../applet.py:594
- msgid "1 hour and 1 minute ago"
--msgstr ""
-+msgstr "1 giá» và 1 phút trÆ°á»c"
-
- #: ../applet.py:596
+ #: ../troubleshoot/__init__.py:53
+ msgid "Printing troubleshooter"
+-msgstr ""
++msgstr "Bá» giải Äáp thắc mắc viá»c in"
+
+ #: ../troubleshoot/base.py:26
+ msgid ""
+ "To start this tool, select System->Administration->Printing from the main "
+ "menu."
+ msgstr ""
++"Äá» khá»i chạy công cụ nà y, chá»n « Há» thá»ng > Quản trá» > In » trong trình ÄÆ¡n "
++"chÃnh."
+
+ #: ../troubleshoot/CheckLocalServerPublishing.py:28
+ msgid "Server Not Exporting Printers"
+@@ -1865,14 +1895,13 @@
+ msgstr ""
+
+ #: ../troubleshoot/CheckPPDSanity.py:45 ../applet.py:146
+-#, fuzzy
+ msgid "Install"
+-msgstr "Driver máy in"
++msgstr "Cà i Äặt"
+
+ #: ../troubleshoot/CheckPPDSanity.py:80
+ #, fuzzy
+ msgid "Invalid PPD File"
+-msgstr "Giá trá» không hợp lá»"
++msgstr "Cung cấp táºp tin PPD"
+
+ #: ../troubleshoot/CheckPPDSanity.py:89
#, python-format
- msgid "1 hour and %d minutes ago"
--msgstr ""
-+msgstr "1 giá» và %d phút trÆ°á»c"
-
- #: ../applet.py:599
+@@ -1885,38 +1914,35 @@
+ #: ../troubleshoot/CheckPPDSanity.py:95
+ #, fuzzy, python-format
+ msgid "There is a problem with the PPD file for printer `%s'."
+-msgstr ""
+-"Lá»i gá»i %s\n"
+-"Äến hà ng Äợi `%s':\n"
+-"\n"
++msgstr "Gặp lá»i khi kết ná»i Äến máy phục vụ CUPS."
+
+ #: ../troubleshoot/CheckPPDSanity.py:105
+ #, fuzzy
+ msgid "Missing Printer Driver"
+-msgstr "Driver máy in"
++msgstr "Thiếu trình Äiá»u khiá»n máy in"
+
+ #: ../troubleshoot/CheckPPDSanity.py:108
+-#, python-format
++#, fuzzy, python-format
+ msgid "Printer `%s' requires the %s package but it is not currently installed."
+-msgstr ""
++msgstr "Máy in « %s » cần thiết gói %s mà chÆ°a Äược cà i Äặt."
+
+ #: ../troubleshoot/CheckPPDSanity.py:113
+ #, fuzzy, python-format
+ msgid ""
+ "Printer `%s' requires the `%s' program but it is not currently installed."
+-msgstr ""
+-"Hà ng Äợi in NCP cần chÆ°Æ¡ng trình \"nprint\", mà có lẽ chÆ°a Äược cà i Äặt."
++msgstr "Máy in « %s » cần thiết gói %s mà chÆ°a Äược cà i Äặt."
+
+ #: ../troubleshoot/ChooseNetworkPrinter.py:29
+-#, fuzzy
+ msgid "Choose Network Printer"
+-msgstr "Máy in:"
++msgstr "Chá»n máy in mạng"
+
+ #: ../troubleshoot/ChooseNetworkPrinter.py:30
+ msgid ""
+ "Please select the network printer you are trying to use from the list below. "
+ "If it does not appear in the list, select 'Not listed'."
+ msgstr ""
++"Trong danh sách bên dÆ°á»i, hãy chá»n máy in mạng bạn Äang thá» dùng. Không có "
++"trong danh sách thì chá»n mục « Không có trong danh sách »."
+
+ #: ../troubleshoot/ChooseNetworkPrinter.py:35
+ #: ../troubleshoot/ChoosePrinter.py:36 ../troubleshoot/DeviceListed.py:36
+@@ -1925,37 +1951,39 @@
+
+ #: ../troubleshoot/ChooseNetworkPrinter.py:39
+ #: ../troubleshoot/ChoosePrinter.py:40 ../troubleshoot/DeviceListed.py:38
+-#, fuzzy
+ msgid "Information"
+-msgstr "_Hà nh Äá»ng"
++msgstr "Thông tin"
+
+ #: ../troubleshoot/ChooseNetworkPrinter.py:75
+ #: ../troubleshoot/ChoosePrinter.py:64 ../troubleshoot/DeviceListed.py:70
+-#, fuzzy
+ msgid "Not listed"
+-msgstr "_Kết ná»i cục bá»"
++msgstr "Không có trong danh sách"
+
+ #: ../troubleshoot/ChoosePrinter.py:30
+-#, fuzzy
+ msgid "Choose Printer"
+-msgstr "Máy in:"
++msgstr "Chá»n máy in"
+
+ #: ../troubleshoot/ChoosePrinter.py:31
+ msgid ""
+ "Please select the printer you are trying to use from the list below. If it "
+ "does not appear in the list, select 'Not listed'."
+ msgstr ""
++"Trong danh sách bên dÆ°á»i, hãy chá»n máy in bạn Äang thá» dùng. Không có trong "
++"danh sách thì chá»n mục « Không có trong danh sách »."
+
+ #: ../troubleshoot/DeviceListed.py:30
+ #, fuzzy
+ msgid "Choose Device"
+-msgstr "Thiết bá» Tá»± chá»n"
++msgstr "Äá»i URI thiết bá»"
+
+ #: ../troubleshoot/DeviceListed.py:31
++#, fuzzy
+ msgid ""
+ "Please select the device you want to use from the list below. If it does not "
+ "appear in the list, select 'Not listed'."
+ msgstr ""
++"Trong danh sách bên dÆ°á»i, hãy chá»n máy in bạn Äang thá» dùng. Không có trong "
++"danh sách thì chá»n mục « Không có trong danh sách »."
+
+ #: ../troubleshoot/ErrorLogCheckpoint.py:30
+ #: ../troubleshoot/ErrorLogFetch.py:30
+@@ -2005,48 +2033,44 @@
+ #: ../troubleshoot/ErrorLogParse.py:31
+ #, fuzzy
+ msgid "There are messages in the error log."
+-msgstr "Äây là các thông Äiá»p xuất hiá»n trong error log:"
++msgstr "Äây là các thông Äiá»p xuất hiá»n trong bản ghi lá»i:"
+
+ #: ../troubleshoot/LocalOrRemote.py:27
+-#, fuzzy
+ msgid "Printer Location"
+-msgstr "Tùy chá»n bá» lá»c"
++msgstr "VỠtrà máy in"
+
+ #: ../troubleshoot/LocalOrRemote.py:28
+ msgid "Is the printer connected to this computer or available on the network?"
+-msgstr ""
++msgstr "Máy in có kết ná»i Äến máy nà y hoặc có sẵn trên mạng?"
+
+ #: ../troubleshoot/LocalOrRemote.py:30
+-#, fuzzy
+ msgid "Locally connected printer"
+-msgstr "Tháºt sá»± muá»n xóa \"%s\" chứ?"
++msgstr "Máy in có kết ná»i cục bá»"
+
+ #: ../troubleshoot/LocalOrRemote.py:31
+-#, fuzzy
+ msgid "Network printer"
+-msgstr "Máy in:"
++msgstr "Máy in mạng"
+
+ #: ../troubleshoot/NetworkCUPSPrinterShared.py:28
+-#, fuzzy
+ msgid "Queue Not Shared"
+-msgstr "Tên hà ng Äợi"
++msgstr "Hà ng Äợi không dùng chung"
+
+ #: ../troubleshoot/NetworkCUPSPrinterShared.py:29
+ msgid "The CUPS printer on the server is not shared."
+-msgstr ""
++msgstr "Máy in CUPS trên máy phục vụ không Äược dùng chung."
+
+ #: ../troubleshoot/PrinterStateReasons.py:29
+ msgid "Status Messages"
+-msgstr ""
++msgstr "Thông Äiá»p trạng thái"
+
+ #: ../troubleshoot/PrinterStateReasons.py:30
+ msgid "There are status messages associated with this queue."
+-msgstr ""
++msgstr "Có thông Äiá»p trạng thái liên quan Äến hà ng Äợi nà y."
+
+ #: ../troubleshoot/PrinterStateReasons.py:53
+ #, fuzzy, python-format
+ msgid "The printer's state message is: `%s'."
+-msgstr "Ghi chú máy in:"
++msgstr "Thông Äiá»p tình trạng của máy in:"
+
+ #: ../troubleshoot/PrinterStateReasons.py:78
+ msgid "Errors are listed below:"
+@@ -2057,9 +2081,8 @@
+ msgstr ""
+
+ #: ../troubleshoot/PrintTestPage.py:55
+-#, fuzzy
+ msgid "Test Page"
+-msgstr "Ghi chú máy in:"
++msgstr "Trang thá»"
+
+ #: ../troubleshoot/PrintTestPage.py:56
+ msgid ""
+@@ -2069,16 +2092,17 @@
+
+ #: ../troubleshoot/PrintTestPage.py:71
+ msgid "Cancel All Jobs"
+-msgstr ""
++msgstr "Thôi má»i công viá»c"
+
+ #: ../troubleshoot/PrintTestPage.py:77
+ #, fuzzy
+ msgid "Test"
+-msgstr "_Thá»"
++msgstr "Äặt lại"
+
+ #: ../troubleshoot/PrintTestPage.py:107
++#, fuzzy
+ msgid "Did the marked print jobs print correctly?"
+-msgstr ""
++msgstr "Trang thá» Äã in Äúng không?"
+
+ #: ../troubleshoot/PrintTestPage.py:114
+ msgid "Yes"
+@@ -2096,68 +2120,68 @@
+ #: ../troubleshoot/QueueRejectingJobs.py:67
#, python-format
- msgid "%d hours ago"
--msgstr ""
-+msgstr "%d giá» trÆ°á»c"
-
- #: ../applet.py:601
+ msgid "The reason given is: `%s'."
+-msgstr ""
++msgstr "Lý do là : « %s »"
+
+ #: ../troubleshoot/QueueNotEnabled.py:59
+ msgid "This may be due to the printer being disconnected or switched off."
+-msgstr ""
++msgstr "Có lẽ vì máy in bá» ngắt kết ná»i hoặc bá» tắt."
+
+ #: ../troubleshoot/QueueNotEnabled.py:63
+-#, fuzzy
+ msgid "Queue Not Enabled"
+-msgstr "Tên hà ng Äợi"
++msgstr "ChÆ°a báºt hà ng Äợi"
+
+ #: ../troubleshoot/QueueNotEnabled.py:64
#, python-format
- msgid "%d hours and 1 minute ago"
--msgstr ""
-+msgstr "%d giá» 1 phút trÆ°á»c"
-
- #: ../applet.py:603
+ msgid "The queue `%s' is not enabled."
+-msgstr ""
++msgstr "Hà nh Äợi « %s » chÆ°a Äược báºt."
+
+ #: ../troubleshoot/QueueNotEnabled.py:72
+ msgid ""
+ "To enable it, select the `Enabled' checkbox in the `Policies' tab for the "
+ "printer in the printer administration tool."
+ msgstr ""
++"Äá» hiá»u lá»±c nó, Äánh dấu trong há»p chá»n cạnh mục « Báºt » trên thẻ « ChÃnh sách "
++"» cho máy in trong công cụ quản trỠmáy in."
+
+ #: ../troubleshoot/QueueRejectingJobs.py:32
+-#, fuzzy
+ msgid "Queue Rejecting Jobs"
+-msgstr "Tùy chá»n hà ng Äợi"
++msgstr "Hà ng Äợi từ chá»i công viá»c"
+
+ #: ../troubleshoot/QueueRejectingJobs.py:64
#, python-format
- msgid "%d hours and %d minutes ago"
--msgstr ""
-+msgstr "%d giá» và %d phút trÆ°á»c"
-
- #: ../applet.py:609
- msgid "a minute ago"
--msgstr ""
-+msgstr "má»t phút trÆ°á»c"
-
- #: ../applet.py:611
+ msgid "The queue `%s' is rejecting jobs."
+-msgstr ""
++msgstr "Hà ng Äợi « %s » Äang từ chá»i công viá»c."
+
+ #: ../troubleshoot/QueueRejectingJobs.py:71
+ msgid ""
+ "To make the queue accept jobs, select the `Accepting Jobs' checkbox in the "
+ "`Policies' tab for the printer in the printer administration tool."
+ msgstr ""
++"Äá» là m cho hà ng Äợi lại chấp nháºn công viá»c, báºt tùy chá»n « Chấp nháºn công "
++"viá»c » trên thẻ « ChÃnh sách » cho máy in trong công cụ quản trá» máy in."
+
+ #: ../troubleshoot/RemoteAddress.py:27
+-#, fuzzy
+ msgid "Remote Address"
+-msgstr "Máy in JetDirect"
++msgstr "Äá»a chá» á» xa"
+
+ #: ../troubleshoot/RemoteAddress.py:28
+ msgid ""
+ "Please enter as many details as you can about the network address of this "
+ "printer."
+ msgstr ""
++"Hãy nháºp cà ng nhiá»u chi tiết cà ng có thá» vá» Äá»a chá» mạng của máy in nà y."
+
+ #: ../troubleshoot/RemoteAddress.py:36
+-#, fuzzy
+ msgid "Server name:"
+-msgstr "Tên ngÆ°á»i dùng:"
++msgstr "Tên máy phục vụ :"
+
+ #: ../troubleshoot/RemoteAddress.py:43
+-#, fuzzy
+ msgid "Server IP address:"
+-msgstr "Tên hoặc Äá»a chá» IP của server:"
++msgstr "Äá»a chá» IP của máy phục vụ :"
+
+ #: ../troubleshoot/SchedulerNotRunning.py:28
+ msgid "CUPS Service Stopped"
+-msgstr ""
++msgstr "Dá»ch vụ CUPS bá» dừng"
+
+ #: ../troubleshoot/SchedulerNotRunning.py:29
+ msgid ""
+@@ -2165,18 +2189,17 @@
+ "choose System->Administration->Services from the main menu and look for the "
+ "`cups' service."
+ msgstr ""
++"Có vẻ là bá» cuá»n và o á»ng CUPS không Äang chạy. Äá» sá»a chữa trÆ°á»ng hợp nà y, "
++"hãy chá»n « Há» thá»ng > Quản trá» > Dá»ch vụ » trong trình ÄÆ¡n chÃnh, và tìm dá»ch "
++"vụ « cups »."
+
+ #: ../troubleshoot/ServerFirewalled.py:27
+ msgid "Check Server Firewall"
+-msgstr ""
++msgstr "Kiá»m tra tÆ°á»ng lá»a máy phục vụ"
+
+ #: ../troubleshoot/ServerFirewalled.py:28
+-#, fuzzy
+ msgid "It is not possible to connect to the server."
+-msgstr ""
+-"Lá»i gá»i %s\n"
+-"Äến hà ng Äợi `%s':\n"
+-"\n"
++msgstr "Không thá» kết ná»i tá»i máy phục vụ."
+
+ #: ../troubleshoot/ServerFirewalled.py:43
#, python-format
- msgid "%d minutes ago"
--msgstr ""
-+msgstr "%d phút trÆ°á»c"
-
- #: ../applet.py:666
- msgid "No documents queued"
--msgstr ""
-+msgstr "Không có tà i liá»u Äang Äợi in"
-
- #: ../applet.py:669
- msgid "1 document queued"
--msgstr ""
-+msgstr "Có 1 tà i liá»u Äang Äợi in"
-
- #: ../applet.py:672
- #, python-format
- msgid "%d documents queued"
--msgstr ""
-+msgstr "Có %d tà i liá»u Äang Äợi in"
-
- #: ../applet.py:1026
+@@ -2184,490 +2207,235 @@
+ "Please check to see if a firewall or router configuration is blocking TCP "
+ "port %d on server `%s'."
+ msgstr ""
++"Hãy kiá»m tra nếu má»t tÆ°á»ng lá»a hoặc cấu hình cầu dẫn có chặn cá»ng TCP %d "
++"trên máy phục vụ « %s » không."
+
+ #: ../troubleshoot/Shrug.py:27
+ msgid "Sorry!"
+-msgstr ""
++msgstr "Tiếc là "
+
+ #: ../troubleshoot/Shrug.py:28
+ msgid ""
+ "I have not been able to work out what the problem is, but I have collected "
+ "some useful information to put in a bug report."
+ msgstr ""
++"chÆ°Æ¡ng trình nà y không thá» giải quyết vấn Äá» nà y, nhÆ°ng Äã thu tháºp má»t và i "
++"thông tin có Ãch Äá» kèm thêm và o má»t báo cáo lá»i."
+
+ #: ../troubleshoot/Welcome.py:36
+ msgid "Trouble-shooting Printing"
+-msgstr ""
++msgstr "Giải Äáp thắc mắc viá»c in"
+
+ #: ../troubleshoot/Welcome.py:38
+ msgid ""
+ "In the next few screens I will ask you some questions about your problem "
+ "with printing. Based on your answers I will try to suggest a solution."
+ msgstr ""
++"Và i mà n hình kế tiếp sẽ há»i má»t sá» câu vá» vấn Äá» in của bạn. Dá»±a và o các trả "
++"lá»i, chÆ°Æ¡ng trình sẽ thá» Äá» nghá» cách giải quyết."
+
+ #: ../troubleshoot/Welcome.py:42
+ msgid "Click 'Forward' to begin."
+-msgstr ""
++msgstr "Nhấn và o « Tiếp » Äá» bắt Äầu."
+
+ #: ../applet.py:135
-#, fuzzy
msgid "Printer added"
-msgstr "Kiá»u máy in"
+msgstr "Máy in Äã Äược thêm"
- #: ../applet.py:1028
+ #: ../applet.py:137
-#, fuzzy
msgid "Missing printer driver"
-msgstr "Driver máy in"
+msgstr "Thiếu trình Äiá»u khiá»n máy in"
- #: ../applet.py:1032
+ #: ../applet.py:141
-#, fuzzy
msgid "Install printer driver"
-msgstr "Driver máy in"
+msgstr "Cà i Äặt trình Äiá»u khiá»n máy in"
- #: ../applet.py:1033
+ #: ../applet.py:142
#, python-format
msgid "`%s' requires driver installation: %s."
-msgstr ""
+msgstr "« %s » cần thiết cà i Äặt trình Äiá»u khiá»n: %s."
- #: ../applet.py:1036
--#, fuzzy
- msgid "Install"
--msgstr "Driver máy in"
-+msgstr "Cà i Äặt"
-
- #: ../applet.py:1039
+ #: ../applet.py:150
#, python-format
msgid "`%s' is ready for printing."
-msgstr ""
+msgstr "« %s » sẵn sà ng in."
- #: ../applet.py:1042
+ #: ../applet.py:153
-#, fuzzy
msgid "Configure"
-msgstr "Cấu hình máy in"
+msgstr "Cấu hình"
--#. Model mismatch
- #: ../applet.py:1045
+ #. Model mismatch
+ #: ../applet.py:156
#, python-format
-+#. Model mismatch
msgid "`%s' has been added, using the `%s' driver."
-msgstr ""
+msgstr "« %s » Äã Äược thêm và o, dùng trình Äiá»u khiá»n « %s »."
- #: ../applet.py:1049
+ #: ../applet.py:160
-#, fuzzy
msgid "Find driver"
-msgstr "Driver máy in"
+msgstr "Tìm trình Äiá»u khiá»n"
- #: ../applet.glade.h:4
- msgid "Document print status"
--msgstr ""
-+msgstr "Trạng thái in của tà i liá»u"
-
- #: ../applet.glade.h:6
+ #: ../applet.glade.h:1
+ msgid ""
+ "<span weight=\"bold\" size=\"larger\">Password required</span>\n"
+ "\n"
+ msgstr ""
++"<span weight=\"bold\" size=\"larger\">Cần máºt khẩu</span>\n"
++"\n"
+
+ #: ../applet.glade.h:5
-#, fuzzy
msgid "Printer status"
-msgstr "Ghi chú máy in:"
+msgstr "Trạng thái máy in"
+ #: ../applet.glade.h:6
+ msgid "Re_print"
+-msgstr ""
++msgstr "In _lại"
+
#: ../applet.glade.h:7
- msgid "Re_print"
--msgstr ""
-+msgstr "In _lại"
+ msgid "Show _completed jobs"
+-msgstr ""
++msgstr "Hiá»n _các công viá»c hoà n tất"
#: ../applet.glade.h:8
- msgid "Show _completed jobs"
--msgstr ""
-+msgstr "Hiá»n _các công viá»c hoà n tất"
-
- #: ../applet.glade.h:9
msgid "Show _printer status"
-msgstr ""
+msgstr "Hiá»n trạng thái _máy in"
+ #: ../applet.glade.h:10
+ msgid "_Hide"
+-msgstr ""
++msgstr "Ẩ_n"
+
#: ../applet.glade.h:11
- msgid "_Hide"
--msgstr ""
-+msgstr "Ẩ_n"
+ msgid "_Hold"
+-msgstr ""
++msgstr "_Giữ lại"
#: ../applet.glade.h:12
- msgid "_Hold"
--msgstr ""
-+msgstr "_Giữ lại"
-
- #: ../applet.glade.h:13
-#, fuzzy
msgid "_Refresh"
-msgstr "_Xoá"
+msgstr "_Cáºp nháºt"
- #: ../applet.glade.h:14
+ #: ../applet.glade.h:13
-#, fuzzy
msgid "_Release"
-msgstr "_Xoá"
+msgstr "_Nhả"
- #: ../applet.glade.h:15
+ #: ../applet.glade.h:14
msgid "_View"
-msgstr ""
+msgstr "_Xem"
@@ -2680,15 +2713,95 @@
-#, fuzzy
msgid "Select default printer"
-msgstr "Äây là mô tả của máy in."
--
++msgstr "Chá»n máy in mặc Äá»nh"
+
+-#, fuzzy
+-#~ msgid "Create a new printer group"
+-#~ msgstr "Tạo hà ng Äợi má»i"
+-
+-#, fuzzy
+-#~ msgid "Create a new printer queue"
+-#~ msgstr "Tạo hà ng Äợi má»i"
+-
+-#, fuzzy
+-#~ msgid "Make:"
+-#~ msgstr "Tên:"
+-
+-#, fuzzy
+ #~ msgid "This is the default printer"
+-#~ msgstr "Äây là mô tả của máy in."
++#~ msgstr "Äây là máy in mặc Äá»nh"
+
+-#, fuzzy
+ #~ msgid "No default printer set."
+-#~ msgstr "Äây là mô tả của máy in."
++#~ msgstr "ChÆ°a Äặt máy in mặc Äá»nh."
+
+-#, fuzzy
+ #~ msgid "Cancel Tests"
+-#~ msgstr "Hủy bá»"
+-
+-#, fuzzy
+-#~ msgid "Authentication required"
+-#~ msgstr "Xác thực"
+-
+-#, fuzzy
+-#~ msgid "Default Printer:"
+-#~ msgstr "Äây là mô tả của máy in."
+-
+-#, fuzzy
+-#~ msgid "Make Default"
+-#~ msgstr "_Mặc Äá»nh"
+-
+-#~ msgid "User name:"
+-#~ msgstr "Tên ngÆ°á»i dùng:"
++#~ msgstr "Thôi thá»"
+
+-#, fuzzy
+-#~ msgid "Search terms:"
+-#~ msgstr "Chia sẻ: "
+-
+-#, fuzzy
+-#~ msgid "Copy this printer queue"
+-#~ msgstr "Sá»a hà ng Äợi in"
+-
+-#, fuzzy
+-#~ msgid "Delete this printer queue"
+-#~ msgstr "Xóa hà ng Äợi Äược chá»n"
+-
+-#, fuzzy
+-#~ msgid "Goto Server"
+-#~ msgstr "Server"
++#~ msgid "Support for downloadable drivers is not yet completed."
++#~ msgstr "ChÆ°a hoà n tất há» trợ cho trình Äiá»u khiá»n có thá» tải vá»."
+
+-#, fuzzy
+-#~ msgid "_Goto Server"
+-#~ msgstr "Server"
++#~ msgid "Password required"
++#~ msgstr "Cần thiết máºt khẩu"
+
+-#, fuzzy
+ #~ msgid "Queue Not Accepting Jobs"
+-#~ msgstr "Tùy chá»n hà ng Äợi"
+-
+-#, fuzzy
+-#~ msgid "Printer's state reasons:"
+-#~ msgstr "Ghi chú máy in:"
++#~ msgstr "Hà ng Äợi không chấp nháºn công viá»c"
+
-#, fuzzy
-#~ msgid "Click the button to print a test page."
-#~ msgstr "Bạn có muá»n in thá» má»t trang không?"
--
++#~ msgid "The CUPS printer on the server is not accepting jobs."
++#~ msgstr "Máy in CUPS trên máy phục vụ không Äang chấp nháºn công viá»c in."
+
-#, fuzzy
-#~ msgid "3"
-#~ msgstr "A3"
--
++#~ msgid "The CUPS printer on the server is not enabled."
++#~ msgstr "Máy in CUPS trên máy phục vụ chÆ°a Äược hiá»u lá»±c."
+
-#, fuzzy
-#~ msgid "Printername"
-#~ msgstr "Kiá»u máy in"
@@ -2706,48 +2819,72 @@
-#, fuzzy
-#~ msgid "Comments: "
-#~ msgstr "Ghi chú"
--
++#~ msgid "Printer's state reasons:"
++#~ msgstr "Lý do tình trạng của máy in:"
+
-#, fuzzy
-#~ msgid "Device"
-#~ msgstr "Thiết bá»"
--
++#~ msgid " The reason given is: `%s'."
++#~ msgstr " Nó cung cấp lý do : « %s »"
+
-#, fuzzy
-#~ msgid "Driver"
-#~ msgstr "Driver"
--
++#~ msgid "Connect to a different print server"
++#~ msgstr "Kết ná»i Äến máy phục vụ in khác"
+
-#, fuzzy
-#~ msgid "Make Default Printer"
-#~ msgstr "Äây là mô tả của máy in."
--
++#~ msgid "Copy this printer queue"
++#~ msgstr "Chép hà ng Äợi máy in nà y"
+
-#, fuzzy
-#~ msgid "System-Config-Printer %s"
-#~ msgstr "Cấu hình máy in"
--
++#~ msgid "Create a new printer group"
++#~ msgstr "Tạo nhóm máy in má»i"
+
-#, fuzzy
-#~ msgid "Specify default job options."
-#~ msgstr "Äặt lại tùy chá»n mặc Äá»nh"
--
++#~ msgid "Create a new printer queue"
++#~ msgstr "Tạo hà ng Äợi máy in má»i"
+
-#, fuzzy
-#~ msgid "localhost"
-#~ msgstr "cục bá»"
--
++#~ msgid "Default Printer:"
++#~ msgstr "Máy in mặc Äá»nh:"
+
-#, fuzzy
-#~ msgid "smb://"
-#~ msgstr "smb"
--
++#~ msgid "Delete this printer queue"
++#~ msgstr "Xoá hà ng Äợi máy in nà y"
+
-#~ msgid "Ok"
-#~ msgstr "Äá»ng ý"
--
++#~ msgid "Enter some search terms for the model of your printer."
++#~ msgstr "Nháºp chuá»i tìm kiếm Äá»i vá»i mẫu máy in của bạn."
+
-#~ msgid "Info"
-#~ msgstr "Thông tin"
--
++#~ msgid "Goto Server"
++#~ msgstr "Tá»i máy phục vụ"
+
-#~ msgid "Exit"
-#~ msgstr "Thoát"
--
--#~ msgid ""
++#~ msgid "Make Default"
++#~ msgstr "Äặt mặc Äá»nh"
+
+ #~ msgid ""
-#~ "You have made changes, would you like to save them? If you say no, your "
-#~ "changes will be lost."
--#~ msgstr ""
++#~ "May contain any printable characters except \"/\", \"#\", and space.\n"
++#~ "Name must be unique on the local machine!"
+ #~ msgstr ""
-#~ "Bạn Äã thá»±c hiá»n các thay Äá»i, bạn có muá»n lÆ°u chúng lại không? Nếu bạn "
-#~ "nói không, các thay Äá»i của bạn sẽ bá» mất."
-
@@ -2768,10 +2905,14 @@
-
-#~ msgid "Share:"
-#~ msgstr "Chia sẻ:"
--
++#~ "Có thá» chứa bất cứ ký tá»± in Äược nà o trừ « / », « # » và dấu cách.\n"
++#~ "Tên phải là duy nhất trên máy cục bá»."
+
-#~ msgid "Workgroup:"
-#~ msgstr "Workgroup:"
--
++#~ msgid "Refresh the list of printer queues"
++#~ msgstr "Cáºp nháºt danh sách các hà ng Äợi máy in"
+
-#~ msgid "User:"
-#~ msgstr "NgÆ°á»i dùng:"
-
@@ -2780,19 +2921,27 @@
-
-#~ msgid "Driver:"
-#~ msgstr "Driver:"
--
++#~ msgid "Search terms:"
++#~ msgstr "Chuá»i tìm kiếm:"
+
-#~ msgid "Name and Type"
-#~ msgstr "Tên và Kiá»u"
--
++#~ msgid "User name:"
++#~ msgstr "Tên ngÆ°á»i dùng:"
+
-#~ msgid "Next"
-#~ msgstr "Tá»i"
--
++#~ msgid "_Goto Server"
++#~ msgstr "Tá»i máy _phục vụ"
+
-#~ msgid "Queue Type"
-#~ msgstr "Kiá»u hà ng Äợi"
--
--#~ msgid ""
--#~ "The name \"%s\" is bad. Please choose a name of the form [a-zA-Z][a-zA-Z0-"
--#~ "9_-]*."
++#~ msgid "smb://"
++#~ msgstr "smb://"
+
+ #~ msgid ""
+ #~ "The name \"%s\" is bad. Please choose a name of the form [a-zA-Z][a-zA-Z0-"
+ #~ "9_-]*."
-#~ msgstr ""
-#~ "Tên \"%s\" không tá»t. Vui lòng chá»n tên theo mẫu [a-zA-Z][a-zA-Z0-9_-]* "
-#~ "(bắt Äầu bằng ký tá»± a-z hoặc A-Z, sau Äó là ký tá»±, hoặc sá», hoặc dấu '-' "
@@ -2803,19 +2952,17 @@
-
-#~ msgid "Custom"
-#~ msgstr "Tá»± chá»n"
--
--#~ msgid ""
--#~ "Pick the printer device from the list, or enter it using \"Custom\" below."
--#~ msgstr ""
++#~ msgstr "Tên « %s » không tá»t. Hãy chá»n tên theo mẫu [a-zA-Z][a-zA-Z0-9_-]*."
+
+ #~ msgid ""
+ #~ "Pick the printer device from the list, or enter it using \"Custom\" below."
+ #~ msgstr ""
-#~ "Hãy chá»n Thiết bá» Máy in từ danh sách, hoặc nháºp thông qua \"Tá»± chá»n\" "
-#~ "bên dÆ°á»i."
-
-#~ msgid "Specify Device:"
-#~ msgstr "Xác Äá»nh thiết bá»:"
-
--#~ msgid "Custom Device"
--#~ msgstr "Thiết bá» Tá»± chá»n"
--
-#~ msgid "Specify the device to use."
-#~ msgstr "Xác Äá»nh thiết bá» cần dùng."
-
@@ -2866,10 +3013,12 @@
-
-#~ msgid "Port"
-#~ msgstr "Cá»ng"
--
--#~ msgid "Jetdirect (JETDIRECT) Data"
--#~ msgstr "Dữ liá»u Jetdirect (JETDIRECT)"
--
++#~ "Hãy chá»n Thiết bá» Máy in từ danh sách, hoặc nháºp thông qua « Tá»± chá»n » bên "
++#~ "dÆ°á»i."
+
+ #~ msgid "Jetdirect (JETDIRECT) Data"
+ #~ msgstr "Dữ liá»u Jetdirect (JETDIRECT)"
+
-#~ msgid "You must specify the ip address of a JetDirect printer."
-#~ msgstr "Bạn phải nháºp Äá»a chá» IP của Máy in JetDirect."
-
@@ -2894,9 +3043,6 @@
-#~ msgid "Done"
-#~ msgstr "Xong"
-
--#~ msgid "Name:"
--#~ msgstr "Tên:"
--
-#~ msgid "Aliases:"
-#~ msgstr "BÃ danh:"
-
@@ -2930,9 +3076,9 @@
-#~ msgid "You must select an alias to delete."
-#~ msgstr "Bạn phải chá»n bà danh cần xóa."
-
--#~ msgid "Strict RFC1179"
--#~ msgstr "RFC1179 chặt"
--
+ #~ msgid "Strict RFC1179"
+ #~ msgstr "RFC1179 chặt"
+
-#~ msgid "Translate \\n->\\r\\n"
-#~ msgstr "Dá»ch \\n->\\r\\n"
-
@@ -2951,7 +3097,7 @@
-#~ msgid "Value must be a number"
-#~ msgstr "Giá trỠphải là sỠnguyên"
-
--#~ msgid "Float: Min %s | Max %s"
+ #~ msgid "Float: Min %s | Max %s"
-#~ msgstr "Sá» thá»±c: Min %s | Max %s"
-
-#~ msgid "A4"
@@ -2971,14 +3117,14 @@
-
-#~ msgid "Test %s"
-#~ msgstr "Thá» %s"
--
--#~ msgid ""
--#~ "You have made changes, would you like to save them?\n"
--#~ "If you say no, you will not be able to print test pages."
--#~ msgstr ""
--#~ "Bạn Äã thá»±c hiá»n các thay Äá»i, bạn có muá»n lÆ°u chúng lại không?\n"
--#~ "Nếu bạn nói không, bạn sẽ không thá» in trang thá»."
--
++#~ msgstr "Sá» thá»±c: Tiá»u %s | Äại %s"
+
+ #~ msgid ""
+ #~ "You have made changes, would you like to save them?\n"
+@@ -2676,199 +2444,36 @@
+ #~ "Bạn Äã thá»±c hiá»n các thay Äá»i, bạn có muá»n lÆ°u chúng lại không?\n"
+ #~ "Nếu bạn nói không, bạn sẽ không thá» in trang thá»."
+
-#~ msgid "Sent %s to \"%s\"."
-#~ msgstr "Äã gá»i %s Äến \"%s\"."
-
@@ -2991,9 +3137,6 @@
-#~ msgid "Confirm Delete"
-#~ msgstr "Xác nháºn Xóa"
-
--#~ msgid "Aliases"
--#~ msgstr "BÃ danh"
--
-#~ msgid "New"
-#~ msgstr "Má»i"
-
@@ -3003,11 +3146,11 @@
-#~ msgid "You must select a printer queue to edit."
-#~ msgstr "Bạn phải chá»n hà ng Äợi máy in cần hiá»u chá»nh."
-
--#~ msgid ""
--#~ "This imported printer is protected from overrides. You can not edit it."
--#~ msgstr ""
--#~ "Máy in nháºp Äược bảo vá» không bá» ghi Äè. Bạn không thá» hiá»u chá»nh nó."
--
+ #~ msgid ""
+ #~ "This imported printer is protected from overrides. You can not edit it."
+ #~ msgstr ""
+ #~ "Máy in nháºp Äược bảo vá» không bá» ghi Äè. Bạn không thá» hiá»u chá»nh nó."
+
-#~ msgid "Override?"
-#~ msgstr "Ghi Äè chứ?"
-
@@ -3029,13 +3172,13 @@
-#~ msgid "add-local: queue name '%s' not unique\n"
-#~ msgstr "add-local: tên hà ng Äợi '%s' không phải là duy nhất\n"
-
--#~ msgid "add-local: no suitable name available\n"
--#~ msgstr "add-local: không có tên thÃch hợp\n"
--
+ #~ msgid "add-local: no suitable name available\n"
+ #~ msgstr "add-local: không có tên thÃch hợp\n"
+
-#~ msgid "add-local: No information available about %s %s\n"
-#~ msgstr "add-local: Không có thông tin vỠ%s %s\n"
-
--#~ msgid "Now run printconf-backend (or restart lpd service)."
+ #~ msgid "Now run printconf-backend (or restart lpd service)."
-#~ msgstr "Bây giá» chạy printconf-backend (hoặc khá»i Äá»ng lại dá»ch vụ lpd)."
-
-#~ msgid "You must run printconf-tui as root."
@@ -3052,17 +3195,14 @@
-
-#~ msgid "Queue name"
-#~ msgstr "Tên hà ng Äợi"
-+msgstr "Chá»n máy in mặc Äá»nh"
-
+-
-#~ msgid ""
-#~ "Do you want to save the changes\n"
-#~ "you made to your printer configuration?"
-#~ msgstr ""
-#~ "Bạn có muá»n lÆ°u các thay Äá»i không bạn\n"
-#~ "Äã tạo ra trong cấu hình máy in không?"
-+msgid "smb://"
-+msgstr "smb://"
-
+-
-#~ msgid "_Don't save"
-#~ msgstr "_Không lưu"
-
@@ -3078,8 +3218,9 @@
-#~ msgstr ""
-#~ "Äang nạp thông tin máy in.\n"
-#~ "Vui lòng chá»..."
--
--#~ msgid "Notes from the Linux Printing Database"
++#~ msgstr "Bây giá» chạy printconf-backend (hoặc khá»i chạy lại dá»ch vụ lpd)."
+
+ #~ msgid "Notes from the Linux Printing Database"
-#~ msgstr "Ghi chút từ CÆ¡ sá» Dữ liá»u In Linux"
-
-#~ msgid "Driver notes:"
@@ -3087,12 +3228,13 @@
-
-#~ msgid "Generic (click to select manufacturer)"
-#~ msgstr "ThÆ°á»ng (nhấn Äá» chá»n nhà sản xuất)"
--
--#~ msgid ""
--#~ "You are changing an option\n"
--#~ "that has no effect in the print\n"
--#~ "spooler you are using (%s)."
--#~ msgstr ""
++#~ msgstr "Ghi chú từ CÆ¡ sá» Dữ liá»u In Linux"
+
+ #~ msgid ""
+ #~ "You are changing an option\n"
+ #~ "that has no effect in the print\n"
+ #~ "spooler you are using (%s)."
+ #~ msgstr ""
-#~ "Bạn Äang thay Äá»i tùy chá»n không\n"
-#~ "có ảnh hÆ°á»ng Äến print spoller mà \n"
-#~ "bạn Äang dùng (%s)."
@@ -3106,16 +3248,17 @@
-
-#~ msgid "Failed to write queues."
-#~ msgstr "Lá»i ghi hà ng Äợi."
--
--#~ msgid ""
--#~ "Sent %s\n"
--#~ "to '%s' queue. Does it look okay?"
--#~ msgstr ""
--#~ "Äã gá»i %s\n"
++#~ "Bạn Äang thay Äá»i má»t tùy chá»n\n"
++#~ "không có ảnh hÆ°á»ng Äến\n"
++#~ "bá» cuá»n á»ng dẫn\n"
++#~ "mà bạn Äang dùng (%s)."
+
+ #~ msgid ""
+ #~ "Sent %s\n"
+ #~ "to '%s' queue. Does it look okay?"
+ #~ msgstr ""
+ #~ "Äã gá»i %s\n"
-#~ "Äến hà ng Äợi '%s'. Trông nó có á»n không?"
--
--#~ msgid "Here are the messages that appeared in the error log:"
--#~ msgstr "Äây là các thông Äiá»p xuất hiá»n trong error log:"
-
-#, fuzzy
-#~ msgid "'%s' does not look like a PPD file."
@@ -3181,30 +3324,33 @@
-
-#~ msgid "Port: "
-#~ msgstr "Cá»ng: "
--
--#~ msgid ""
--#~ "Would you like to print a test page?\n"
--#~ "Answering 'yes' will apply all changes\n"
--#~ "and print a test page to this printer."
--#~ msgstr ""
--#~ "Bạn có muá»n in thá» má»t trang không?\n"
++#~ "Äến hà ng Äợi « %s ». Trông nó có á»n không?"
+
+ #~ msgid ""
+ #~ "Would you like to print a test page?\n"
+@@ -2876,15 +2481,15 @@
+ #~ "and print a test page to this printer."
+ #~ msgstr ""
+ #~ "Bạn có muá»n in thá» má»t trang không?\n"
-#~ "Trả lá»i 'có' sẽ áp dụng các thay Äá»i\n"
--#~ "và in thá» má»t trang bằng máy in nà y."
--
--#~ msgid ""
--#~ "HH:MM:SS or '%s'.\n"
--#~ "Use GMT."
--#~ msgstr ""
++#~ "Trả lá»i « Có » sẽ áp dụng các thay Äá»i\n"
+ #~ "và in thá» má»t trang bằng máy in nà y."
+
+ #~ msgid ""
+ #~ "HH:MM:SS or '%s'.\n"
+ #~ "Use GMT."
+ #~ msgstr ""
-#~ "HH:MM:SS hoặc '%s'.\n"
-#~ "Dùng GMT."
--
--#~ msgid ""
--#~ "Number of document pages per\n"
--#~ "printed page: 1, 2, 4, 6, 9, or 16"
--#~ msgstr ""
--#~ "Sá» trang tà i liá»u má»i trang in:\n"
--#~ "1, 2, 4, 6, 9, hoặc 16"
--
++#~ "HH:MM:SS hoặc « %s ».\n"
++#~ "Dùng UTC (thá»i gian thế giá»i)."
+
+ #~ msgid ""
+ #~ "Number of document pages per\n"
+@@ -2893,18 +2498,6 @@
+ #~ "Sá» trang tà i liá»u má»i trang in:\n"
+ #~ "1, 2, 4, 6, 9, hoặc 16"
+
-#~ msgid "Top margin in pt (1/72 in)"
-#~ msgstr "LỠtrên theo pt (1/72 in)"
-
@@ -3217,13 +3363,13 @@
-#~ msgid "Bottom margin in pt (1/72 in)"
-#~ msgstr "Lá» dÆ°á»i theo pt (1/72 in)"
-
--#~ msgid ""
--#~ "'%s', '%s', '%s'\n"
--#~ "'%s' or '%s'"
--#~ msgstr ""
--#~ "'%s', '%s', '%s'\n"
--#~ "'%s' hoặc '%s'"
--
+ #~ msgid ""
+ #~ "'%s', '%s', '%s'\n"
+ #~ "'%s' or '%s'"
+@@ -2912,234 +2505,61 @@
+ #~ "'%s', '%s', '%s'\n"
+ #~ "'%s' hoặc '%s'"
+
-#~ msgid "Scaling (percentage)"
-#~ msgstr "Co dãn (phần trÄm)"
-
@@ -3236,10 +3382,10 @@
-#~ msgid "Value"
-#~ msgstr "Giá trá»"
-
--#~ msgid "Can't determine the printer model attached to this device."
--#~ msgstr "Không thá» xác Äá»nh kiá»u máy in gắn vá»i thiết bá» nà y."
--
--#~ msgid "I don't know enough about this printer model to choose a driver."
+ #~ msgid "Can't determine the printer model attached to this device."
+ #~ msgstr "Không thá» xác Äá»nh kiá»u máy in gắn vá»i thiết bá» nà y."
+
+ #~ msgid "I don't know enough about this printer model to choose a driver."
-#~ msgstr "Tôi không biết nên chá»n driver nà o cho kiá»u máy in nà y."
-
-#~ msgid "Add queue option"
@@ -3248,23 +3394,23 @@
-#~ msgid "Invalid option name"
-#~ msgstr "Tên tùy chá»n không hợp lá»"
-
--#~ msgid "Invalid value"
--#~ msgstr "Giá trá» không hợp lá»"
--
-#~ msgid "Value for this option"
-#~ msgstr "Giá trá» của tùy chá»n nà y"
--
--#~ msgid ""
--#~ "(this is the\n"
--#~ "recommended driver)"
--#~ msgstr ""
++#~ msgstr "Tôi không biết nên chá»n trình Äiá»u khiá»n nà o cho kiá»u máy in nà y."
+
+ #~ msgid ""
+ #~ "(this is the\n"
+ #~ "recommended driver)"
+ #~ msgstr ""
-#~ "(Äây là driver\n"
-#~ "khyên dùng)"
--
--#~ msgid ""
--#~ "This driver requires Hewlett Packard's hpijs driver (available in the "
--#~ "hpijs package) which does not appear to be installed."
--#~ msgstr ""
++#~ "(Äây là trình Äiá»u khiá»n\n"
++#~ "khuyên dùng)"
+
+ #~ msgid ""
+ #~ "This driver requires Hewlett Packard's hpijs driver (available in the "
+ #~ "hpijs package) which does not appear to be installed."
+ #~ msgstr ""
-#~ "Driver nà y cần Driver hpijs của Hewlett Parkard (trong gói hpijs), mà có "
-#~ "vẻ chÆ°a Äược cà i Äặt."
-
@@ -3272,11 +3418,13 @@
-#~ "This driver requires the Omni Print Driver System, which does not appear "
-#~ "to be installed."
-#~ msgstr "Driver nà y cần Há» thá»ng Driver In Omni, mà có vẻ chÆ°a Äược cà i Äặt."
--
--#~ msgid ""
--#~ "This driver requires the oki4drv daemon to be running, and it does not "
--#~ "appear to be."
--#~ msgstr ""
++#~ "Trình Äiá»u khiá»n nà y cần trình Äiá»u khiá»n hpijs của Hewlett Packard "
++#~ "(trong gói hpijs), mà có vẻ chÆ°a Äược cà i Äặt."
+
+ #~ msgid ""
+ #~ "This driver requires the oki4drv daemon to be running, and it does not "
+ #~ "appear to be."
+ #~ msgstr ""
-#~ "Driver nà y cần daemon oki4drv hoạt Äá»ng, nhÆ°ng có vẽ daemon nà y chÆ°a hoạt "
-#~ "Äá»ng."
-
@@ -3298,22 +3446,19 @@
-#~ msgstr ""
-#~ "Hà ng Äợi in SMB cần chÆ°Æ¡ng trình \"smbclient\", mà có lẽ chÆ°a Äược cà i "
-#~ "Äặt."
--
--#~ msgid ""
--#~ "It is part of the \"samba-client\" package, as distributed by Red Hat."
--#~ msgstr ""
++#~ "Trình Äiá»u khiá»n nà y cần trình ná»n (daemon) oki4drv hoạt Äá»ng, nhÆ°ng có "
++#~ "vẽ trình ná»n nà y chÆ°a khá»i chạy."
+
+ #~ msgid ""
+ #~ "It is part of the \"samba-client\" package, as distributed by Red Hat."
+ #~ msgstr ""
-#~ "Äây là thà nh phần của gói \"samba-client\", Äược phân phá»i bá»i Red Hat."
-
-#~ msgid "Novell Print Queue"
-#~ msgstr "Hà ng Äợi in Novell"
--
--#~ msgid ""
--#~ "NCP print queues require the \"nprint\" program, which does not appear to "
--#~ "be installed."
--#~ msgstr ""
--#~ "Hà ng Äợi in NCP cần chÆ°Æ¡ng trình \"nprint\", mà có lẽ chÆ°a Äược cà i Äặt."
--
--#~ msgid "It is part of the \"ncpfs\" package, as distributed by Red Hat."
++#~ "Äây là thà nh phần của gói « samba-client », Äược phân phá»i bá»i Red Hat."
+
+ #~ msgid "It is part of the \"ncpfs\" package, as distributed by Red Hat."
-#~ msgstr "Äây là thà nh phần của gói \"ncpfs\", Äược phân phá»i bá»i Red Hat."
-
-#~ msgid "Custom Command"
@@ -3325,16 +3470,15 @@
-#~ msgid "Text Only Printer"
-#~ msgstr "Máy chá» in vÄn bản"
-
--#~ msgid "Raw Print Queue"
--#~ msgstr "Hà ng Äợi in thô"
--
-#~ msgid "Custom Filter"
-#~ msgstr "Bá» lá»c tá»± chá»n"
--
--#~ msgid "Send Form-Feed (FF)"
++#~ msgstr "Äây là thà nh phần của gói « ncpfs », Äược phân phá»i bá»i Red Hat."
+
+ #~ msgid "Send Form-Feed (FF)"
-#~ msgstr "Gá»i Form-Feed (FF)"
--
--#~ msgid "Send End-of-Transmission (EOT)"
++#~ msgstr "Gá»i Nạp giấy (FF)"
+
+ #~ msgid "Send End-of-Transmission (EOT)"
-#~ msgstr "Gá»i End-of-Transmission (EOT)"
-
-#~ msgid "Convert Text to Postscript"
@@ -3407,20 +3551,22 @@
-
-#~ msgid "Add an allowed host"
-#~ msgstr "Thêm máy Äược phép"
--
--#~ msgid "Add/edit queue option"
--#~ msgstr "Thêm/Sá»a tùy chá»n hà ng Äợi"
--
++#~ msgstr "Gá»i Kết thúc truyá»n (EOT)"
+
+ #~ msgid "Add/edit queue option"
+ #~ msgstr "Thêm/Sá»a tùy chá»n hà ng Äợi"
+
-#~ msgid "Allowed hosts"
-#~ msgstr "Máy Äược phép"
-
-#~ msgid "Apply changes"
-#~ msgstr "Ãp dụng các thay Äá»i"
-
--#~ msgid "At end of job:"
+ #~ msgid "At end of job:"
-#~ msgstr "Kết thúc công viá»c:"
--
--#~ msgid "At start of job:"
++#~ msgstr "Khi kết thúc công viá»c:"
+
+ #~ msgid "At start of job:"
-#~ msgstr "Bắt Äầu công viá»c:"
-
-#~ msgid "Autoselect driver"
@@ -3437,8 +3583,9 @@
-
-#~ msgid "Choose the type of queue you want to use"
-#~ msgstr "Chá»n loại hà ng Äợi muá»n dùng"
--
--#~ msgid "Choose which other computers may use this queue."
++#~ msgstr "Khi bắt Äầu công viá»c:"
+
+ #~ msgid "Choose which other computers may use this queue."
-#~ msgstr "Chá»n máy nà o khác dùng hà ng Äợi nà y."
-
-#~ msgid "Edit the selected queue"
@@ -3446,8 +3593,9 @@
-
-#~ msgid "Edit this host"
-#~ msgstr "Hiá»u chá»nh máy nà y"
--
--#~ msgid "Edit this option"
++#~ msgstr "Chá»n máy nà o khác có quyá»n dùng hà ng Äợi nà y."
+
+ #~ msgid "Edit this option"
-#~ msgstr "Hiá»u chá»nh tùy chá»n nà y"
-
-#~ msgid "Enable _LPD protocol"
@@ -3464,23 +3612,20 @@
-
-#~ msgid "Generic"
-#~ msgstr "ThÆ°á»ng"
--
--#~ msgid "IP port number (often 9100)"
--#~ msgstr "Sá» hiá»u cá»ng IP (thÆ°á»ng là 9100)"
--
--#~ msgid ""
--#~ "If you like, you can enter a description of the printer to help you "
--#~ "identify it more easily."
--#~ msgstr ""
--#~ "Nếu bạn thÃch, bạn có thá» nháºp mô tả máy in Äá» giúp bạn tìm ra máy in dá»
"
--#~ "dà ng hơn."
--
++#~ msgstr "Sá»a tùy chá»n nà y"
+
+ #~ msgid "IP port number (often 9100)"
+ #~ msgstr "Sá» hiá»u cá»ng IP (thÆ°á»ng là 9100)"
+@@ -3151,109 +2571,28 @@
+ #~ "Nếu bạn thÃch, bạn có thá» nháºp mô tả máy in Äá» giúp bạn tìm ra máy in dá»
"
+ #~ "dà ng hơn."
+
-#~ msgid "Imageable Area"
-#~ msgstr "Vùng ảnh"
-
--#~ msgid "JPE_G test"
--#~ msgstr "Thá» JPE_G"
--
+ #~ msgid "JPE_G test"
+ #~ msgstr "Thá» JPE_G"
+
-#~ msgid "Japanese EUC PostScript test page"
-#~ msgstr "Trang vÄn bản thá» EUC tiếng Nháºt"
-
@@ -3493,10 +3638,11 @@
-#~ msgid "Japanese _EUC text test page"
-#~ msgstr "Trang vÄn bản thá» _EUC tiếng Nháºt"
-
--#~ msgid "Japanese _JIS text test page"
+ #~ msgid "Japanese _JIS text test page"
-#~ msgstr "Trang vÄn bản thá» _JIS tiếng Nháºt"
--
--#~ msgid "Japanese _SJIS text test page"
++#~ msgstr "Trang thá» vÄn bản _JIS tiếng Nháºt"
+
+ #~ msgid "Japanese _SJIS text test page"
-#~ msgstr "Trang vÄn bản thá» _SJIS tiếng Nháºt"
-
-#~ msgid "Network _devices"
@@ -3522,11 +3668,12 @@
-
-#~ msgid "Patience"
-#~ msgstr "Kiên nhẫn"
--
--#~ msgid ""
--#~ "Please enter a name for this queue. Choose a short name that begins with "
--#~ "a letter and contains no spaces."
--#~ msgstr ""
++#~ msgstr "Trang thá» vÄn bản _SJIS tiếng Nháºt"
+
+ #~ msgid ""
+ #~ "Please enter a name for this queue. Choose a short name that begins with "
+ #~ "a letter and contains no spaces."
+ #~ msgstr ""
-#~ "Vui lòng nháºp tên cho hà ng Äợi nà y. Hãy chá»n tên ngắn bắt Äầu bằng ký tá»± "
-#~ "và không chứa khoảng trắng."
-
@@ -3553,285 +3700,129 @@
-
-#~ msgid "Select a queue type:"
-#~ msgstr "Chá»n kiá»u hà ng Äợi:"
--
--#~ msgid "Select the appropriate printer manufacturer and model."
--#~ msgstr "Chá»n nhà sản xuất và kiá»u máy in thÃch hợp."
-+msgid ""
-+"The name \"%s\" is bad. Please choose a name of the form [a-zA-Z][a-zA-Z0-"
-+"9_-]*."
-+msgstr ""
-+"Tên « %s » không tá»t. Hãy chá»n tên theo mẫu [a-zA-Z][a-zA-Z0-9_-]*."
++#~ "Hãy nháºp tên cho hà ng Äợi nà y. Chá»n tên ngắn bắt Äầu bằng ký tá»± và không "
++#~ "chứa khoảng trắng."
+
+ #~ msgid "Select the appropriate printer manufacturer and model."
+ #~ msgstr "Chá»n nhà sản xuất và kiá»u máy in thÃch hợp."
-#~ msgid "Set as de_fault"
-#~ msgstr "Äặt là m _mặc Äá»nh"
-+msgid ""
-+"Pick the printer device from the list, or enter it using \"Custom\" below."
-+msgstr ""
-+"Hãy chá»n Thiết bá» Máy in từ danh sách, hoặc nháºp thông qua « Tá»± chá»n » bên dÆ°á»i."
-
+-
-#~ msgid "Set as default queue"
-#~ msgstr "Äặt là m hà ng Äợi mặc Äá»nh"
-+msgid "Jetdirect (JETDIRECT) Data"
-+msgstr "Dữ liá»u Jetdirect (JETDIRECT)"
-
+-
-#~ msgid "Short description:"
-#~ msgstr "Mô tả ngắn:"
-+msgid "Strict RFC1179"
-+msgstr "RFC1179 chặt"
-
+-
-#~ msgid "Short description: "
-#~ msgstr "Mô tả ngắn: "
-+msgid "Float: Min %s | Max %s"
-+msgstr "Sá» thá»±c: Tiá»u %s | Äại %s"
-
+-
-#~ msgid "Single _IP address"
-#~ msgstr "Äá»a chá» _IP ÄÆ¡n"
-+msgid ""
-+"You have made changes, would you like to save them?\n"
-+"If you say no, you will not be able to print test pages."
-+msgstr ""
-+"Bạn Äã thá»±c hiá»n các thay Äá»i, bạn có muá»n lÆ°u chúng lại không?\n"
-+"Nếu bạn nói không, bạn sẽ không thá» in trang thá»."
-
--#~ msgid "Strict RFC1179 compliance"
--#~ msgstr "TÆ°Æ¡ng thÃch chặt RFC1179"
-+msgid "This imported printer is protected from overrides. You can not edit it."
-+msgstr "Máy in nháºp Äược bảo vá» không bá» ghi Äè. Bạn không thá» hiá»u chá»nh nó."
+-
+ #~ msgid "Strict RFC1179 compliance"
+ #~ msgstr "TÆ°Æ¡ng thÃch chặt RFC1179"
-#~ msgid "These settings are system-wide."
-#~ msgstr "Äây là những thiết láºp mức há» thá»ng."
-+msgid "add-local: no suitable name available\n"
-+msgstr "add-local: không có tên thÃch hợp\n"
-
--#~ msgid "This allows older systems to print to this machine"
--#~ msgstr "Cho phép há» thá»ng cÅ© in bằng máy nà y"
-+msgid "Now run printconf-backend (or restart lpd service)."
-+msgstr "Bây giá» chạy printconf-backend (hoặc khá»i chạy lại dá»ch vụ lpd)."
-
--#~ msgid "This enables CUPS IPP browsing"
--#~ msgstr "Cho phép duyá»t CUPS IPP"
-+msgid "Notes from the Linux Printing Database"
-+msgstr "Ghi chú từ CÆ¡ sá» Dữ liá»u In Linux"
-
--#~ msgid ""
--#~ "This is the name of the queue. It must begin with a letter and contain "
--#~ "no spaces."
--#~ msgstr ""
--#~ "Äây là tên của hà ng Äợi. Nó phải bắt Äầu bằng má»t ký tá»± và không chứa "
--#~ "khoảng trắng."
-+msgid ""
-+"You are changing an option\n"
-+"that has no effect in the print\n"
-+"spooler you are using (%s)."
-+msgstr ""
-+"Bạn Äang thay Äá»i má»t tùy chá»n\n"
-+"không có ảnh hÆ°á»ng Äến\n"
-+"bá» cuá»n á»ng dẫn\n"
-+"mà bạn Äang dùng (%s)."
+-
+ #~ msgid "This allows older systems to print to this machine"
+ #~ msgstr "Cho phép há» thá»ng cÅ© in bằng máy nà y"
+
+@@ -3267,95 +2606,8 @@
+ #~ "Äây là tên của hà ng Äợi. Nó phải bắt Äầu bằng má»t ký tá»± và không chứa "
+ #~ "khoảng trắng."
-#~ msgid "Type in an IP address"
-#~ msgstr "Nháºp và o Äá»a chá» IP"
-+msgid ""
-+"Sent %s\n"
-+"to '%s' queue. Does it look okay?"
-+msgstr ""
-+"Äã gá»i %s\n"
-+"Äến hà ng Äợi « %s ». Trông nó có á»n không?"
-
--#~ msgid "Type in the netmask, or the CIDR mask length"
--#~ msgstr "Nháºp và o mặt nạ mạng, hoặc Äá» dà i mặt nạ CIDR"
-+msgid "Here are the messages that appeared in the error log:"
-+msgstr "Äây là các thông Äiá»p xuất hiá»n trong bản ghi lá»i:"
-
--#~ msgid "Type in the share name"
--#~ msgstr "Nháºp và o Tên Chia sẻ"
-+msgid ""
-+"Would you like to print a test page?\n"
-+"Answering 'yes' will apply all changes\n"
-+"and print a test page to this printer."
-+msgstr ""
-+"Bạn có muá»n in thá» má»t trang không?\n"
-+"Trả lá»i « Có » sẽ áp dụng các thay Äá»i\n"
-+"và in thá» má»t trang bằng máy in nà y."
-
+-
+ #~ msgid "Type in the netmask, or the CIDR mask length"
+ #~ msgstr "Nháºp và o mặt nạ mạng, hoặc Äá» dà i mặt nạ CIDR"
+
+ #~ msgid "Type in the share name"
+ #~ msgstr "Nháºp và o Tên Chia sẻ"
+-
-#~ msgid "Use control-F to search"
-#~ msgstr "Dùng Control-F Äá» tìm"
-+msgid ""
-+"HH:MM:SS or '%s'.\n"
-+"Use GMT."
-+msgstr ""
-+"HH:MM:SS hoặc « %s ».\n"
-+"Dùng UTC (thá»i gian thế giá»i)."
-
+-
-#~ msgid "_A4 PostScript test page"
-#~ msgstr "Trang thá» Postscript _A4"
-+msgid ""
-+"Number of document pages per\n"
-+"printed page: 1, 2, 4, 6, 9, or 16"
-+msgstr ""
-+"Sá» trang tà i liá»u má»i trang in:\n"
-+"1, 2, 4, 6, 9, hoặc 16"
-
+-
-#~ msgid "_Add..."
-#~ msgstr "_Thêm..."
-+msgid ""
-+"'%s', '%s', '%s'\n"
-+"'%s' or '%s'"
-+msgstr ""
-+"'%s', '%s', '%s'\n"
-+"'%s' hoặc '%s'"
-
+-
-#~ msgid "_All hosts"
-#~ msgstr "_Má»i máy"
-+msgid "Can't determine the printer model attached to this device."
-+msgstr "Không thá» xác Äá»nh kiá»u máy in gắn vá»i thiết bá» nà y."
-
+-
-#~ msgid "_Apply"
-#~ msgstr "_Ãp dụng"
-+msgid "I don't know enough about this printer model to choose a driver."
-+msgstr "Tôi không biết nên chá»n trình Äiá»u khiá»n nà o cho kiá»u máy in nà y."
-
+-
-#~ msgid "_Automatically find remote shared queues"
-#~ msgstr "_Tá»± Äá»ng tìm hà ng Äợi chia sẻ từ xa"
-+msgid ""
-+"(this is the\n"
-+"recommended driver)"
-+msgstr ""
-+"(Äây là trình Äiá»u khiá»n\n"
-+"khuyên dùng)"
-
+-
-#~ msgid "_Big5 text test page"
-#~ msgstr "Trang vÄn bản thá» _Big5"
-+msgid ""
-+"This driver requires Hewlett Packard's hpijs driver (available in the hpijs "
-+"package) which does not appear to be installed."
-+msgstr ""
-+"Trình Äiá»u khiá»n nà y cần trình Äiá»u khiá»n hpijs của Hewlett Packard (trong gói hpijs), mà có vẻ chÆ°a Äược cà i Äặt."
-
+-
-#~ msgid "_CUPS test page"
-#~ msgstr "Trang thá» _CUPS"
-+msgid ""
-+"This driver requires the oki4drv daemon to be running, and it does not "
-+"appear to be."
-+msgstr ""
-+"Trình Äiá»u khiá»n nà y cần trình ná»n (daemon) oki4drv hoạt Äá»ng, nhÆ°ng có vẽ trình ná»n nà y chÆ°a khá»i chạy."
-
+-
-#~ msgid "_Contents"
-#~ msgstr "_Ná»i dung"
-+msgid "It is part of the \"samba-client\" package, as distributed by Red Hat."
-+msgstr ""
-+"Äây là thà nh phần của gói « samba-client », Äược phân phá»i bá»i Red Hat."
-
+-
-#~ msgid "_Custom device"
-#~ msgstr "Thiết bá» tá»± _chá»n"
-+msgid "It is part of the \"ncpfs\" package, as distributed by Red Hat."
-+msgstr "Äây là thà nh phần của gói « ncpfs », Äược phân phá»i bá»i Red Hat."
-
+-
-#~ msgid "_Delete queue"
-#~ msgstr "_Xóa hà ng Äợi"
-+msgid "Send Form-Feed (FF)"
-+msgstr "Gá»i Nạp giấy (FF)"
-
+-
-#~ msgid "_Edit queue"
-#~ msgstr "_Sá»a hà ng Äợi"
-+msgid "Send End-of-Transmission (EOT)"
-+msgstr "Gá»i Kết thúc truyá»n (EOT)"
-
+-
-#~ msgid "_Edit..."
-#~ msgstr "_Hiá»u chá»nh..."
-+msgid "Add/edit queue option"
-+msgstr "Thêm/Sá»a tùy chá»n hà ng Äợi"
-
+-
-#~ msgid "_Network address"
-#~ msgstr "Äá»_a chá» mạng"
-+msgid "At end of job:"
-+msgstr "Khi kết thúc công viá»c:"
-
+-
-#~ msgid "_Notes..."
-#~ msgstr "_Ghi chú..."
-+msgid "At start of job:"
-+msgstr "Khi bắt Äầu công viá»c:"
-
--#~ msgid "_Remove"
--#~ msgstr "_Loại bá»"
-+msgid "Choose which other computers may use this queue."
-+msgstr "Chá»n máy nà o khác có quyá»n dùng hà ng Äợi nà y."
-
+-
-#~ msgid "_Rescan devices"
-#~ msgstr "_Quét lại thiết bá»"
-+msgid "Edit this option"
-+msgstr "Sá»a tùy chá»n nà y"
-
--#~ msgid "_Test"
--#~ msgstr "_Thá»"
-+msgid "IP port number (often 9100)"
-+msgstr "Sá» hiá»u cá»ng IP (thÆ°á»ng là 9100)"
-
+-
-#~ msgid "_This queue is available to other computers"
-#~ msgstr "_Hà ng Äợi nà y sẵn sà ng cho các máy tÃnh khác"
-+msgid ""
-+"If you like, you can enter a description of the printer to help you identify "
-+"it more easily."
-+msgstr ""
-+"Nếu bạn thÃch, bạn có thá» nháºp mô tả máy in Äá» giúp bạn tìm ra máy in dá»
dà ng hơn."
-
+-
-#~ msgid "_classified"
-#~ msgstr "_Äã phân loại"
-+msgid "JPE_G test"
-+msgstr "Thá» JPE_G"
-
+-
-#~ msgid "_none"
-#~ msgstr "_không"
-+msgid "Japanese _JIS text test page"
-+msgstr "Trang thá» vÄn bản _JIS tiếng Nháºt"
-
+-
-#~ msgid "_secret"
-#~ msgstr "_bà máºt"
-+msgid "Japanese _SJIS text test page"
-+msgstr "Trang thá» vÄn bản _SJIS tiếng Nháºt"
-
+-
-#~ msgid "_standard"
-#~ msgstr "_chuẩn"
-+msgid ""
-+"Please enter a name for this queue. Choose a short name that begins with a "
-+"letter and contains no spaces."
-+msgstr ""
-+"Hãy nháºp tên cho hà ng Äợi nà y. Chá»n tên ngắn bắt Äầu bằng ký tá»± và không chứa khoảng trắng."
-
+-
-#~ msgid "_topsecret"
-#~ msgstr "_tuyá»t máºt"
-+msgid "Select the appropriate printer manufacturer and model."
-+msgstr "Chá»n nhà sản xuất và kiá»u máy in thÃch hợp."
-
+-
-#~ msgid "_unclassified"
-#~ msgstr "_không phân loại"
-+msgid "Strict RFC1179 compliance"
-+msgstr "TÆ°Æ¡ng thÃch chặt RFC1179"
-
+-
-#~ msgid "c_onfidential"
-#~ msgstr "_tin tÆ°á»ng"
-+msgid "This allows older systems to print to this machine"
-+msgstr "Cho phép há» thá»ng cÅ© in bằng máy nà y"
-
+-
-#~ msgid "ipp"
-#~ msgstr "ipp"
-+msgid "This enables CUPS IPP browsing"
-+msgstr "Cho phép duyá»t CUPS IPP"
-
+-
-#~ msgid "jetdirect"
-#~ msgstr "jetdirect"
-+msgid ""
-+"This is the name of the queue. It must begin with a letter and contain no "
-+"spaces."
-+msgstr ""
-+"Äây là tên của hà ng Äợi. Nó phải bắt Äầu bằng má»t ký tá»± và không chứa khoảng trắng."
-
+-
-#~ msgid "lpd"
-#~ msgstr "lpd"
-+msgid "Type in the netmask, or the CIDR mask length"
-+msgstr "Nháºp và o mặt nạ mạng, hoặc Äá» dà i mặt nạ CIDR"
-
+-
-#~ msgid "ncp"
-#~ msgstr "ncp"
-+msgid "Type in the share name"
-+msgstr "Nháºp và o Tên Chia sẻ"
Modified: packages/experimental/system-config-printer/debian/patches/06_ru_po.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/system-config-printer/debian/patches/06_ru_po.patch?rev=16199&op=diff
==============================================================================
--- packages/experimental/system-config-printer/debian/patches/06_ru_po.patch (original)
+++ packages/experimental/system-config-printer/debian/patches/06_ru_po.patch Sun Jun 8 12:52:40 2008
@@ -1,6 +1,6 @@
---- po/ru.po.orig 2008-02-13 19:13:17.000000000 +0100
-+++ po/ru.po 2008-04-21 18:30:39.913539846 +0200
-@@ -1,23 +1,25 @@
+--- po/ru.po.orig 2008-06-08 12:58:14.441784082 +0200
++++ po/ru.po 2008-06-08 13:00:20.353280515 +0200
+@@ -1,23 +1,26 @@
-# translation of ru.po to
-# translation of ru.po to Russian
+# translation of ru.po to
@@ -16,10 +16,11 @@
-"Project-Id-Version: ru\n"
+"Project-Id-Version: 0.7.81-2\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/bugzilla\n"
- "POT-Creation-Date: 2008-02-13 18:13+0000\n"
+-"POT-Creation-Date: 2008-05-27 18:07+0100\n"
-"PO-Revision-Date: 2007-04-12 00:21+0300\n"
-"Last-Translator: \n"
-"Language-Team: \n"
++"POT-Creation-Date: 2008-06-08 12:49+0200\n"
+"PO-Revision-Date: 2008-02-17 22:31+0300\n"
+"Last-Translator: Yuri Kozlov <kozlov.y at gmail.com>\n"
+"Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
@@ -29,37 +30,91 @@
-"X-Generator: KBabel 1.9.1\n"
+"X-Generator: KBabel 1.11.4\n"
"X-Poedit-Language: Russian\n"
-+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-
- #: ../cupshelpers.py:33
++"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
++"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+ #: ../authconn.py:30 ../system-config-printer.glade.h:249
+ msgid "Username:"
+@@ -33,9 +36,8 @@
+ msgstr "ÐеÑÑ
нее поле:"
+
+ #: ../authconn.py:34
+-#, fuzzy
+ msgid "Authentication"
+-msgstr "<b>ÐÑовеÑка подлинноÑÑи</b>"
++msgstr "ÐÑовеÑка подлинноÑÑи"
+
+ #: ../cupshelpers.py:28
msgid "Idle"
-@@ -43,19 +45,16 @@
- msgstr "ÐеизвеÑÑно"
-
- #: ../my-default-printer.py:136 ../my-default-printer.desktop.in.h:1
+@@ -115,7 +117,7 @@
+
+ #: ../errordialogs.py:88 ../system-config-printer.py:662
+ msgid "Not connected"
+-msgstr "Ðе подклÑÑен"
++msgstr "Ðе подклÑÑÑн"
+
+ #: ../errordialogs.py:90
+ #, python-format
+@@ -156,7 +158,7 @@
+
+ #: ../jobviewer.py:95 ../troubleshoot/PrintTestPage.py:83
+ msgid "Status"
+-msgstr "СÑаÑÑÑ"
++msgstr "СоÑÑоÑние"
+
+ #: ../jobviewer.py:125
+ #, python-format
+@@ -168,8 +170,9 @@
+ msgstr ""
+
+ #: ../jobviewer.py:132
++#, fuzzy
+ msgid "all jobs"
+-msgstr ""
++msgstr "ÐÑмениÑÑ Ð²Ñе заданиÑ"
+
+ #: ../jobviewer.py:133
+ #, fuzzy, python-format
+@@ -258,7 +261,7 @@
+ #: ../jobviewer.py:869
+ #, fuzzy, python-format
+ msgid "There was a problem sending document `%s' (job %d) to the printer."
+-msgstr "ÐÑибка подклÑÑÐµÐ½Ð¸Ñ Ðº кÑеÑвеÑÑ CUPS."
++msgstr "ÐÑибка подклÑÑÐµÐ½Ð¸Ñ Ðº ÑеÑвеÑÑ CUPS."
+
+ #: ../jobviewer.py:872
+ #, python-format
+@@ -281,31 +284,27 @@
+ msgstr ""
+
+ #: ../jobviewer.py:903
+-#, python-format
++#, fuzzy, python-format
+ msgid "The printer called `%s' has been disabled."
+-msgstr ""
++msgstr "ÐÑеÑÐµÐ´Ñ `%s' не акÑивиÑована."
+
+ #: ../my-default-printer.py:141 ../my-default-printer.desktop.in.h:1
-#, fuzzy
msgid "Default Printer"
-msgstr "СделаÑÑ Ð¿ÑинÑеÑом по ÑмолÑаниÑ"
+msgstr "ÐÑинÑÐµÑ Ð¿Ð¾ ÑмолÑаниÑ"
- #: ../my-default-printer.py:140 ../my-default-printer.py:171
+ #: ../my-default-printer.py:145 ../my-default-printer.py:181
-#, fuzzy
msgid "_Use System Default"
-msgstr "УÑÑановиÑÑ Ð¿Ð¾ ÑмолÑаниÑ"
+msgstr "ÐÑполÑзоваÑÑ ÑиÑÑемнÑй по ÑмолÑаниÑ"
- #: ../my-default-printer.py:141 ../my-default-printer.py:173
+ #: ../my-default-printer.py:146 ../my-default-printer.py:183
-#, fuzzy
msgid "_Set Default"
-msgstr "по ÑмолÑаниÑ"
+msgstr "Ðо ÑмолÑаниÑ"
- #: ../my-default-printer.py:151 ../troubleshoot.py:904 ../applet.py:186
- #: ../applet.py:226
-@@ -64,9 +63,8 @@
-
- #: ../my-default-printer.py:155 ../system-config-printer.py:2373
- #: ../troubleshoot.py:592 ../troubleshoot.py:1368
+ #: ../my-default-printer.py:162 ../system-config-printer.py:2430
+ #: ../troubleshoot/ChooseNetworkPrinter.py:37
+ #: ../troubleshoot/ChoosePrinter.py:38
-#, fuzzy
msgid "Location"
-msgstr "РазмеÑение:"
@@ -67,76 +122,75 @@
#: ../optionwidgets.py:116
msgid "Conflicts with:"
-@@ -98,11 +96,11 @@
-
- #: ../system-config-printer.py:373
+@@ -344,11 +343,11 @@
+
+ #: ../system-config-printer.py:352
msgid "Drivers"
-msgstr "ÐÑайвеÑа"
+msgstr "ÐÑайвеÑÑ"
- #: ../system-config-printer.py:374 ../system-config-printer.glade.h:107
+ #: ../system-config-printer.py:353 ../system-config-printer.glade.h:101
msgid "Downloadable Drivers"
-msgstr ""
+msgstr "ÐагÑÑжаемÑе дÑайвеÑÑ"
- #: ../system-config-printer.py:375
+ #: ../system-config-printer.py:354
msgid "Users"
-@@ -110,7 +108,7 @@
-
- #: ../system-config-printer.py:402
+@@ -356,12 +355,12 @@
+
+ #: ../system-config-printer.py:388
msgid "Automatic rotation"
-msgstr ""
+msgstr "ÐвÑомаÑиÑеÑкий повоÑоÑ"
- #: ../system-config-printer.py:556
+ #: ../system-config-printer.py:554
+ #, fuzzy, python-format
+ msgid "Printer Properties - `%s' on %s"
+-msgstr "ÐÑÑÐµÑ Ð¿ÑинÑеÑа"
++msgstr "ÐаÑамеÑÑÑ Ð¿ÑинÑеÑа"
+
+ #: ../system-config-printer.py:657
#, python-format
-@@ -120,11 +118,11 @@
- #: ../system-config-printer.py:559
+@@ -371,17 +370,17 @@
+ #: ../system-config-printer.py:660
#, python-format
msgid "Connected to %s"
-msgstr "ÐодклÑÑен к %s"
+msgstr "ÐодклÑÑÑн к %s"
- #: ../system-config-printer.py:561 ../system-config-printer.py:1273
- msgid "Not connected"
--msgstr "Ðе подклÑÑен"
-+msgstr "Ðе подклÑÑÑн"
-
- #: ../system-config-printer.py:672
- msgid "Local Printers"
-@@ -136,11 +134,11 @@
-
- #: ../system-config-printer.py:674
- msgid "Remote Printers"
+ #: ../system-config-printer.py:751
+ #, fuzzy
+ msgid "Remote class"
+-msgstr "УдаленнÑе клаÑÑÑ"
++msgstr "УдалÑннÑе клаÑÑÑ"
+
+ #: ../system-config-printer.py:753
+ #, fuzzy
+ msgid "Remote printer"
-msgstr "УдаленнÑе пÑинÑеÑÑ"
+msgstr "УдалÑннÑе пÑинÑеÑÑ"
- #: ../system-config-printer.py:675
- msgid "Remote Classes"
--msgstr "УдаленнÑе клаÑÑÑ"
-+msgstr "УдалÑннÑе клаÑÑÑ"
-
- #: ../system-config-printer.py:783
- #, python-format
-@@ -153,7 +151,7 @@
-
- #: ../system-config-printer.py:1202
+ #: ../system-config-printer.py:757
+ #, fuzzy
+@@ -404,7 +403,7 @@
+
+ #: ../system-config-printer.py:1190
msgid "Installable Options"
-msgstr "УÑÑанавливаемÑе возможноÑÑи"
+msgstr "УÑÑанавливаемÑе паÑамеÑÑÑ"
- #: ../system-config-printer.py:1203 ../system-config-printer.glade.h:209
+ #: ../system-config-printer.py:1191 ../system-config-printer.glade.h:198
msgid "Printer Options"
-@@ -228,7 +226,7 @@
-
- #: ../system-config-printer.py:1303
+@@ -422,7 +421,7 @@
+
+ #: ../system-config-printer.py:1239
msgid "This will delete this class!"
-msgstr "ÐÑо пÑÐ¸Ð²ÐµÐ´ÐµÑ Ðº ÑÐ´Ð°Ð»ÐµÐ½Ð¸Ñ ÐºÐ»Ð°ÑÑа!"
+msgstr "ÐÑо пÑиведÑÑ Ðº ÑÐ´Ð°Ð»ÐµÐ½Ð¸Ñ ÐºÐ»Ð°ÑÑа!"
- #: ../system-config-printer.py:1304
+ #: ../system-config-printer.py:1240
msgid "Proceed anyway?"
-@@ -253,13 +251,13 @@
+@@ -447,13 +446,13 @@
"The remote server did not accept the print job, most likely because the "
"printer is not shared."
msgstr ""
@@ -144,196 +198,193 @@
+"УдалÑннÑй ÑеÑÐ²ÐµÑ Ð½Ðµ пÑинÑл задание пеÑаÑи, ÑкоÑее вÑего поÑомÑ, ÑÑо пÑинÑÐµÑ "
"не наÑÑÑоен Ð´Ð»Ñ Ð¾Ð±Ñего доÑÑÑпа."
- #: ../system-config-printer.py:1553
+ #: ../system-config-printer.py:1450
-#, fuzzy, python-format
+#, python-format
msgid "Maintenance command submitted as job %d"
-msgstr "ТеÑÑÐ¾Ð²Ð°Ñ ÑÑÑаниÑа поÑÑавлена в оÑеÑÐµÐ´Ñ ÐºÐ°Ðº задание %d"
+msgstr "Ðоманда обÑлÑÐ¶Ð¸Ð²Ð°Ð½Ð¸Ñ Ð¿Ð¾ÑÑавлена в оÑеÑÐµÐ´Ñ ÐºÐ°Ðº задание %d"
- #: ../system-config-printer.py:1649 ../system-config-printer.py:1791
- msgid "Error"
-@@ -267,11 +265,11 @@
-
- #: ../system-config-printer.py:1650
+ #. The underlying cupsGetPPD2() function returned NULL without
+ #. setting an IPP error, so it'll be something like a failed
+@@ -464,12 +463,12 @@
+
+ #: ../system-config-printer.py:1504
msgid "There was a problem connecting to the CUPS server."
-msgstr "ÐÑибка подклÑÑÐµÐ½Ð¸Ñ Ðº кÑеÑвеÑÑ CUPS."
+msgstr "ÐÑибка подклÑÑÐµÐ½Ð¸Ñ Ðº ÑеÑвеÑÑ CUPS."
- #: ../system-config-printer.py:1703
- msgid "This is the default printer"
--msgstr "ÐÑо пÑинÑеÑа по ÑмолÑаниÑ"
-+msgstr "ÐÑо пÑинÑÐµÑ Ð¿Ð¾ ÑмолÑаниÑ"
-
- #: ../system-config-printer.py:1707
- msgid "No default printer set."
-@@ -280,7 +278,7 @@
- #: ../system-config-printer.py:1792
+ #: ../system-config-printer.py:1629
#, python-format
msgid "Option '%s' has value '%s' and cannot be edited."
-msgstr ""
+msgstr "ÐнаÑение паÑамеÑÑа '%s' Ñавно '%s' и не Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¾."
- #: ../system-config-printer.py:1832
- msgid "Cancel Tests"
-@@ -314,24 +312,22 @@
+ #: ../system-config-printer.py:2045
+ #, fuzzy, python-format
+@@ -497,24 +496,24 @@
#. IPP list columns
- #: ../system-config-printer.py:2367
+ #: ../system-config-printer.py:2424
msgid "Queue"
-msgstr ""
+msgstr "ÐÑеÑедÑ"
- #: ../system-config-printer.py:2381
+ #: ../system-config-printer.py:2438
-#, fuzzy
msgid ""
"PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
"PPD.GZ)"
-msgstr "ÐпиÑание PostScript пÑинÑеÑа (*.ppd[.gz])"
-+msgstr "Ð¤Ð°Ð¹Ð»Ñ Ð¾Ð¿Ð¸ÑÐ°Ð½Ð¸Ñ PostScript пÑинÑеÑов (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *.PPD.GZ)"
-
- #: ../system-config-printer.py:2390
++msgstr ""
++"Ð¤Ð°Ð¹Ð»Ñ Ð¾Ð¿Ð¸ÑÐ°Ð½Ð¸Ñ PostScript пÑинÑеÑов (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *.PPD."
++"GZ)"
+
+ #: ../system-config-printer.py:2447
msgid "All files (*)"
-msgstr ""
+msgstr "ÐÑе ÑÐ°Ð¹Ð»Ñ (*)"
- #: ../system-config-printer.py:2425 ../system-config-printer.py:3741
- #: ../system-config-printer.py:3775
+ #: ../system-config-printer.py:2485 ../system-config-printer.py:4069
+ #: ../system-config-printer.py:4103
-#, fuzzy
msgid "Search"
-msgstr "Ðовое Ð¸Ð¼Ñ Ð¿ÑинÑеÑа"
+msgstr "ÐоиÑк"
- #: ../system-config-printer.py:2428 ../system-config-printer.glade.h:155
+ #: ../system-config-printer.py:2488 ../system-config-printer.glade.h:144
msgid "New Printer"
-@@ -352,16 +348,15 @@
- #: ../system-config-printer.py:2551 ../system-config-printer.py:2775
- #: ../system-config-printer.py:2941 ../system-config-printer.py:3764
+@@ -535,11 +534,11 @@
+ #: ../system-config-printer.py:2607 ../system-config-printer.py:2872
+ #: ../system-config-printer.py:3058 ../system-config-printer.py:4092
msgid "Searching"
-msgstr ""
+msgstr "ÐÑполнÑеÑÑÑ Ð¿Ð¾Ð¸Ñк"
- #: ../system-config-printer.py:2552 ../system-config-printer.py:2776
+ #: ../system-config-printer.py:2608 ../system-config-printer.py:2873
msgid "Searching for drivers"
-msgstr ""
+msgstr "ÐÑполнÑеÑÑÑ Ð¿Ð¾Ð¸Ñк дÑайвеÑов"
- #: ../system-config-printer.py:2942
+ #: ../system-config-printer.py:2721
+ msgid "Fax"
+@@ -552,9 +551,8 @@
+ msgstr ""
+
+ #: ../system-config-printer.py:3059
-#, fuzzy
msgid "Searching for printers"
-msgstr "Ðовое Ð¸Ð¼Ñ Ð¿ÑинÑеÑа"
+msgstr "ÐÑполнÑеÑÑÑ Ð¿Ð¾Ð¸Ñк пÑинÑеÑов"
- #: ../system-config-printer.py:3160
+ #: ../system-config-printer.py:3305
msgid "Other"
-@@ -372,9 +367,8 @@
- msgstr " (ÑекÑÑий)"
-
- #: ../system-config-printer.py:3188 ../system-config-printer.py:3449
+@@ -566,9 +564,8 @@
+
+ #: ../system-config-printer.py:3336 ../system-config-printer.py:3342
+ #: ../system-config-printer.py:3769
-#, fuzzy
msgid "Scanning..."
-msgstr "ÐаÑÑÑаб:"
+msgstr "СканиÑование..."
- #: ../system-config-printer.py:3360 ../system-config-printer.py:3427
+ #: ../system-config-printer.py:3687 ../system-config-printer.py:3750
msgid "Verified"
-@@ -390,56 +384,55 @@
-
- #: ../system-config-printer.py:3369 ../system-config-printer.py:3435
+@@ -584,56 +581,53 @@
+
+ #: ../system-config-printer.py:3695 ../system-config-printer.py:3757
msgid "This print share is not accessible."
-msgstr "ÐÑÐ¾Ñ Ð¿ÑинÑÐµÑ (обÑий ÑеÑÑÑÑ) не доÑÑÑпен."
+msgstr "ÐÑÐ¾Ñ Ð¿ÑинÑÐµÑ (обÑий ÑеÑÑÑÑ) недоÑÑÑпен."
- #: ../system-config-printer.py:3483
+ #: ../system-config-printer.py:3802
msgid "It is not possible to obtain a list of queues from this host."
-msgstr ""
+msgstr "Ðевозможно полÑÑиÑÑ ÑпиÑок оÑеÑедей Ñ ÑÑой маÑинÑ."
- #: ../system-config-printer.py:3487
+ #: ../system-config-printer.py:3805
msgid "No queues"
-msgstr ""
+msgstr "ÐÐµÑ Ð¾ÑеÑедей"
- #: ../system-config-printer.py:3488
+ #: ../system-config-printer.py:3806
msgid "There are no queues available."
-msgstr ""
+msgstr "ÐÑеÑеди недоÑÑÑпнÑ."
- #: ../system-config-printer.py:3545
+ #: ../system-config-printer.py:3861
msgid "A printer connected to the parallel port."
-msgstr "ÐÑинÑÐµÑ Ð¿Ð¾Ð´ÐºÐ»ÑÑен к паÑаллелÑÐ½Ð¾Ð¼Ñ Ð¿Ð¾ÑÑÑ."
+msgstr "ÐÑинÑÐµÑ Ð¿Ð¾Ð´ÐºÐ»ÑÑÑн к паÑаллелÑÐ½Ð¾Ð¼Ñ Ð¿Ð¾ÑÑÑ."
- #: ../system-config-printer.py:3547
+ #: ../system-config-printer.py:3863
msgid "A printer connected to a USB port."
-msgstr "ÐÑинÑÐµÑ Ð¿Ð¾Ð´ÐºÐ»ÑÑен к поÑÑÑ USB."
+msgstr "ÐÑинÑÐµÑ Ð¿Ð¾Ð´ÐºÐ»ÑÑÑн к поÑÑÑ USB."
- #: ../system-config-printer.py:3549
+ #: ../system-config-printer.py:3865
msgid ""
"HPLIP software driving a printer, or the printer function of a multi-"
"function device."
msgstr ""
-"РабоÑÑ Ð¿ÑинÑеÑа обеÑпеÑÐ¸Ð²Ð°ÐµÑ HPLIP или ÑÑнкÑÐ¸Ñ Ð¿ÑинÑеÑа многоÑÑнкÑионалÑного "
-"ÑÑÑÑойÑÑва."
-+"ÐÐ HPLIP позволÑÐµÑ Ð¿ÐµÑаÑаÑÑ Ð½Ð° пÑинÑеÑе или многоÑÑнкÑионалÑном"
-+"ÑÑÑÑойÑÑве."
-
- #: ../system-config-printer.py:3552
++"ÐÐ HPLIP позволÑÐµÑ Ð¿ÐµÑаÑаÑÑ Ð½Ð° пÑинÑеÑе или многоÑÑнкÑионалÑномÑÑÑÑойÑÑве."
+
+ #: ../system-config-printer.py:3868
msgid ""
"HPLIP software driving a fax machine, or the fax function of a multi-"
"function device."
msgstr ""
-"РабоÑÑ Ð¿ÑинÑеÑа обеÑпеÑÐ¸Ð²Ð°ÐµÑ HPLIP или ÑÑнкÑÐ¸Ñ ÑакÑа многоÑÑнкÑионалÑного "
-"ÑÑÑÑойÑÑва."
-+"ÐÐ HPLIP позволÑÐµÑ ÑабоÑаÑÑ Ñ ÑакÑом или многоÑÑнкÑионалÑнÑм"
-+"ÑÑÑÑойÑÑвом."
-
- #: ../system-config-printer.py:3555
++"ÐÐ HPLIP позволÑÐµÑ ÑабоÑаÑÑ Ñ ÑакÑом или многоÑÑнкÑионалÑнÑмÑÑÑÑойÑÑвом."
+
+ #: ../system-config-printer.py:3871
msgid "Local printer detected by the Hardware Abstraction Layer (HAL)."
msgstr "HAL (Hardware Abstraction Layer) обнаÑÑжил локалÑнÑй пÑинÑеÑ."
- #: ../system-config-printer.py:3787
+ #: ../system-config-printer.py:4115
-#, fuzzy
msgid "-- Select printer model --"
-msgstr "ÐÑбеÑиÑе пÑинÑÐµÑ Ð¸Ð· Ð±Ð°Ð·Ñ Ð´Ð°Ð½Ð½ÑÑ
"
+msgstr "-- ÐÑбеÑиÑе Ð¼Ð¾Ð´ÐµÐ»Ñ Ð¿ÑинÑеÑа --"
- #: ../system-config-printer.py:3789
+ #: ../system-config-printer.py:4117
msgid "-- No matches found --"
-msgstr ""
+msgstr "-- ниÑего подÑ
одÑÑего не найдено --"
- #: ../system-config-printer.py:3954
+ #: ../system-config-printer.py:4290
msgid " (recommended)"
-@@ -450,22 +443,20 @@
+@@ -644,22 +638,20 @@
msgstr "ÐаннÑй PPD ÑÑоÑмиÑован foomatic."
- #: ../system-config-printer.py:3994
+ #: ../system-config-printer.py:4330
-#, fuzzy
msgid "OpenPrinting"
-msgstr "ÐеÑаÑÑ"
+msgstr "OpenPrinting"
- #: ../system-config-printer.py:3996
+ #: ../system-config-printer.py:4332
msgid "Distributable"
-msgstr ""
+msgstr "РаÑпÑоÑÑÑанÑем"
- #: ../system-config-printer.py:3998
+ #: ../system-config-printer.py:4334
-#, fuzzy
msgid "None"
-msgstr "неÑ"
+msgstr "ÐеÑ"
- #: ../system-config-printer.py:4006
+ #: ../system-config-printer.py:4342
msgid "Not specified."
-msgstr ""
+msgstr "Ðе Ñказано."
#. Foomatic database problem of some sort.
- #: ../system-config-printer.py:4033
-@@ -483,8 +474,7 @@
- #: ../system-config-printer.py:4044
+ #: ../system-config-printer.py:4382
+@@ -677,8 +669,7 @@
+ #: ../system-config-printer.py:4393
#, python-format
msgid "You will need to install the '%s' package in order to use this driver."
-msgstr ""
@@ -341,44 +392,43 @@
+msgstr "ЧÑÐ¾Ð±Ñ Ð²Ð¾ÑполÑзоваÑÑÑÑ ÑÑим дÑайвеÑом необÑ
одимо ÑÑÑановиÑÑ Ð¿Ð°ÐºÐµÑ '%s'."
#. This error came from trying to open the PPD file.
- #: ../system-config-printer.py:4051
-@@ -498,38 +488,32 @@
+ #: ../system-config-printer.py:4400
+@@ -692,38 +683,32 @@
#. Failed to get PPD downloaded from OpenPrinting XXX
- #: ../system-config-printer.py:4064
+ #: ../system-config-printer.py:4413
msgid "Downloadable drivers"
-msgstr ""
+msgstr "ÐагÑÑжаемÑе дÑайвеÑÑ"
- #: ../system-config-printer.py:4065
- msgid "Support for downloadable drivers is not yet completed."
--msgstr ""
-+msgstr "ÐоддеÑжка загÑÑзки дÑайвеÑов пока недоделана."
-
- #: ../system-config-printer.py:4115 ../system-config-printer.py:4152
+ #: ../system-config-printer.py:4414
+ msgid "Failed to download PPD."
+ msgstr ""
+
+ #: ../system-config-printer.py:4450 ../system-config-printer.py:4488
-#, fuzzy
msgid "No Installable Options"
-msgstr "УÑÑанавливаемÑе возможноÑÑи"
+msgstr "ÐÐµÑ ÑÑÑанавливаемÑÑ
паÑамеÑÑов"
- #: ../system-config-printer.py:4199
+ #: ../system-config-printer.py:4534
-#, fuzzy
msgid "Adding"
-msgstr "ÐапланиÑовано"
+msgstr "Ðобавление"
- #: ../system-config-printer.py:4200
+ #: ../system-config-printer.py:4535
-#, fuzzy
msgid "Adding printer"
-msgstr "ÐаÑÑÑойка пÑинÑеÑов"
+msgstr "Ðобавление пÑинÑеÑа"
- #: ../system-config-printer.py:4352
+ #: ../system-config-printer.py:4696
-#, fuzzy
msgid "Install driver"
-msgstr "ÐÑÑÑÑÑÑвÑÐµÑ Ð´ÑайвеÑ"
+msgstr "УÑÑановка дÑайвеÑа"
- #: ../system-config-printer.py:4353
+ #: ../system-config-printer.py:4697
-#, fuzzy, python-format
+#, python-format
msgid "Printer '%s' requires the %s package but it is not currently installed."
@@ -387,9 +437,9 @@
-"ÑÑÑановиÑе его пеÑед иÑполÑзованием пÑинÑеÑа."
+msgstr "ÐÑинÑеÑÑ '%s' необÑ
одим Ð¿Ð°ÐºÐµÑ %s, но он не ÑÑÑановлен."
- #: ../system-config-printer.py:4360
+ #: ../system-config-printer.py:4722
msgid "Missing driver"
-@@ -541,24 +525,24 @@
+@@ -735,8 +720,8 @@
"Printer '%s' requires the '%s' program but it is not currently installed. "
"Please install it before using this printer."
msgstr ""
@@ -398,429 +448,112 @@
+"ÐÑинÑеÑÑ '%s' необÑ
одима пÑогÑамма '%s', но она не ÑÑÑановлена. УÑÑановиÑе "
+"ÐµÑ Ð¿ÐµÑед Ñем как иÑполÑзоваÑÑ Ð¿ÑинÑеÑ."
- #: ../troubleshoot.py:46
- msgid ""
- "To start this tool, select System->Administration->Printing from the main "
- "menu."
- msgstr ""
-+"ÐÐ»Ñ Ð·Ð°Ð¿ÑÑка ÑÑого инÑÑÑÑменÑа, вÑбеÑиÑе СиÑÑема->ÐдминиÑÑÑиÑование->ÐеÑаÑÑ "
-+"из оÑновного менÑ."
-
- #: ../troubleshoot.py:56
--#, fuzzy
- msgid "Authentication"
+ #: ../system-config-printer.glade.h:1
+ msgid " "
+@@ -761,12 +746,14 @@
+ #: ../system-config-printer.glade.h:8
+ #, fuzzy
+ msgid "72 points per inch"
+-msgstr "ÑоÑек (72 ÑоÑки на дÑйм)"
++msgstr ""
++"ÑоÑек\n"
++"(72 ÑоÑки на дÑйм)"
+
+ #: ../system-config-printer.glade.h:9
+ #, fuzzy
+ msgid "<b>Authentication</b>"
-msgstr "<b>ÐÑовеÑка подлинноÑÑи</b>"
+msgstr "ÐÑовеÑка подлинноÑÑи"
- #: ../troubleshoot.py:71
--#, fuzzy
- msgid "Password required"
--msgstr "ТÑебÑеÑÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ"
-+msgstr "ТÑебÑеÑÑÑ Ð¿Ð°ÑолÑ"
-
- #: ../troubleshoot.py:79 ../system-config-printer.glade.h:195
- #: ../applet.glade.h:5
-@@ -567,136 +551,131 @@
-
- #: ../troubleshoot.py:104
- msgid "Printing troubleshooter"
--msgstr ""
-+msgstr "Ðнализ пÑоблем Ñ Ð¿ÐµÑаÑÑÑ"
-
- #: ../troubleshoot.py:401
- msgid "Trouble-shooting Printing"
--msgstr ""
-+msgstr "ÐÑÑвление пÑоблем Ñ Ð¿ÐµÑаÑÑÑ"
-
- #: ../troubleshoot.py:403
- msgid ""
- "In the next few screens I will ask you some questions about your problem "
- "with printing. Based on your answers I will try to suggest a solution."
- msgstr ""
-+"Ðалее бÑÐ´ÐµÑ Ð·Ð°Ð´Ð°Ð½Ð¾ неÑколÑко вопÑоÑов о ваÑиÑ
пÑоблемаÑ
Ñ "
-+"пеÑаÑÑÑ. ÐÑновÑваÑÑÑ Ð½Ð° ваÑиÑ
оÑвеÑаÑ
, бÑÐ´ÐµÑ Ð¿Ñедложен ÑпоÑоб ÑеÑениÑ."
-
- #: ../troubleshoot.py:407
- msgid "Click 'Forward' to begin."
--msgstr ""
-+msgstr "ЧÑÐ¾Ð±Ñ Ð½Ð°ÑаÑÑ, нажмиÑе 'ÐпеÑÑд'."
-
- #: ../troubleshoot.py:418
- msgid "Sorry!"
--msgstr ""
-+msgstr "ÐзвиниÑе!"
-
- #: ../troubleshoot.py:419
- msgid ""
- "I have not been able to work out what the problem is, but I have collected "
- "some useful information to put in a bug report."
- msgstr ""
-+"Ð ÑожалениÑ, невозможно пÑедложиÑÑ ÑеÑение ваÑей пÑоблемÑ, но бÑла "
-+"ÑобÑана некоÑоÑÐ°Ñ Ð¿Ð¾Ð»ÐµÐ·Ð½Ð°Ñ Ð¸Ð½ÑоÑмаÑÐ¸Ñ Ð´Ð»Ñ Ð¾ÑпÑавки ÑообÑÐµÐ½Ð¸Ñ Ð¾Ð± "
-+"оÑибке."
-
- #: ../troubleshoot.py:488
--#, fuzzy
- msgid "Queue Not Accepting Jobs"
--msgstr "ÐÑÐ¸Ð½Ð¸Ð¼Ð°ÐµÑ Ð·Ð°Ð´Ð°Ð½Ð¸Ñ"
-+msgstr "ÐÑеÑÐµÐ´Ñ Ð½Ðµ пÑÐ¸Ð½Ð¸Ð¼Ð°ÐµÑ Ð·Ð°Ð´Ð°Ð½Ð¸Ñ"
-
- #: ../troubleshoot.py:489
--#, fuzzy
- msgid "The CUPS printer on the server is not accepting jobs."
--msgstr "ÐÑÐ¾Ñ Ð¿ÑинÑÐµÑ (обÑий ÑеÑÑÑÑ) не доÑÑÑпен."
-+msgstr "СеÑвеÑнÑй пÑинÑÐµÑ CUPS не пÑÐ¸Ð½Ð¸Ð¼Ð°ÐµÑ Ð·Ð°Ð´Ð°Ð½Ð¸Ñ."
-
- #: ../troubleshoot.py:513 ../troubleshoot.py:1259
- msgid "Queue Not Enabled"
--msgstr ""
-+msgstr "ÐÑеÑÐµÐ´Ñ Ð½Ðµ акÑивиÑована"
-
- #: ../troubleshoot.py:514
--#, fuzzy
- msgid "The CUPS printer on the server is not enabled."
--msgstr "ÐÑÐ¾Ñ Ð¿ÑинÑÐµÑ (обÑий ÑеÑÑÑÑ) не доÑÑÑпен."
-+msgstr "СеÑвеÑнÑй пÑинÑÐµÑ CUPS не акÑивиÑован."
-
- #: ../troubleshoot.py:531 ../troubleshoot.py:1253
- #, python-format
- msgid "The reason given is: `%s'."
--msgstr ""
-+msgstr "ÐÑиÑина: `%s'."
-
- #: ../troubleshoot.py:533 ../troubleshoot.py:1255
- msgid "This may be due to the printer being disconnected or switched off."
--msgstr ""
-+msgstr "ÐÑо Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð¸Ð·-за Ñого, ÑÑо пÑинÑÐµÑ Ð±Ñл оÑклÑÑÑн или вÑклÑÑен."
-
- #: ../troubleshoot.py:549
- msgid "Queue Not Shared"
--msgstr ""
-+msgstr "ÐÑеÑÐµÐ´Ñ Ð½Ðµ ÑвлÑеÑÑÑ Ð¾Ð±Ñим ÑеÑÑÑÑом"
-
- #: ../troubleshoot.py:550
- msgid "The CUPS printer on the server is not shared."
--msgstr ""
-+msgstr "СеÑвеÑнÑй пÑинÑÐµÑ CUPS не бÑл Ñделан обÑим ÑеÑÑÑÑом."
-
- #: ../troubleshoot.py:584
--#, fuzzy
- msgid "Choose Network Printer"
--msgstr "ÐовÑй пÑинÑеÑ"
-+msgstr "ÐÑÐ±Ð¾Ñ ÑеÑевого пÑинÑеÑа"
-
- #: ../troubleshoot.py:585
- msgid ""
- "Please select the network printer you are trying to use from the list below. "
- "If it does not appear in the list, select 'Not listed'."
- msgstr ""
-+"Ðз ÑпиÑка ниже вÑбеÑиÑе ÑеÑевой пÑинÑеÑ, коÑоÑÑй Ð²Ñ Ð¿ÑÑаеÑеÑÑ Ð¸ÑполÑзоваÑÑ. "
-+"ÐÑли его Ð½ÐµÑ Ð² ÑпиÑке, вÑбеÑиÑе 'ÐÐµÑ Ð² ÑпиÑке'."
-
- #: ../troubleshoot.py:590 ../troubleshoot.py:1366
- msgid "Name"
- msgstr "ÐмÑ"
-
- #: ../troubleshoot.py:594 ../troubleshoot.py:1370
--#, fuzzy
- msgid "Information"
--msgstr "РазмеÑение:"
-+msgstr "ÐнÑоÑмаÑиÑ"
-
- #: ../troubleshoot.py:627 ../troubleshoot.py:1394
--#, fuzzy
- msgid "Not listed"
--msgstr "Ðе подклÑÑен"
-+msgstr "ÐÐµÑ Ð² ÑпиÑке"
-
- #: ../troubleshoot.py:788
--#, fuzzy
- msgid "Remote Address"
--msgstr "УдаленнÑе пÑинÑеÑÑ"
-+msgstr "УдалÑннÑй адÑеÑ"
-
- #: ../troubleshoot.py:789
- msgid ""
- "Please enter as many details as you can about the network address of this "
- "printer."
--msgstr ""
-+msgstr "ÐведиÑе как можно болÑÑе подÑобноÑÑей о ÑеÑевом адÑеÑе ÑÑого пÑинÑеÑа."
-
- #: ../troubleshoot.py:797
--#, fuzzy
- msgid "Server name:"
--msgstr "ÐÐ¼Ñ Ð¿Ð¾Ð»ÑзоваÑелÑ:"
-+msgstr "ÐÐ¼Ñ ÑеÑвеÑа:"
-
- #: ../troubleshoot.py:803
- msgid "Server IP address:"
--msgstr ""
-+msgstr "IP-адÑÐµÑ ÑеÑвеÑа:"
-
- #: ../troubleshoot.py:824
--#, fuzzy
- msgid "Printer Location"
--msgstr "ÐаÑамеÑÑÑ Ð¿ÑинÑеÑа"
-+msgstr "РазмеÑение пÑинÑеÑа"
-
- #: ../troubleshoot.py:825
--#, fuzzy
- msgid "Is the printer connected to this computer or available on the network?"
--msgstr "ÐÑинÑÐµÑ Ð¿Ð¾Ð´ÐºÐ»ÑÑен к паÑаллелÑÐ½Ð¾Ð¼Ñ Ð¿Ð¾ÑÑÑ."
-+msgstr "ÐÑинÑÐµÑ Ð¿Ð¾Ð´ÐºÐ»ÑÑÑн к ÑÑÐ¾Ð¼Ñ ÐºÐ¾Ð¼Ð¿ÑÑÑеÑÑ Ð¸Ð»Ð¸ доÑÑÑпен ÑеÑез ÑеÑÑ?"
-
- #: ../troubleshoot.py:827
--#, fuzzy
- msgid "Locally connected printer"
--msgstr "ÐейÑÑвиÑелÑно ÑдалиÑÑ Ð¿ÑинÑÐµÑ %s?"
-+msgstr "ÐокалÑно подклÑÑÑннÑй пÑинÑеÑ"
-
- #: ../troubleshoot.py:828
--#, fuzzy
- msgid "Network printer"
--msgstr "ÐовÑй пÑинÑеÑ"
-+msgstr "СеÑевой пÑинÑеÑ"
-
- #: ../troubleshoot.py:840
- msgid "CUPS Service Stopped"
--msgstr ""
-+msgstr "ÐÑÑановлен ÑеÑÐ²Ð¸Ñ CUPS"
-
- #: ../troubleshoot.py:841
- msgid ""
-@@ -704,6 +683,9 @@
- "choose System->Administration->Services from the main menu and look for the "
- "`cups' service."
- msgstr ""
-+"ÐеÑоÑÑно не ÑабоÑÐ°ÐµÑ ÑпÑÐ»ÐµÑ Ð¿ÐµÑаÑи CUPS. ЧÑÐ¾Ð±Ñ Ð¸ÑпÑавиÑÑ ÑÑо, "
-+"вÑбеÑиÑе в оÑновном Ð¼ÐµÐ½Ñ Ð¡Ð¸ÑÑема->ÐдминиÑÑÑиÑование->СеÑвиÑÑ Ð¸ "
-+"найдиÑе ÑеÑÐ²Ð¸Ñ 'cups'."
-
- #: ../troubleshoot.py:870 ../applet.py:729
- msgid "Pending"
-@@ -726,13 +708,12 @@
- msgstr "ÐÑполнено"
-
- #: ../troubleshoot.py:885
--#, fuzzy
- msgid "Test Page"
--msgstr "ÐапеÑаÑаÑÑ Ð¿ÑобнÑÑ ÑÑÑаниÑÑ"
-+msgstr "ÐÑÐ¾Ð±Ð½Ð°Ñ ÑÑÑаниÑа"
-
- #: ../troubleshoot.py:897
- msgid "Cancel All Jobs"
--msgstr ""
-+msgstr "ÐÑмениÑÑ Ð²Ñе заданиÑ"
-
- #: ../troubleshoot.py:902 ../applet.py:184
- msgid "Job"
-@@ -744,78 +725,78 @@
-
- #: ../troubleshoot.py:907 ../applet.py:189
- msgid "Status"
--msgstr "СÑаÑÑÑ"
-+msgstr "СоÑÑоÑние"
-
- #: ../troubleshoot.py:928
- msgid "Did the test page print correctly?"
--msgstr ""
-+msgstr "ÐÑавилÑно ли напеÑаÑана пÑÐ¾Ð±Ð½Ð°Ñ ÑÑÑаниÑа?"
-
- #: ../troubleshoot.py:935
- msgid "Yes"
--msgstr ""
-+msgstr "Ðа"
-
- #: ../troubleshoot.py:936
- msgid "No"
--msgstr ""
-+msgstr "ÐеÑ"
-
- #: ../troubleshoot.py:1118
--#, fuzzy
- msgid "Status Messages"
--msgstr "СообÑение"
-+msgstr "СообÑÐµÐ½Ð¸Ñ Ð¾ ÑоÑÑоÑнии"
-
- #: ../troubleshoot.py:1119
- msgid "There are status messages associated with this queue."
--msgstr ""
-+msgstr "ÐÑÑÑ ÑообÑÐµÐ½Ð¸Ñ Ð¾ ÑоÑÑоÑнии, каÑаÑÑиеÑÑ ÑÑой оÑеÑеди."
-
- #: ../troubleshoot.py:1125
--#, fuzzy
- msgid "Printer's state message:"
--msgstr "СоÑÑоÑние пÑинÑеÑа:"
-+msgstr "СообÑÐµÐ½Ð¸Ñ Ð¾ ÑоÑÑоÑнии пÑинÑеÑа:"
-
- #: ../troubleshoot.py:1133
--#, fuzzy
- msgid "Printer's state reasons:"
--msgstr "СоÑÑоÑние пÑинÑеÑа:"
-+msgstr "ÐÑиÑÐ¸Ð½Ñ ÑоÑÑоÑÐ½Ð¸Ñ Ð¿ÑинÑеÑа:"
-
- #: ../troubleshoot.py:1186
- msgid "Queue Rejecting Jobs"
--msgstr ""
-+msgstr "ÐÑеÑÐµÐ´Ñ Ð¾ÑклонÑÐµÑ Ð·Ð°Ð´Ð°Ð½Ð¸Ñ"
-
- #: ../troubleshoot.py:1211
- #, python-format
- msgid "The queue `%s' is rejecting jobs."
--msgstr ""
-+msgstr "ÐÑеÑÐµÐ´Ñ '%s' оÑклонÑÐµÑ Ð·Ð°Ð´Ð°Ð½Ð¸Ñ."
-
- #: ../troubleshoot.py:1215
- #, python-format
- msgid " The reason given is: `%s'."
--msgstr ""
-+msgstr " ÐÑиÑина: '%s'."
-
- #: ../troubleshoot.py:1218
- msgid ""
- "To make the queue accept jobs, select the `Accepting Jobs' checkbox in the "
- "`Policies' tab for the printer in the printer administration tool."
- msgstr ""
-+"ÐÐ»Ñ Ñого, ÑÑÐ¾Ð±Ñ Ð·Ð°Ð´Ð°Ð½Ð¸Ñ Ð¿ÑинималиÑÑ Ð² оÑеÑедÑ, ÑÑÑановиÑе галоÑÐºÑ `ÐÑинимаÑÑ Ð·Ð°Ð´Ð°Ð½Ð¸Ñ' в "
-+"закладке `ÐолиÑики' Ð´Ð»Ñ ÑÑого пÑинÑеÑа в ÑÑилиÑе админиÑÑÑиÑÐ¾Ð²Ð°Ð½Ð¸Ñ Ð¿ÑинÑеÑов."
-
- #: ../troubleshoot.py:1260
- #, python-format
- msgid "The queue `%s' is not enabled."
--msgstr ""
-+msgstr "ÐÑеÑÐµÐ´Ñ `%s' не акÑивиÑована."
-
- #: ../troubleshoot.py:1263
- msgid ""
- "To enable it, select the `Enabled' checkbox in the `Policies' tab for the "
- "printer in the printer administration tool."
- msgstr ""
-+"ÐÐ»Ñ Ð°ÐºÑивиÑÐ¾Ð²Ð°Ð½Ð¸Ñ Ð¾ÑеÑеди, ÑÑÑановиÑе галоÑÐºÑ `ÐклÑÑÑн' в "
-+"закладке `ÐолиÑики' Ð´Ð»Ñ ÑÑого пÑинÑеÑа в ÑÑилиÑе админиÑÑÑиÑÐ¾Ð²Ð°Ð½Ð¸Ñ Ð¿ÑинÑеÑов."
-
- #: ../troubleshoot.py:1278
- msgid "Check Server Firewall"
--msgstr ""
-+msgstr "ÐÑовеÑÑÑе межÑеÑевой ÑкÑан ÑеÑвеÑа"
-
- #: ../troubleshoot.py:1279
--#, fuzzy
- msgid "It is not possible to connect to the server."
--msgstr "ÐÑибка подклÑÑÐµÐ½Ð¸Ñ Ðº кÑеÑвеÑÑ CUPS."
-+msgstr "Ðе ÑдаÑÑÑÑ Ð¿Ð¾Ð´ÐºÐ»ÑÑиÑÑÑÑ Ðº ÑеÑвеÑÑ."
-
- #: ../troubleshoot.py:1292
- #, python-format
-@@ -823,17 +804,20 @@
- "Please check to see if a firewall or router configuration is blocking TCP "
- "port %d on server `%s'."
- msgstr ""
-+"УбедиÑеÑÑ, ÑÑо наÑÑÑойки межÑеÑевого ÑкÑана или маÑÑÑÑÑизаÑоÑа не блокиÑÑÑÑ "
-+"TCP-поÑÑ %d на ÑеÑвеÑе `%s'."
-
- #: ../troubleshoot.py:1360
--#, fuzzy
- msgid "Choose Printer"
--msgstr "ÐопиÑование пÑинÑеÑа"
-+msgstr "ÐÑÐ±Ð¾Ñ Ð¿ÑинÑеÑа"
-
- #: ../troubleshoot.py:1361
- msgid ""
- "Please select the printer you are trying to use from the list below. If it "
- "does not appear in the list, select 'Not listed'."
- msgstr ""
-+"Ðз ÑпиÑка ниже вÑбеÑиÑе пÑинÑеÑ, коÑоÑÑй Ð²Ñ Ð¿ÑÑаеÑеÑÑ Ð¸ÑполÑзоваÑÑ. "
-+"ÐÑли его Ð½ÐµÑ Ð² ÑпиÑке, вÑбеÑиÑе 'ÐÐµÑ Ð² ÑпиÑке'."
-
- #: ../system-config-printer.glade.h:1
- msgid " "
-@@ -876,33 +860,28 @@
+ #: ../system-config-printer.glade.h:10
+ msgid "<b>Banner</b>"
+@@ -789,33 +776,28 @@
msgstr "<b>ÐпиÑание</b> (не обÑзаÑелÑно)"
- #: ../system-config-printer.glade.h:13
+ #: ../system-config-printer.glade.h:15
-#, fuzzy
msgid "<b>Download Printer Driver</b>"
-msgstr "<b>ÐомменÑаÑий к дÑайвеÑÑ</b>"
+msgstr "<b>ÐагÑÑзиÑÑ Ð´ÑÐ°Ð¹Ð²ÐµÑ Ð¿ÑинÑеÑа</b>"
- #: ../system-config-printer.glade.h:14
+ #: ../system-config-printer.glade.h:16
-#, fuzzy
msgid "<b>Enter device URI</b>"
-msgstr "УкажиÑе URI адÑÐµÑ ÑÑÑÑойÑÑва"
+msgstr "<b>УкажиÑе URI адÑÐµÑ ÑÑÑÑойÑÑва</b>"
- #: ../system-config-printer.glade.h:15
+ #: ../system-config-printer.glade.h:17
-#, fuzzy
msgid "<b>IPP Printer</b>"
-msgstr "<b>Ðазвание пÑинÑеÑа</b>"
+msgstr "<b>IPP пÑинÑеÑ</b>"
- #: ../system-config-printer.glade.h:16
+ #: ../system-config-printer.glade.h:18
msgid "<b>Image Options</b>"
-msgstr "<b>ÐаÑамеÑÑÑ Ð¸Ð·Ð¾Ð±Ñажений</b>"
+msgstr "<b>ÐаÑамеÑÑÑ Ð¸Ð·Ð¾Ð±ÑажениÑ</b>"
- #: ../system-config-printer.glade.h:17
+ #: ../system-config-printer.glade.h:19
-#, fuzzy
msgid "<b>Installed Options</b>"
-msgstr "<b>ÐаÑамеÑÑÑ Ð¸Ð·Ð¾Ð±Ñажений</b>"
+msgstr "<b>УÑÑановленнÑе паÑамеÑÑÑ</b>"
- #: ../system-config-printer.glade.h:18
+ #: ../system-config-printer.glade.h:20
-#, fuzzy
msgid "<b>License Terms</b>"
-msgstr "<b>Ðазвание пÑинÑеÑа</b>"
+msgstr "<b>УÑÐ»Ð¾Ð²Ð¸Ñ Ð»Ð¸Ñензии</b>"
- #: ../system-config-printer.glade.h:19
+ #: ../system-config-printer.glade.h:21
msgid "<b>Location of the LPD network printer</b>"
-@@ -917,13 +896,12 @@
+@@ -830,13 +812,12 @@
msgstr "<b>РазмеÑение</b> (не обÑзаÑелÑно)"
- #: ../system-config-printer.glade.h:22
+ #: ../system-config-printer.glade.h:24
-#, fuzzy
msgid "<b>Note</b>"
-msgstr "<b>СоÑÑоÑние</b>"
+msgstr "<b>ÐамеÑание</b>"
- #: ../system-config-printer.glade.h:23
+ #: ../system-config-printer.glade.h:25
msgid "<b>Other Options (Advanced)</b>"
-msgstr "<b>ÐÑÑгие паÑамеÑÑÑ (РаÑÑиÑеннÑе)</b>"
+msgstr "<b>ÐÑÑгие паÑамеÑÑÑ (ÑаÑÑиÑеннÑе)</b>"
- #: ../system-config-printer.glade.h:24
+ #: ../system-config-printer.glade.h:26
msgid "<b>Policies</b>"
-@@ -938,18 +916,16 @@
+@@ -851,18 +832,16 @@
msgstr "<b>ÐÑинÑеÑÑ - ÑÐ»ÐµÐ½Ñ ÑÑого клаÑÑа</b>"
- #: ../system-config-printer.glade.h:27
+ #: ../system-config-printer.glade.h:29
-#, fuzzy
msgid "<b>SMB Printer</b>"
-msgstr "<b>Ðазвание пÑинÑеÑа</b>"
+msgstr "<b>SMB пÑинÑеÑ</b>"
- #: ../system-config-printer.glade.h:28
+ #: ../system-config-printer.glade.h:30
msgid "<b>Select Connection</b>"
msgstr "<b>УкажиÑе подклÑÑение</b>"
- #: ../system-config-printer.glade.h:29
+ #: ../system-config-printer.glade.h:31
-#, fuzzy
msgid "<b>Select Driver</b>"
-msgstr "<b>ÐÑинÑÐµÑ Ð¿Ð¾ ÑмолÑаниÑ</b>"
+msgstr "<b>ÐÑÐ±Ð¾Ñ Ð´ÑайвеÑа</b>"
- #: ../system-config-printer.glade.h:30
+ #: ../system-config-printer.glade.h:32
msgid "<b>Settings of the serial port</b>"
-@@ -965,7 +941,7 @@
-
- #: ../system-config-printer.glade.h:33
+@@ -878,7 +857,7 @@
+
+ #: ../system-config-printer.glade.h:35
msgid "<b>Tests and Maintenance</b>"
-msgstr ""
+msgstr "<b>ТеÑÑиÑование и обÑлÑживание</b>"
- #: ../system-config-printer.glade.h:34
+ #: ../system-config-printer.glade.h:36
msgid "<b>Text Options</b>"
-@@ -976,7 +952,7 @@
+@@ -889,7 +868,7 @@
"<i>Not published\n"
"See server settings</i>"
msgstr ""
@@ -828,139 +561,88 @@
+"<i>ÐедоÑÑÑпен\n"
"ÐÑовеÑÑÑе паÑамеÑÑÑ ÑеÑвеÑа</i>"
- #: ../system-config-printer.glade.h:37
-@@ -991,7 +967,7 @@
+ #: ../system-config-printer.glade.h:39
+@@ -904,19 +883,17 @@
msgstr ""
"<span weight=\"bold\" size=\"larger\">ÐÑимениÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ?</span>\n"
"\n"
-"ÐÑе ÑделаннÑми вами Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð±ÑдÑÑ Ð¿Ð¾ÑеÑÑÐ½Ñ ÐµÑли Ð²Ñ Ð¸Ñ
не пÑимениÑе."
+"ÐÑе ÑделаннÑми вами Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð±ÑдÑÑ Ð¿Ð¾ÑеÑÑнÑ, еÑли Ð²Ñ Ð¸Ñ
не пÑимениÑе."
- #: ../system-config-printer.glade.h:41 ../applet.glade.h:1
- msgid ""
-@@ -1002,16 +978,14 @@
- "\n"
-
- #: ../system-config-printer.glade.h:44
+ #: ../system-config-printer.glade.h:43
-#, fuzzy
msgid "A CUPS configuration tool."
-msgstr "ÐаÑÑÑойка пÑинÑеÑа - %s"
+msgstr "ÐнÑÑÑÑÐ¼ÐµÐ½Ñ Ð½Ð°ÑÑÑойки CUPS."
- #: ../system-config-printer.glade.h:45
+ #: ../system-config-printer.glade.h:44
msgid "Accepting jobs"
msgstr "ÐÑÐ¸Ð½Ð¸Ð¼Ð°ÐµÑ Ð·Ð°Ð´Ð°Ð½Ð¸Ñ"
- #: ../system-config-printer.glade.h:46
+ #: ../system-config-printer.glade.h:45
-#, fuzzy
msgid "Access Control"
msgstr "УпÑавление доÑÑÑпом"
-@@ -1021,26 +995,23 @@
-
- #: ../system-config-printer.glade.h:48
+@@ -926,16 +903,15 @@
+
+ #: ../system-config-printer.glade.h:47
msgid "Allow printing for everyone except these users:"
-msgstr "РазÑеÑиÑÑ Ð¿ÐµÑаÑÑ Ð²Ñем кÑоме ÑказаннÑÑ
полÑзоваÑелей:"
+msgstr "РазÑеÑиÑÑ Ð¿ÐµÑаÑÑ Ð²Ñем, кÑоме ÑказаннÑÑ
полÑзоваÑелей:"
- #: ../system-config-printer.glade.h:49
+ #: ../system-config-printer.glade.h:48
-#, fuzzy
msgid "Allow printing from the Internet"
-msgstr "РазÑеÑиÑÑ Ð¿ÐµÑаÑÑ Ð²Ñем кÑоме ÑказаннÑÑ
полÑзоваÑелей:"
+msgstr "РазÑеÑиÑÑ Ð¿ÐµÑаÑÑ Ð¸Ð· ÐнÑеÑнеÑ"
- #: ../system-config-printer.glade.h:50
+ #: ../system-config-printer.glade.h:49
msgid "Allow remote administration"
-msgstr "РазÑеÑиÑÑ Ñдаленное ÑпÑавление"
+msgstr "РазÑеÑиÑÑ ÑдалÑнное ÑпÑавление"
- #: ../system-config-printer.glade.h:51
+ #: ../system-config-printer.glade.h:50
msgid "Allow users to cancel any job (not just their own)"
--msgstr ""
--"РазÑеÑиÑÑ Ð¿Ð¾Ð»ÑзоваÑелÑм ÑнимаÑÑ Ð»ÑбÑе Ð·Ð°Ð´Ð°Ð½Ð¸Ñ (не ÑолÑко Ñвои ÑобÑÑвеннÑе)"
-+msgstr "РазÑеÑиÑÑ Ð¿Ð¾Ð»ÑзоваÑелÑм ÑнимаÑÑ Ð»ÑбÑе Ð·Ð°Ð´Ð°Ð½Ð¸Ñ (не ÑолÑко Ñвои ÑобÑÑвеннÑе)"
-
- #: ../system-config-printer.glade.h:52
--#, fuzzy
- msgid "Authentication required"
--msgstr "<b>ÐÑовеÑка подлинноÑÑи</b>"
-+msgstr "ТÑебÑеÑÑÑ Ð¿ÑовеÑка подлинноÑÑи"
-
- #: ../system-config-printer.glade.h:53
- msgid "Baud Rate"
-@@ -1056,7 +1027,7 @@
+@@ -961,7 +937,7 @@
+
+ #: ../system-config-printer.glade.h:55
+ msgid "Browse..."
+-msgstr ""
++msgstr "ÐбзоÑ..."
#: ../system-config-printer.glade.h:56
- msgid "Browse..."
--msgstr ""
-+msgstr "ÐбзоÑ..."
-
- #: ../system-config-printer.glade.h:57
msgid "CUPS server:"
-@@ -1073,25 +1044,23 @@
+@@ -978,16 +954,15 @@
#. Not more than 25 characters
+ #: ../system-config-printer.glade.h:60
+ msgid "Clean Print Heads"
+-msgstr ""
++msgstr "ÐÑиÑÑка пеÑаÑаÑÑиÑ
головок"
+
#: ../system-config-printer.glade.h:61
- msgid "Clean Print Heads"
--msgstr ""
-+msgstr "ÐÑиÑÑка пеÑаÑаÑÑиÑ
головок"
-
- #: ../system-config-printer.glade.h:62
msgid "Columns:"
-msgstr "СÑолбÑÑ: "
+msgstr "СÑолбÑÑ:"
- #: ../system-config-printer.glade.h:63
+ #: ../system-config-printer.glade.h:62
-#, fuzzy
msgid "Comments..."
-msgstr "ÐомменÑаÑий"
+msgstr "ÐомменÑаÑии..."
- #: ../system-config-printer.glade.h:64
+ #: ../system-config-printer.glade.h:63
msgid "Connect to CUPS server"
- msgstr "ÐодклÑÑение к CUPS ÑеÑвеÑÑ"
-
- #: ../system-config-printer.glade.h:65
--#, fuzzy
- msgid "Connect to a different print server"
--msgstr "ÐодклÑÑение к CUPS ÑеÑвеÑÑ"
-+msgstr "ÐодклÑÑение к дÑÑÐ³Ð¾Ð¼Ñ ÑеÑвеÑÑ Ð¿ÐµÑаÑи"
-
- #: ../system-config-printer.glade.h:66
- msgid "Connecting"
-@@ -1115,28 +1084,20 @@
- msgstr "ÐопиÑование пÑинÑеÑа"
-
- #: ../system-config-printer.glade.h:73
--#, fuzzy
- msgid "Copy this printer queue"
--msgstr "ÐопиÑование пÑинÑеÑа"
-+msgstr "ÐопиÑование ÑÑой оÑеÑеди пÑинÑеÑа"
-
- #: ../system-config-printer.glade.h:74
--#, fuzzy
- msgid "Copyright © 2006-2007 Red Hat, Inc."
+@@ -1017,7 +992,7 @@
+ #: ../system-config-printer.glade.h:71
+ #, fuzzy
+ msgid "Copyright © 2006-2008 Red Hat, Inc."
-msgstr "Copyright 2006, 2007 Red Hat, Inc."
+msgstr "Copyright © 2006-2007 Red Hat, Inc."
- #: ../system-config-printer.glade.h:75
--#, fuzzy
- msgid "Create a new printer group"
--msgstr ""
--"ÐÑÐ´ÐµÑ Ñоздан новÑй пÑинÑÐµÑ %s Ñ Ð¿Ð¾Ð´ÐºÐ»ÑÑением\n"
--"%s.\n"
-+msgstr "Создание новой гÑÑÐ¿Ð¿Ñ Ð¿ÑинÑеÑа"
-
- #: ../system-config-printer.glade.h:76
--#, fuzzy
- msgid "Create a new printer queue"
--msgstr ""
--"ÐÑÐ´ÐµÑ Ñоздан новÑй пÑинÑÐµÑ %s Ñ Ð¿Ð¾Ð´ÐºÐ»ÑÑением\n"
--"%s.\n"
-+msgstr "Создание новой оÑеÑеди пÑинÑеÑа"
-
- #: ../system-config-printer.glade.h:77
- msgid "Data Bits"
-@@ -1183,8 +1144,8 @@
+ #: ../system-config-printer.glade.h:72
+ msgid ""
+@@ -1069,8 +1044,8 @@
msgstr ""
"Ðо ÑмолÑаниÑ\n"
"ÐеÑ\n"
@@ -969,192 +651,153 @@
+"ÐеÑÑÑнÑй\n"
+"ЧÑÑнÑй"
- #: ../system-config-printer.glade.h:94
- msgid ""
-@@ -1201,17 +1162,16 @@
- "DTR/DSR (аппаÑаÑное)"
-
- #: ../system-config-printer.glade.h:99
--#, fuzzy
- msgid "Default Printer:"
--msgstr "СделаÑÑ Ð¿ÑинÑеÑом по ÑмолÑаниÑ"
-+msgstr "ÐÑинÑÐµÑ Ð¿Ð¾ ÑмолÑаниÑ:"
-
- #: ../system-config-printer.glade.h:100
- msgid "Delete this printer queue"
--msgstr ""
-+msgstr "УдалиÑÑ ÑÑÑ Ð¾ÑеÑÐµÐ´Ñ Ð¿ÑинÑеÑа"
-
- #: ../system-config-printer.glade.h:101
+ #: ../system-config-printer.glade.h:90
+ msgid ""
+@@ -1088,7 +1063,7 @@
+
+ #: ../system-config-printer.glade.h:95
msgid "Deny printing for everyone except these users:"
-msgstr "ÐапÑеÑиÑÑ Ð¿ÐµÑаÑÑ Ð²Ñем кÑоме ÑказаннÑÑ
полÑзоваÑелей:"
+msgstr "ÐапÑеÑиÑÑ Ð¿ÐµÑаÑÑ Ð²Ñем, кÑоме ÑказаннÑÑ
полÑзоваÑелей:"
- #: ../system-config-printer.glade.h:102
+ #: ../system-config-printer.glade.h:96
msgid "Description:"
-@@ -1219,7 +1179,7 @@
-
- #: ../system-config-printer.glade.h:103
+@@ -1096,7 +1071,7 @@
+
+ #: ../system-config-printer.glade.h:97 ../troubleshoot/DeviceListed.py:40
msgid "Device URI"
-msgstr "URI адÑÐµÑ ÑÑÑÑойÑÑва"
+msgstr "URI ÑÑÑÑойÑÑва"
- #: ../system-config-printer.glade.h:104
+ #: ../system-config-printer.glade.h:98
msgid "Device URI:"
-@@ -1234,9 +1194,8 @@
+@@ -1111,14 +1086,13 @@
msgstr "DirectJet"
- #: ../system-config-printer.glade.h:108
+ #: ../system-config-printer.glade.h:102
-#, fuzzy
msgid "Driver details"
-msgstr "ÐÑайвеÑа"
+msgstr "РдÑайвеÑе"
- #: ../system-config-printer.glade.h:109
+ #: ../system-config-printer.glade.h:103
+ #, fuzzy
+ msgid "E_nable"
+-msgstr "РазÑеÑен"
++msgstr "ÐклÑÑÑн"
+
+ #: ../system-config-printer.glade.h:104
msgid "Empty"
-@@ -1244,7 +1203,7 @@
-
- #: ../system-config-printer.glade.h:110
+@@ -1126,7 +1100,7 @@
+
+ #: ../system-config-printer.glade.h:105
msgid "Enabled"
-msgstr "РазÑеÑен"
+msgstr "ÐклÑÑÑн"
- #: ../system-config-printer.glade.h:111
+ #: ../system-config-printer.glade.h:106
msgid "Ending Banner:"
-@@ -1252,15 +1211,15 @@
-
- #: ../system-config-printer.glade.h:112
- msgid "Enter some search terms for the model of your printer."
--msgstr ""
-+msgstr "ÐведиÑе неÑколÑко Ñлов Ð´Ð»Ñ Ð¿Ð¾Ð¸Ñка, опиÑÑваÑÑиÑ
Ð¼Ð¾Ð´ÐµÐ»Ñ Ð²Ð°Ñего пÑинÑеÑа."
-
- #: ../system-config-printer.glade.h:113
+@@ -1134,11 +1108,11 @@
+
+ #: ../system-config-printer.glade.h:107
msgid "Error Policy: \t"
-msgstr "ÐолиÑика оÑибок: \t"
+msgstr "ÐÑи оÑибке: \t"
- #: ../system-config-printer.glade.h:114
+ #: ../system-config-printer.glade.h:108
msgid "Find _Queue..."
-msgstr ""
+msgstr "ÐоиÑк оÑеÑеди..."
- #: ../system-config-printer.glade.h:115
+ #: ../system-config-printer.glade.h:109
msgid "Finishings:"
-@@ -1271,13 +1230,12 @@
- msgstr "УпÑавление поÑоком"
-
- #: ../system-config-printer.glade.h:117
--msgid ""
--"For the printer you have selected there are drivers available for download."
--msgstr ""
-+msgid "For the printer you have selected there are drivers available for download."
+@@ -1151,20 +1125,19 @@
+ #: ../system-config-printer.glade.h:111
+ msgid ""
+ "For the printer you have selected there are drivers available for download."
+-msgstr ""
+msgstr "ÐÐ»Ñ Ð²ÑбÑанного вами пÑинÑеÑа еÑÑÑ Ð´ÑайвеÑÑ, коÑоÑÑе можно загÑÑзиÑÑ."
- #: ../system-config-printer.glade.h:118
+ #: ../system-config-printer.glade.h:112
msgid "Gamma:"
-msgstr "ÐонÑÑÑаÑÑ:"
+msgstr "Ðамма:"
- #: ../system-config-printer.glade.h:119
- msgid "Goto Server"
-@@ -1285,12 +1243,11 @@
-
- #: ../system-config-printer.glade.h:120
+ #: ../system-config-printer.glade.h:113
msgid "Hold until:"
-msgstr ""
+msgstr "ÐеÑжаÑÑ Ð´Ð¾:"
- #: ../system-config-printer.glade.h:121
+ #: ../system-config-printer.glade.h:114
-#, fuzzy
msgid "Host:"
-msgstr "ÐÐ¼Ñ Ñзла"
+msgstr "ÐÐ¼Ñ Ñзла:"
- #: ../system-config-printer.glade.h:122
+ #: ../system-config-printer.glade.h:115
msgid "Hue adjustment:"
-@@ -1310,12 +1267,11 @@
-
- #: ../system-config-printer.glade.h:126
+@@ -1184,12 +1157,11 @@
+
+ #: ../system-config-printer.glade.h:119
msgid "IPP Browser"
-msgstr ""
+msgstr "IPP бÑаÑзеÑ"
- #: ../system-config-printer.glade.h:127
+ #: ../system-config-printer.glade.h:120
-#, fuzzy
msgid "Installed Options"
-msgstr "УÑÑанавливаемÑе возможноÑÑи"
+msgstr "УÑÑановленнÑе паÑамеÑÑÑ"
- #: ../system-config-printer.glade.h:128
+ #: ../system-config-printer.glade.h:121
msgid "Job Options"
-@@ -1355,16 +1311,15 @@
-
- #: ../system-config-printer.glade.h:140
+@@ -1229,16 +1201,15 @@
+
+ #: ../system-config-printer.glade.h:133
msgid "License:"
-msgstr ""
+msgstr "ÐиÑензиÑ:"
- #: ../system-config-printer.glade.h:141
+ #: ../system-config-printer.glade.h:134
msgid "Lines per inch:"
msgstr "Ðиний на дÑйм:"
- #: ../system-config-printer.glade.h:142
+ #: ../system-config-printer.glade.h:135
-#, fuzzy
msgid "Local Driver"
-msgstr "ÐокалÑнÑе пÑинÑеÑÑ"
+msgstr "ÐокалÑнÑй дÑайвеÑ"
- #: ../system-config-printer.glade.h:143
+ #: ../system-config-printer.glade.h:136
msgid "Location:"
-@@ -1372,25 +1327,24 @@
-
- #. Not more than 25 characters
- #: ../system-config-printer.glade.h:145
--#, fuzzy
- msgid "Make Default"
--msgstr "по ÑмолÑаниÑ"
-+msgstr "ÐÑбÑаÑÑ Ð¿Ð¾ ÑмолÑаниÑ"
-
- #: ../system-config-printer.glade.h:146
- msgid "Make and Model:"
- msgstr "ÐÑоизводиÑÐµÐ»Ñ Ð¸ моделÑ:"
-
- #: ../system-config-printer.glade.h:147
--#, fuzzy
- msgid ""
- "May contain any printable characters except \"/\", \"#\", and space.\n"
- "Name must be unique on the local machine!"
- msgstr ""
--"ÐÐ¾Ð¶ÐµÑ Ð²ÐºÐ»ÑÑаÑÑ Ð»ÑбÑе пеÑаÑнÑе ÑимволÑ, за иÑклÑÑением \"/\", \"#\" и пÑобела"
-+"ÐÐ¾Ð¶ÐµÑ Ð²ÐºÐ»ÑÑаÑÑ Ð»ÑбÑе пеÑаÑнÑе ÑимволÑ, за иÑклÑÑением \"/\", \"#\" и пÑобела.\n"
-+"ÐÐ¼Ñ Ð´Ð¾Ð»Ð¶Ð½Ð¾ бÑÑÑ ÑникалÑнÑм в пÑеделаÑ
локалÑной маÑинÑ!"
-
- #: ../system-config-printer.glade.h:149
+@@ -1255,7 +1226,7 @@
+
+ #: ../system-config-printer.glade.h:139
msgid "Media:"
-msgstr "ÐоÑиÑелÑ:"
+msgstr "ÐÑмага:"
- #: ../system-config-printer.glade.h:150
+ #: ../system-config-printer.glade.h:140
msgid "Members"
-@@ -1402,7 +1356,7 @@
-
- #: ../system-config-printer.glade.h:152
+@@ -1267,7 +1238,7 @@
+
+ #: ../system-config-printer.glade.h:142
msgid "More"
-msgstr "ÐÑе"
+msgstr "ÐÑÑ"
- #: ../system-config-printer.glade.h:153
+ #: ../system-config-printer.glade.h:143
msgid "New Clas_s"
-@@ -1418,7 +1372,7 @@
-
- #: ../system-config-printer.glade.h:158
+@@ -1283,7 +1254,7 @@
+
+ #: ../system-config-printer.glade.h:147
msgid "No, I do not accept this license"
-msgstr ""
+msgstr "ÐеÑ, Ñ Ð½Ðµ ÑоглаÑен Ñ Ð»Ð¸Ñензией"
- #: ../system-config-printer.glade.h:159
- msgid ""
-@@ -1456,8 +1410,8 @@
+ #: ../system-config-printer.glade.h:148
+ msgid ""
+@@ -1321,8 +1292,8 @@
"СкоÑоÑÑиваÑелÑ\n"
"Ðбложка\n"
"СÑивка\n"
@@ -1165,7 +808,7 @@
"ФалÑÑеваÑÑ\n"
"ÐбÑезка\n"
"СобÑаÑÑ\n"
-@@ -1467,10 +1421,10 @@
+@@ -1332,10 +1303,10 @@
"СÑÐµÐ¿Ð»ÐµÑ (Ð²Ð½Ð¸Ð·Ñ Ñлева)\n"
"СÑÐµÐ¿Ð»ÐµÑ (ввеÑÑ
Ñ ÑпÑава)\n"
"СÑÐµÐ¿Ð»ÐµÑ (Ð²Ð½Ð¸Ð·Ñ ÑпÑава)\n"
@@ -1180,50 +823,50 @@
"ÐÐ²Ð¾Ð¹Ð½Ð°Ñ ÑÑивка (Ñлева)\n"
"ÐÐ²Ð¾Ð¹Ð½Ð°Ñ ÑÑивка (ÑвеÑÑ
Ñ)\n"
"ÐÐ²Ð¾Ð¹Ð½Ð°Ñ ÑÑивка (ÑпÑава)\n"
-@@ -1492,11 +1446,11 @@
-
- #: ../system-config-printer.glade.h:190
+@@ -1357,11 +1328,11 @@
+
+ #: ../system-config-printer.glade.h:179
msgid "Operation Policy:"
-msgstr "ÐолиÑика ÑабоÑÑ:"
+msgstr "ФÑнкÑиониÑование:"
- #: ../system-config-printer.glade.h:191
+ #: ../system-config-printer.glade.h:180
msgid "Orientation:"
-msgstr "РаÑположение:"
+msgstr "ÐÑиенÑаÑиÑ:"
- #: ../system-config-printer.glade.h:192
+ #: ../system-config-printer.glade.h:181
msgid "Pages per side layout:"
-@@ -1504,24 +1458,23 @@
-
- #: ../system-config-printer.glade.h:193
+@@ -1369,24 +1340,23 @@
+
+ #: ../system-config-printer.glade.h:182
msgid "Pages per side:"
-msgstr "СÑÑÐ°Ð½Ð¸Ñ Ð½Ð° лиÑÑе:"
+msgstr "СÑÑÐ°Ð½Ð¸Ñ Ð½Ð° ÑÑоÑоне:"
- #: ../system-config-printer.glade.h:194
+ #: ../system-config-printer.glade.h:183
msgid "Parity"
-msgstr "ЧеÑноÑÑÑ"
+msgstr "ЧÑÑноÑÑÑ"
- #: ../system-config-printer.glade.h:196
+ #: ../system-config-printer.glade.h:185
msgid "Please Wait"
-msgstr ""
+msgstr "ÐодождиÑе"
- #: ../system-config-printer.glade.h:197
+ #: ../system-config-printer.glade.h:186
msgid "Policies"
msgstr "ÐолиÑики"
- #: ../system-config-printer.glade.h:198
+ #: ../system-config-printer.glade.h:187
-#, fuzzy
msgid "Port number:"
-msgstr "ÐÐ¾Ð¼ÐµÑ Ð¿Ð¾ÑÑа"
+msgstr "ÐÐ¾Ð¼ÐµÑ Ð¿Ð¾ÑÑа:"
- #: ../system-config-printer.glade.h:199
- msgid ""
-@@ -1532,18 +1485,17 @@
+ #: ../system-config-printer.glade.h:188
+ msgid ""
+@@ -1397,19 +1367,18 @@
msgstr ""
"ÐÐ½Ð¸Ð¶Ð½Ð°Ñ (без повоÑоÑа)\n"
"ÐлÑÐ±Ð¾Ð¼Ð½Ð°Ñ (90°)\n"
@@ -1232,7 +875,7 @@
+"ÐлÑÐ±Ð¾Ð¼Ð½Ð°Ñ Ð¿ÐµÑевÑÑнÑÑÐ°Ñ (270°)\n"
+"ÐÐ½Ð¸Ð¶Ð½Ð°Ñ Ð¿ÐµÑевÑÑнÑÑÐ°Ñ (180°)"
- #: ../system-config-printer.glade.h:203
+ #: ../system-config-printer.glade.h:192
-#, fuzzy
msgid ""
"PostScript Printer Description (PPD) files can often be found on the driver "
@@ -1241,129 +884,156 @@
msgstr ""
"Ð¤Ð°Ð¹Ð»Ñ Ð¾Ð¿Ð¸Ñаний PostScript пÑинÑеÑов (PostScript Printer Description, PPD) "
-"могÑÑ Ð±ÑÑÑ Ð½Ð°Ð¹Ð´ÐµÐ½Ñ Ð½Ð° диÑке Ñ Ð´ÑайвеÑами из поÑÑавки пÑинÑеÑа. ÐÐ»Ñ "
-+"можно найÑи на диÑке Ñ Ð´ÑайвеÑами из поÑÑавки пÑинÑеÑа. ÐÐ»Ñ "
- "PostScript пÑинÑеÑов они ÑаÑÑо вÑ
одÑÑ Ð² ÑоÑÑав Windows<sup>®</sup> дÑайвеÑа."
-
- #: ../system-config-printer.glade.h:204
-@@ -1552,35 +1504,32 @@
+-"PostScript пÑинÑеÑов они ÑаÑÑо вÑ
одÑÑ Ð² ÑоÑÑав Windows<sup>®</sup> дÑайвеÑа."
++"можно найÑи на диÑке Ñ Ð´ÑайвеÑами из поÑÑавки пÑинÑеÑа. ÐÐ»Ñ PostScript "
++"пÑинÑеÑов они ÑаÑÑо вÑ
одÑÑ Ð² ÑоÑÑав Windows<sup>®</sup> дÑайвеÑа."
+
+ #: ../system-config-printer.glade.h:193
+ msgid "Pretty print"
+@@ -1417,9 +1386,8 @@
#. Not more than 25 characters
- #: ../system-config-printer.glade.h:206
+ #: ../system-config-printer.glade.h:195
-#, fuzzy
msgid "Print Self-Test Page"
-msgstr "ÐапеÑаÑаÑÑ Ð¿ÑобнÑÑ ÑÑÑаниÑÑ"
+msgstr "ÐапеÑаÑаÑÑ ÑÑÑаниÑÑ ÑамоÑеÑÑиÑованиÑ"
- #: ../system-config-printer.glade.h:210
+ #. Not more than 25 characters
+ #: ../system-config-printer.glade.h:197 ../troubleshoot/PrintTestPage.py:68
+@@ -1429,16 +1397,15 @@
+ #: ../system-config-printer.glade.h:199
+ #, fuzzy
+ msgid "Printer Properties"
+-msgstr "ÐÑÑÐµÑ Ð¿ÑинÑеÑа"
++msgstr "ÐÑÑÑÑ Ð¿ÑинÑеÑа"
+
+ #: ../system-config-printer.glade.h:200
msgid "Printer State:"
msgstr "СоÑÑоÑние пÑинÑеÑа:"
- #: ../system-config-printer.glade.h:211
+ #: ../system-config-printer.glade.h:201
-#, fuzzy
msgid "Printer model:"
-msgstr "ÐÐ¼Ñ Ð¿ÑинÑеÑа"
+msgstr "ÐÐ¾Ð´ÐµÐ»Ñ Ð¿ÑинÑеÑа:"
- #: ../system-config-printer.glade.h:212
+ #: ../system-config-printer.glade.h:202
msgid "Probe"
- msgstr "ÐопÑобоваÑÑ"
-
- #: ../system-config-printer.glade.h:213
+@@ -1447,16 +1414,15 @@
+ #: ../system-config-printer.glade.h:203
+ #, fuzzy
+ msgid "Prompt user if authentication is required"
+-msgstr "<b>ÐÑовеÑка подлинноÑÑи</b>"
++msgstr "ТÑебÑеÑÑÑ Ð¿ÑовеÑка подлинноÑÑи"
+
+ #: ../system-config-printer.glade.h:204
-#, fuzzy
msgid "Provide PPD file"
msgstr "УкажиÑе PPD Ñайл"
- #: ../system-config-printer.glade.h:214
+ #: ../system-config-printer.glade.h:205
msgid "Queue:"
-msgstr ""
+msgstr "ÐÑеÑедÑ:"
- #: ../system-config-printer.glade.h:215
- msgid "Refresh the list of printer queues"
--msgstr ""
-+msgstr "ÐбновиÑÑ ÑпиÑок пÑинÑеÑнÑÑ
оÑеÑедей"
-
- #: ../system-config-printer.glade.h:216
+ #: ../system-config-printer.glade.h:206
msgid "Require encryption"
-@@ -1592,7 +1541,7 @@
-
- #: ../system-config-printer.glade.h:218
+@@ -1468,7 +1434,7 @@
+
+ #: ../system-config-printer.glade.h:208
msgid "Reset to system default"
-msgstr "УÑÑановиÑÑ Ð¿Ð¾ ÑмолÑаниÑ"
+msgstr "УÑÑановиÑÑ Ð² ÑиÑÑемное знаÑение по ÑмолÑаниÑ"
- #: ../system-config-printer.glade.h:219
+ #: ../system-config-printer.glade.h:209
msgid "Right margin:"
-@@ -1608,7 +1557,7 @@
-
- #: ../system-config-printer.glade.h:222
+@@ -1484,7 +1450,7 @@
+
+ #: ../system-config-printer.glade.h:212
msgid "SMB Browser"
-msgstr ""
+msgstr "SMB бÑаÑзеÑ"
- #: ../system-config-printer.glade.h:223
+ #: ../system-config-printer.glade.h:213
msgid "Saturation:"
-@@ -1628,19 +1577,17 @@
-
- #: ../system-config-printer.glade.h:227
+@@ -1504,14 +1470,13 @@
+
+ #: ../system-config-printer.glade.h:217
msgid "Search for a printer driver to download"
-msgstr ""
+msgstr "ÐоиÑк загÑÑжаемого дÑайвеÑа пÑинÑеÑа"
- #: ../system-config-printer.glade.h:228
--#, fuzzy
- msgid "Search terms:"
--msgstr "Ðовое Ð¸Ð¼Ñ Ð¿ÑинÑеÑа"
-+msgstr "Слова Ð´Ð»Ñ Ð¿Ð¾Ð¸Ñка:"
-
- #: ../system-config-printer.glade.h:229
+ #: ../system-config-printer.glade.h:218
msgid "Select A File"
msgstr "УкажиÑе Ñайл"
- #: ../system-config-printer.glade.h:230
+ #: ../system-config-printer.glade.h:219
-#, fuzzy
msgid "Select printer from database"
msgstr "ÐÑбеÑиÑе пÑинÑÐµÑ Ð¸Ð· Ð±Ð°Ð·Ñ Ð´Ð°Ð½Ð½ÑÑ
"
-@@ -1654,8 +1601,7 @@
-
- #: ../system-config-printer.glade.h:233
+@@ -1522,17 +1487,17 @@
+ #: ../system-config-printer.glade.h:221
+ #, fuzzy
+ msgid "Set As De_fault"
+-msgstr "по ÑмолÑаниÑ"
++msgstr "Ðо ÑмолÑаниÑ"
+
+ #: ../system-config-printer.glade.h:222
+ #, fuzzy
+ msgid "Set As Default"
+-msgstr "по ÑмолÑаниÑ"
++msgstr "Ðо ÑмолÑаниÑ"
+
+ #: ../system-config-printer.glade.h:223
+ #, fuzzy
+ msgid "Set authentication details now"
+-msgstr "<b>ÐÑовеÑка подлинноÑÑи</b>"
++msgstr "ТÑебÑеÑÑÑ Ð¿ÑовеÑка подлинноÑÑи"
+
+ #: ../system-config-printer.glade.h:224
+ msgid "Settings"
+@@ -1541,7 +1506,7 @@
+ #: ../system-config-printer.glade.h:225
msgid "Share published printers connected to this system"
--msgstr ""
+ msgstr ""
-"ÐÑкÑÑваÑÑ Ð´Ð¾ÑÑÑп к опÑбликованнÑм пÑинÑеÑам, подклÑÑеннÑм к ÑÑой ÑиÑÑеме"
-+msgstr "ÐÑкÑÑваÑÑ Ð´Ð¾ÑÑÑп к опÑбликованнÑм пÑинÑеÑам, подклÑÑÑннÑм к ÑÑой ÑиÑÑеме"
-
- #: ../system-config-printer.glade.h:234
++"ÐÑкÑÑваÑÑ Ð´Ð¾ÑÑÑп к опÑбликованнÑм пÑинÑеÑам, подклÑÑÑннÑм к ÑÑой ÑиÑÑеме"
+
+ #: ../system-config-printer.glade.h:226
msgid "Shared"
-@@ -1663,7 +1609,7 @@
-
- #: ../system-config-printer.glade.h:235
+@@ -1553,7 +1518,7 @@
+
+ #: ../system-config-printer.glade.h:228
msgid "Show printers shared by other systems"
-msgstr "ÐоказÑваÑÑ Ð¿ÑинÑеÑÑ, оÑкÑÑÑÑе в ÑовмеÑÑнÑй доÑÑÑп дÑÑгими ÑиÑÑемами"
+msgstr "ÐоказÑваÑÑ Ð¿ÑинÑеÑÑ, доÑÑÑпнÑе Ñ Ð´ÑÑгиÑ
маÑин"
- #: ../system-config-printer.glade.h:236
+ #: ../system-config-printer.glade.h:229
msgid "Sides:"
-@@ -1676,15 +1622,15 @@
+@@ -1565,16 +1530,16 @@
+ "print server will have these options added if they are not already set by "
"the application."
msgstr ""
- "УкажиÑе паÑамеÑÑÑ Ð·Ð°Ð´Ð°Ñ Ð¿ÑинÑеÑа по ÑмолÑаниÑ. ÐадаÑи, пÑиÑ
одÑÑие на "
+-"УкажиÑе паÑамеÑÑÑ Ð·Ð°Ð´Ð°Ñ Ð¿ÑинÑеÑа по ÑмолÑаниÑ. ÐадаÑи, пÑиÑ
одÑÑие на "
-"пÑинÑÑеÑÐ²ÐµÑ Ð±ÑдÑÑ Ð¸Ð¼ÐµÑÑ ÑÑи паÑамеÑÑÑ, еÑли они не Ð·Ð°Ð´Ð°Ð½Ñ Ð¿Ñиложением."
-+"ÑеÑÐ²ÐµÑ Ð¿ÐµÑаÑи бÑдÑÑ Ð¸Ð¼ÐµÑÑ ÑÑи паÑамеÑÑÑ, еÑли они не Ð·Ð°Ð´Ð°Ð½Ñ Ð¿Ñиложением."
-
- #: ../system-config-printer.glade.h:238
++"УкажиÑе паÑамеÑÑÑ Ð·Ð°Ð´Ð°Ñ Ð¿ÑинÑеÑа по ÑмолÑаниÑ. ÐадаÑи, пÑиÑ
одÑÑие на ÑеÑÐ²ÐµÑ "
++"пеÑаÑи бÑдÑÑ Ð¸Ð¼ÐµÑÑ ÑÑи паÑамеÑÑÑ, еÑли они не Ð·Ð°Ð´Ð°Ð½Ñ Ð¿Ñиложением."
+
+ #: ../system-config-printer.glade.h:231
msgid "Starting Banner:"
-msgstr "СÑаÑÑовÑй ÑазделиÑелÑ:"
+msgstr "ÐаÑалÑнÑй ÑазделиÑелÑ:"
- #: ../system-config-printer.glade.h:239
+ #: ../system-config-printer.glade.h:232
msgid "Supplier:"
-msgstr ""
+msgstr "ÐоÑÑавÑик:"
- #: ../system-config-printer.glade.h:240
+ #: ../system-config-printer.glade.h:233
msgid "System-Config-Printer"
-@@ -1699,9 +1645,9 @@
+@@ -1589,9 +1554,9 @@
"printer."
msgstr ""
"Ðаза пÑинÑеÑов foomatic ÑодеÑÐ¶Ð¸Ñ ÑазлиÑнÑе PPD ÑÐ°Ð¹Ð»Ñ Ð¾Ð¿Ð¸Ñаний PostScript "
@@ -1374,26 +1044,25 @@
+"пÑоизводиÑÐµÐ»Ñ Ð¾Ð±ÐµÑпеÑиваÑÑ ÑлÑÑÑеннÑй доÑÑÑп к ÑпеÑиÑиÑеÑким возможноÑÑÑм "
"пÑинÑеÑа."
- #: ../system-config-printer.glade.h:242
-@@ -1710,12 +1656,17 @@
+ #: ../system-config-printer.glade.h:235
+@@ -1600,12 +1565,16 @@
"be covered by their commercial support. See the support and license terms "
"of the driver's supplier."
msgstr ""
-+"ÐÑи дÑайвеÑÑ Ð½Ðµ ÑвлÑÑÑÑÑ ÑаÑÑÑÑ Ð²Ð°Ñей опеÑаÑионной ÑиÑÑемÑ, и Ð´Ð»Ñ "
-+"ниÑ
Ð½ÐµÑ ÐºÐ¾Ð¼Ð¼ÐµÑÑеÑкой поддеÑжки Ð¾Ñ Ð¿Ð¾ÑÑавÑика ÐС. РподдеÑжке и "
-+"лиÑензионном ÑоглаÑении ÑпÑаÑивайÑе Ñ Ð¿Ð¾ÑÑавÑика дÑайвеÑа."
-
- #: ../system-config-printer.glade.h:243
++"ÐÑи дÑайвеÑÑ Ð½Ðµ ÑвлÑÑÑÑÑ ÑаÑÑÑÑ Ð²Ð°Ñей опеÑаÑионной ÑиÑÑемÑ, и Ð´Ð»Ñ Ð½Ð¸Ñ
Ð½ÐµÑ "
++"коммеÑÑеÑкой поддеÑжки Ð¾Ñ Ð¿Ð¾ÑÑавÑика ÐС. РподдеÑжке и лиÑензионном "
++"ÑоглаÑении ÑпÑаÑивайÑе Ñ Ð¿Ð¾ÑÑавÑика дÑайвеÑа."
+
+ #: ../system-config-printer.glade.h:236
msgid ""
"This driver supports additional hardware that may be installed in the "
"printer."
msgstr ""
-+"ÐÑÐ¾Ñ Ð´ÑÐ°Ð¹Ð²ÐµÑ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÑ Ð½Ð°ÑÑÑойки дополниÑелÑнÑÑ
"
-+"возможноÑÑей пÑинÑеÑа."
-
- #: ../system-config-printer.glade.h:244
- msgid ""
-@@ -1744,13 +1695,26 @@
++"ÐÑÐ¾Ñ Ð´ÑÐ°Ð¹Ð²ÐµÑ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÑ Ð½Ð°ÑÑÑойки дополниÑелÑнÑÑ
возможноÑÑей пÑинÑеÑа."
+
+ #: ../system-config-printer.glade.h:237
+ msgid ""
+@@ -1634,13 +1603,26 @@
"this program; if not, write to the Free Software Foundation, Inc., 675 Mass "
"Ave, Cambridge, MA 02139, USA."
msgstr ""
@@ -1411,7 +1080,7 @@
+"this program; if not, write to the Free Software Foundation, Inc., 675 Mass "
+"Ave, Cambridge, MA 02139, USA."
- #: ../system-config-printer.glade.h:250
+ #: ../system-config-printer.glade.h:243
msgid ""
"This way all current option settings will be lost. The default settings of "
"the new PPD will be used. "
@@ -1420,94 +1089,98 @@
+"Таким обÑазом, вÑе ÑекÑÑие наÑÑÑойки паÑамеÑÑов бÑдÑÑ Ð¿Ð¾ÑеÑÑнÑ. ÐÑдÑÑ "
"иÑполÑÐ·Ð¾Ð²Ð°Ð½Ñ ÑÑандаÑÑнÑе наÑÑÑойки нового опиÑÐ°Ð½Ð¸Ñ PPD. "
- #: ../system-config-printer.glade.h:251
-@@ -1769,11 +1733,11 @@
-
- #: ../system-config-printer.glade.h:254
+ #: ../system-config-printer.glade.h:244
+@@ -1659,11 +1641,11 @@
+
+ #: ../system-config-printer.glade.h:247
msgid "URI:"
-msgstr ""
+msgstr "URI:"
- #: ../system-config-printer.glade.h:255
+ #: ../system-config-printer.glade.h:248
msgid "Use the new PPD (Postscript Printer Description) as is."
-msgstr "ÐÑполÑзоваÑÑ Ð½Ð¾Ð²Ñй PPD (ÐпиÑание PostScript пÑинÑеÑа) как еÑÑÑ."
+msgstr "ÐÑполÑзоваÑÑ Ð½Ð¾Ð²Ñй PPD (опиÑание PostScript пÑинÑеÑа) как еÑÑÑ."
- #: ../system-config-printer.glade.h:256
- msgid "User name:"
-@@ -1788,15 +1752,16 @@
+ #: ../system-config-printer.glade.h:250
+ #, fuzzy
+@@ -1675,15 +1657,16 @@
"With this choice no driver download will be performed. In the next steps a "
"locally installed driver will be selected."
msgstr ""
-+"СоглаÑно вÑбоÑÑ, загÑÑзка дÑайвеÑа вÑполнÑÑÑÑÑ Ð½Ðµ бÑдеÑ. Ðа ÑледÑÑÑиÑ
"
-+"ÑÑапаÑ
бÑÐ´ÐµÑ Ð¿Ñедложено вÑбÑаÑÑ Ð´ÑÐ°Ð¹Ð²ÐµÑ Ð¸Ð· имеÑÑиÑ
ÑÑ Ð² пакеÑе."
-
- #: ../system-config-printer.glade.h:259
++"СоглаÑно вÑбоÑÑ, загÑÑзка дÑайвеÑа вÑполнÑÑÑÑÑ Ð½Ðµ бÑдеÑ. Ðа ÑледÑÑÑиÑ
ÑÑапаÑ
"
++"бÑÐ´ÐµÑ Ð¿Ñедложено вÑбÑаÑÑ Ð´ÑÐ°Ð¹Ð²ÐµÑ Ð¸Ð· имеÑÑиÑ
ÑÑ Ð² пакеÑе."
+
+ #: ../system-config-printer.glade.h:252
msgid "Word wrap"
msgstr "ÐеÑÐµÐ½Ð¾Ñ Ñлов"
- #: ../system-config-printer.glade.h:260
+ #: ../system-config-printer.glade.h:253
-#, fuzzy
msgid "Yes, I accept this license"
-msgstr "ÐÑÐ¸Ð½Ð¸Ð¼Ð°ÐµÑ Ð·Ð°Ð´Ð°Ð½Ð¸Ñ"
+msgstr "Ðа, Ñ ÑоглаÑен Ñ Ð»Ð¸Ñензией"
+ #: ../system-config-printer.glade.h:254
+ #, fuzzy
+@@ -1693,12 +1676,12 @@
+ #: ../system-config-printer.glade.h:255
+ #, fuzzy
+ msgid "_Create Class"
+-msgstr "УдаленнÑе клаÑÑÑ"
++msgstr "УдалÑннÑе клаÑÑÑ"
+
+ #: ../system-config-printer.glade.h:256
+ #, fuzzy
+ msgid "_Disable"
+-msgstr "_Файл"
++msgstr "РаÑпÑоÑÑÑанÑем"
+
+ #: ../system-config-printer.glade.h:257
+ msgid "_Do not apply"
+@@ -1718,7 +1701,7 @@
+
#: ../system-config-printer.glade.h:261
- msgid "_Do not apply"
-@@ -1812,7 +1777,7 @@
+ msgid "_Install"
+-msgstr ""
++msgstr "_УÑÑановка"
+
+ #: ../system-config-printer.glade.h:262
+ #, fuzzy
+@@ -1727,7 +1710,7 @@
+
+ #: ../system-config-printer.glade.h:263
+ msgid "_Search"
+-msgstr ""
++msgstr "Ðо_иÑк"
#: ../system-config-printer.glade.h:264
- msgid "_Goto Server"
--msgstr "_ÐеÑейÑи к ÑеÑвеÑÑ"
-+msgstr "ÐеÑейÑи к ÑеÑвеÑÑ"
+ #, fuzzy
+@@ -1736,11 +1719,11 @@
#: ../system-config-printer.glade.h:265
- msgid "_Help"
-@@ -1820,19 +1785,19 @@
+ msgid "_Troubleshoot"
+-msgstr ""
++msgstr "РеÑение пÑоблем"
#: ../system-config-printer.glade.h:266
- msgid "_Install"
--msgstr ""
-+msgstr "_УÑÑановка"
-
- #: ../system-config-printer.glade.h:267
- msgid "_Search"
--msgstr ""
-+msgstr "Ðо_иÑк"
-
- #: ../system-config-printer.glade.h:268
- msgid "_Troubleshoot"
--msgstr ""
-+msgstr "РеÑение пÑоблем"
-
- #: ../system-config-printer.glade.h:269
msgid "_Verify..."
-msgstr "_ÐÑовеÑиÑÑ..."
+msgstr "ÐÑовеÑиÑÑ..."
+ #: ../system-config-printer.glade.h:267
+ msgid "default"
+@@ -1755,14 +1738,19 @@
+ msgstr "ÑоÑек"
+
#: ../system-config-printer.glade.h:270
- msgid "default"
-@@ -1847,21 +1812,27 @@
- msgstr "ÑоÑек"
-
- #: ../system-config-printer.glade.h:273
--#, fuzzy
- msgid ""
- "points\n"
- "(72 points per inch)"
--msgstr "ÑоÑек (72 ÑоÑки на дÑйм)"
-+msgstr ""
-+"ÑоÑек\n"
-+"(72 ÑоÑки на дÑйм)"
-
- #: ../system-config-printer.glade.h:275
-#, fuzzy
msgid "system-config-printer"
-msgstr "System-Config-Printer"
+msgstr "system-config-printer"
#. TRANSLATORS: Replace this string with your names, one name per line. Thank you very much for your effort on translating system-config-printer and all our other tools!
- #: ../system-config-printer.glade.h:277
+ #: ../system-config-printer.glade.h:272
msgid "translator-credits"
msgstr ""
+"Leonid Kanter <leon at geon.donetsk.ua>, 2003.\n"
@@ -1519,116 +1192,477 @@
#: ../system-config-printer.desktop.in.h:1
msgid "Configure printers"
-@@ -1882,7 +1853,7 @@
-
- #: ../applet.py:82
+@@ -1783,7 +1771,7 @@
+
+ #: ../statereason.py:87
msgid "Toner empty"
-msgstr "Ð¢Ð¾Ð½ÐµÑ Ð·Ð°ÐºÐ¾Ð½ÑилÑÑ"
+msgstr "ÐаконÑилÑÑ ÑонеÑ"
- #: ../applet.py:83
+ #: ../statereason.py:88
#, python-format
-@@ -1936,7 +1907,7 @@
-
- #: ../applet.py:94
+@@ -1837,7 +1825,7 @@
+
+ #: ../statereason.py:99
msgid "Ink empty"
-msgstr "ЧеÑнила законÑилиÑÑ."
+msgstr "ЧеÑнила законÑилиÑÑ"
- #: ../applet.py:95
+ #: ../statereason.py:100
#, python-format
-@@ -1945,16 +1916,16 @@
-
- #: ../applet.py:96
+@@ -1847,7 +1835,7 @@
+ #: ../statereason.py:101
+ #, fuzzy
+ msgid "Printer off-line"
+-msgstr "ÐаÑамеÑÑÑ Ð¿ÑинÑеÑа"
++msgstr "РазмеÑение пÑинÑеÑа"
+
+ #: ../statereason.py:102
+ #, fuzzy, python-format
+@@ -1856,12 +1844,12 @@
+
+ #: ../statereason.py:103
msgid "Not connected?"
-msgstr "Ðе подклÑÑен?"
+msgstr "Ðе подклÑÑÑн?"
- #: ../applet.py:97
+ #: ../statereason.py:104
#, python-format
msgid "Printer '%s' may not be connected."
-msgstr "Ðозможно пÑинÑÐµÑ '%s' не подклÑÑен."
+msgstr "Ðозможно пÑинÑÐµÑ '%s' не подклÑÑÑн."
- #: ../applet.py:104
+ #: ../statereason.py:105 ../statereason.py:121
+ msgid "Printer error"
+@@ -1874,7 +1862,7 @@
+
+ #: ../statereason.py:117
msgid "Printer report"
-msgstr "ÐÑÑÐµÑ Ð¿ÑинÑеÑа"
+msgstr "ÐÑÑÑÑ Ð¿ÑинÑеÑа"
- #: ../applet.py:106
+ #: ../statereason.py:119
msgid "Printer warning"
-@@ -2032,50 +2003,44 @@
- msgstr "%d докÑм. в оÑеÑеди"
-
- #: ../applet.py:1026
+@@ -1887,13 +1875,15 @@
+
+ #: ../troubleshoot/__init__.py:53
+ msgid "Printing troubleshooter"
+-msgstr ""
++msgstr "Ðнализ пÑоблем Ñ Ð¿ÐµÑаÑÑÑ"
+
+ #: ../troubleshoot/base.py:26
+ msgid ""
+ "To start this tool, select System->Administration->Printing from the main "
+ "menu."
+ msgstr ""
++"ÐÐ»Ñ Ð·Ð°Ð¿ÑÑка ÑÑого инÑÑÑÑменÑа, вÑбеÑиÑе СиÑÑема->ÐдминиÑÑÑиÑование->ÐеÑаÑÑ "
++"из оÑновного менÑ."
+
+ #: ../troubleshoot/CheckLocalServerPublishing.py:28
+ msgid "Server Not Exporting Printers"
+@@ -1912,9 +1902,8 @@
+ msgstr ""
+
+ #: ../troubleshoot/CheckPPDSanity.py:45 ../applet.py:146
+-#, fuzzy
+ msgid "Install"
+-msgstr "ÐÑÑÑÑÑÑвÑÐµÑ Ð´ÑайвеÑ"
++msgstr "УÑÑановка"
+
+ #: ../troubleshoot/CheckPPDSanity.py:80
+ #, fuzzy
+@@ -1932,38 +1921,35 @@
+ #: ../troubleshoot/CheckPPDSanity.py:95
+ #, fuzzy, python-format
+ msgid "There is a problem with the PPD file for printer `%s'."
+-msgstr "У пÑинÑеÑа '%s' оÑкÑÑÑ Ð»Ð¾Ñок."
++msgstr "ÐÑибка подклÑÑÐµÐ½Ð¸Ñ Ðº ÑеÑвеÑÑ CUPS."
+
+ #: ../troubleshoot/CheckPPDSanity.py:105
+ #, fuzzy
+ msgid "Missing Printer Driver"
+-msgstr "ÐÑÑÑÑÑÑвÑÐµÑ Ð´ÑайвеÑ"
++msgstr "ÐÑÑÑÑÑÑвÑÐµÑ Ð´ÑÐ°Ð¹Ð²ÐµÑ Ð¿ÑинÑеÑа"
+
+ #: ../troubleshoot/CheckPPDSanity.py:108
+ #, fuzzy, python-format
+ msgid "Printer `%s' requires the %s package but it is not currently installed."
+-msgstr ""
+-"ÐÑинÑеÑÑ '%s' необÑ
одим Ð¿Ð°ÐºÐµÑ %s, но он не ÑÑÑановлен. ÐожалÑйÑÑа, "
+-"ÑÑÑановиÑе его пеÑед иÑполÑзованием пÑинÑеÑа."
++msgstr "ÐÑинÑеÑÑ '%s' необÑ
одим Ð¿Ð°ÐºÐµÑ %s, но он не ÑÑÑановлен."
+
+ #: ../troubleshoot/CheckPPDSanity.py:113
+ #, fuzzy, python-format
+ msgid ""
+ "Printer `%s' requires the `%s' program but it is not currently installed."
+-msgstr ""
+-"ÐÑинÑеÑÑ '%s' необÑ
одим Ð¿Ð°ÐºÐµÑ %s, но он не ÑÑÑановлен. ÐожалÑйÑÑа, "
+-"ÑÑÑановиÑе его пеÑед иÑполÑзованием пÑинÑеÑа."
++msgstr "ÐÑинÑеÑÑ '%s' необÑ
одим Ð¿Ð°ÐºÐµÑ %s, но он не ÑÑÑановлен."
+
+ #: ../troubleshoot/ChooseNetworkPrinter.py:29
+-#, fuzzy
+ msgid "Choose Network Printer"
+-msgstr "ÐовÑй пÑинÑеÑ"
++msgstr "ÐÑÐ±Ð¾Ñ ÑеÑевого пÑинÑеÑа"
+
+ #: ../troubleshoot/ChooseNetworkPrinter.py:30
+ msgid ""
+ "Please select the network printer you are trying to use from the list below. "
+ "If it does not appear in the list, select 'Not listed'."
+ msgstr ""
++"Ðз ÑпиÑка ниже вÑбеÑиÑе ÑеÑевой пÑинÑеÑ, коÑоÑÑй Ð²Ñ Ð¿ÑÑаеÑеÑÑ Ð¸ÑполÑзоваÑÑ. "
++"ÐÑли его Ð½ÐµÑ Ð² ÑпиÑке, вÑбеÑиÑе 'ÐÐµÑ Ð² ÑпиÑке'."
+
+ #: ../troubleshoot/ChooseNetworkPrinter.py:35
+ #: ../troubleshoot/ChoosePrinter.py:36 ../troubleshoot/DeviceListed.py:36
+@@ -1972,26 +1958,25 @@
+
+ #: ../troubleshoot/ChooseNetworkPrinter.py:39
+ #: ../troubleshoot/ChoosePrinter.py:40 ../troubleshoot/DeviceListed.py:38
+-#, fuzzy
+ msgid "Information"
+-msgstr "РазмеÑение:"
++msgstr "ÐнÑоÑмаÑиÑ"
+
+ #: ../troubleshoot/ChooseNetworkPrinter.py:75
+ #: ../troubleshoot/ChoosePrinter.py:64 ../troubleshoot/DeviceListed.py:70
+-#, fuzzy
+ msgid "Not listed"
+-msgstr "Ðе подклÑÑен"
++msgstr "ÐÐµÑ Ð² ÑпиÑке"
+
+ #: ../troubleshoot/ChoosePrinter.py:30
+-#, fuzzy
+ msgid "Choose Printer"
+-msgstr "ÐопиÑование пÑинÑеÑа"
++msgstr "ÐÑÐ±Ð¾Ñ Ð¿ÑинÑеÑа"
+
+ #: ../troubleshoot/ChoosePrinter.py:31
+ msgid ""
+ "Please select the printer you are trying to use from the list below. If it "
+ "does not appear in the list, select 'Not listed'."
+ msgstr ""
++"Ðз ÑпиÑка ниже вÑбеÑиÑе пÑинÑеÑ, коÑоÑÑй Ð²Ñ Ð¿ÑÑаеÑеÑÑ Ð¸ÑполÑзоваÑÑ. ÐÑли его "
++"Ð½ÐµÑ Ð² ÑпиÑке, вÑбеÑиÑе 'ÐÐµÑ Ð² ÑпиÑке'."
+
+ #: ../troubleshoot/DeviceListed.py:30
+ #, fuzzy
+@@ -1999,10 +1984,13 @@
+ msgstr "Ðзменение URI адÑеÑа ÑÑÑÑойÑÑва"
+
+ #: ../troubleshoot/DeviceListed.py:31
++#, fuzzy
+ msgid ""
+ "Please select the device you want to use from the list below. If it does not "
+ "appear in the list, select 'Not listed'."
+ msgstr ""
++"Ðз ÑпиÑка ниже вÑбеÑиÑе пÑинÑеÑ, коÑоÑÑй Ð²Ñ Ð¿ÑÑаеÑеÑÑ Ð¸ÑполÑзоваÑÑ. ÐÑли его "
++"Ð½ÐµÑ Ð² ÑпиÑке, вÑбеÑиÑе 'ÐÐµÑ Ð² ÑпиÑке'."
+
+ #: ../troubleshoot/ErrorLogCheckpoint.py:30
+ #: ../troubleshoot/ErrorLogFetch.py:30
+@@ -2054,46 +2042,41 @@
+ msgstr ""
+
+ #: ../troubleshoot/LocalOrRemote.py:27
+-#, fuzzy
+ msgid "Printer Location"
+-msgstr "ÐаÑамеÑÑÑ Ð¿ÑинÑеÑа"
++msgstr "РазмеÑение пÑинÑеÑа"
+
+ #: ../troubleshoot/LocalOrRemote.py:28
+-#, fuzzy
+ msgid "Is the printer connected to this computer or available on the network?"
+-msgstr "ÐÑинÑÐµÑ Ð¿Ð¾Ð´ÐºÐ»ÑÑен к паÑаллелÑÐ½Ð¾Ð¼Ñ Ð¿Ð¾ÑÑÑ."
++msgstr "ÐÑинÑÐµÑ Ð¿Ð¾Ð´ÐºÐ»ÑÑÑн к ÑÑÐ¾Ð¼Ñ ÐºÐ¾Ð¼Ð¿ÑÑÑеÑÑ Ð¸Ð»Ð¸ доÑÑÑпен ÑеÑез ÑеÑÑ?"
+
+ #: ../troubleshoot/LocalOrRemote.py:30
+-#, fuzzy
+ msgid "Locally connected printer"
+-msgstr "ÐейÑÑвиÑелÑно ÑдалиÑÑ Ð¿ÑинÑÐµÑ %s?"
++msgstr "ÐокалÑно подклÑÑÑннÑй пÑинÑеÑ"
+
+ #: ../troubleshoot/LocalOrRemote.py:31
+-#, fuzzy
+ msgid "Network printer"
+-msgstr "ÐовÑй пÑинÑеÑ"
++msgstr "СеÑевой пÑинÑеÑ"
+
+ #: ../troubleshoot/NetworkCUPSPrinterShared.py:28
+ msgid "Queue Not Shared"
+-msgstr ""
++msgstr "ÐÑеÑÐµÐ´Ñ Ð½Ðµ ÑвлÑеÑÑÑ Ð¾Ð±Ñим ÑеÑÑÑÑом"
+
+ #: ../troubleshoot/NetworkCUPSPrinterShared.py:29
+ msgid "The CUPS printer on the server is not shared."
+-msgstr ""
++msgstr "СеÑвеÑнÑй пÑинÑÐµÑ CUPS не бÑл Ñделан обÑим ÑеÑÑÑÑом."
+
+ #: ../troubleshoot/PrinterStateReasons.py:29
+-#, fuzzy
+ msgid "Status Messages"
+-msgstr "СообÑение"
++msgstr "СообÑÐµÐ½Ð¸Ñ Ð¾ ÑоÑÑоÑнии"
+
+ #: ../troubleshoot/PrinterStateReasons.py:30
+ msgid "There are status messages associated with this queue."
+-msgstr ""
++msgstr "ÐÑÑÑ ÑообÑÐµÐ½Ð¸Ñ Ð¾ ÑоÑÑоÑнии, каÑаÑÑиеÑÑ ÑÑой оÑеÑеди."
+
+ #: ../troubleshoot/PrinterStateReasons.py:53
+ #, fuzzy, python-format
+ msgid "The printer's state message is: `%s'."
+-msgstr "СоÑÑоÑние пÑинÑеÑа:"
++msgstr "СообÑÐµÐ½Ð¸Ñ Ð¾ ÑоÑÑоÑнии пÑинÑеÑа:"
+
+ #: ../troubleshoot/PrinterStateReasons.py:78
+ msgid "Errors are listed below:"
+@@ -2104,9 +2087,8 @@
+ msgstr ""
+
+ #: ../troubleshoot/PrintTestPage.py:55
+-#, fuzzy
+ msgid "Test Page"
+-msgstr "ÐапеÑаÑаÑÑ Ð¿ÑобнÑÑ ÑÑÑаниÑÑ"
++msgstr "ÐÑÐ¾Ð±Ð½Ð°Ñ ÑÑÑаниÑа"
+
+ #: ../troubleshoot/PrintTestPage.py:56
+ msgid ""
+@@ -2116,7 +2098,7 @@
+
+ #: ../troubleshoot/PrintTestPage.py:71
+ msgid "Cancel All Jobs"
+-msgstr ""
++msgstr "ÐÑмениÑÑ Ð²Ñе заданиÑ"
+
+ #: ../troubleshoot/PrintTestPage.py:77
+ #, fuzzy
+@@ -2124,16 +2106,17 @@
+ msgstr "СбÑоÑ"
+
+ #: ../troubleshoot/PrintTestPage.py:107
++#, fuzzy
+ msgid "Did the marked print jobs print correctly?"
+-msgstr ""
++msgstr "ÐÑавилÑно ли напеÑаÑана пÑÐ¾Ð±Ð½Ð°Ñ ÑÑÑаниÑа?"
+
+ #: ../troubleshoot/PrintTestPage.py:114
+ msgid "Yes"
+-msgstr ""
++msgstr "Ðа"
+
+ #: ../troubleshoot/PrintTestPage.py:115
+ msgid "No"
+-msgstr ""
++msgstr "ÐеÑ"
+
+ #: ../troubleshoot/PrintTestPage.py:322
+ msgid "Error submitting test page"
+@@ -2143,65 +2126,68 @@
+ #: ../troubleshoot/QueueRejectingJobs.py:67
+ #, python-format
+ msgid "The reason given is: `%s'."
+-msgstr ""
++msgstr "ÐÑиÑина: `%s'."
+
+ #: ../troubleshoot/QueueNotEnabled.py:59
+ msgid "This may be due to the printer being disconnected or switched off."
+-msgstr ""
++msgstr "ÐÑо Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð¸Ð·-за Ñого, ÑÑо пÑинÑÐµÑ Ð±Ñл оÑклÑÑÑн или вÑклÑÑен."
+
+ #: ../troubleshoot/QueueNotEnabled.py:63
+ msgid "Queue Not Enabled"
+-msgstr ""
++msgstr "ÐÑеÑÐµÐ´Ñ Ð½Ðµ акÑивиÑована"
+
+ #: ../troubleshoot/QueueNotEnabled.py:64
+ #, python-format
+ msgid "The queue `%s' is not enabled."
+-msgstr ""
++msgstr "ÐÑеÑÐµÐ´Ñ `%s' не акÑивиÑована."
+
+ #: ../troubleshoot/QueueNotEnabled.py:72
+ msgid ""
+ "To enable it, select the `Enabled' checkbox in the `Policies' tab for the "
+ "printer in the printer administration tool."
+ msgstr ""
++"ÐÐ»Ñ Ð°ÐºÑивиÑÐ¾Ð²Ð°Ð½Ð¸Ñ Ð¾ÑеÑеди, ÑÑÑановиÑе галоÑÐºÑ `ÐклÑÑÑн' в закладке "
++"`ÐолиÑики' Ð´Ð»Ñ ÑÑого пÑинÑеÑа в ÑÑилиÑе админиÑÑÑиÑÐ¾Ð²Ð°Ð½Ð¸Ñ Ð¿ÑинÑеÑов."
+
+ #: ../troubleshoot/QueueRejectingJobs.py:32
+ msgid "Queue Rejecting Jobs"
+-msgstr ""
++msgstr "ÐÑеÑÐµÐ´Ñ Ð¾ÑклонÑÐµÑ Ð·Ð°Ð´Ð°Ð½Ð¸Ñ"
+
+ #: ../troubleshoot/QueueRejectingJobs.py:64
+ #, python-format
+ msgid "The queue `%s' is rejecting jobs."
+-msgstr ""
++msgstr "ÐÑеÑÐµÐ´Ñ '%s' оÑклонÑÐµÑ Ð·Ð°Ð´Ð°Ð½Ð¸Ñ."
+
+ #: ../troubleshoot/QueueRejectingJobs.py:71
+ msgid ""
+ "To make the queue accept jobs, select the `Accepting Jobs' checkbox in the "
+ "`Policies' tab for the printer in the printer administration tool."
+ msgstr ""
++"ÐÐ»Ñ Ñого, ÑÑÐ¾Ð±Ñ Ð·Ð°Ð´Ð°Ð½Ð¸Ñ Ð¿ÑинималиÑÑ Ð² оÑеÑедÑ, ÑÑÑановиÑе галоÑÐºÑ `ÐÑинимаÑÑ "
++"заданиÑ' в закладке `ÐолиÑики' Ð´Ð»Ñ ÑÑого пÑинÑеÑа в ÑÑилиÑе "
++"админиÑÑÑиÑÐ¾Ð²Ð°Ð½Ð¸Ñ Ð¿ÑинÑеÑов."
+
+ #: ../troubleshoot/RemoteAddress.py:27
+-#, fuzzy
+ msgid "Remote Address"
+-msgstr "УдаленнÑе пÑинÑеÑÑ"
++msgstr "УдалÑннÑй адÑеÑ"
+
+ #: ../troubleshoot/RemoteAddress.py:28
+ msgid ""
+ "Please enter as many details as you can about the network address of this "
+ "printer."
+-msgstr ""
++msgstr "ÐведиÑе как можно болÑÑе подÑобноÑÑей о ÑеÑевом адÑеÑе ÑÑого пÑинÑеÑа."
+
+ #: ../troubleshoot/RemoteAddress.py:36
+-#, fuzzy
+ msgid "Server name:"
+-msgstr "ÐÐ¼Ñ Ð¿Ð¾Ð»ÑзоваÑелÑ:"
++msgstr "ÐÐ¼Ñ ÑеÑвеÑа:"
+
+ #: ../troubleshoot/RemoteAddress.py:43
+ msgid "Server IP address:"
+-msgstr ""
++msgstr "IP-адÑÐµÑ ÑеÑвеÑа:"
+
+ #: ../troubleshoot/SchedulerNotRunning.py:28
+ msgid "CUPS Service Stopped"
+-msgstr ""
++msgstr "ÐÑÑановлен ÑеÑÐ²Ð¸Ñ CUPS"
+
+ #: ../troubleshoot/SchedulerNotRunning.py:29
+ msgid ""
+@@ -2209,15 +2195,16 @@
+ "choose System->Administration->Services from the main menu and look for the "
+ "`cups' service."
+ msgstr ""
++"ÐеÑоÑÑно не ÑабоÑÐ°ÐµÑ ÑпÑÐ»ÐµÑ Ð¿ÐµÑаÑи CUPS. ЧÑÐ¾Ð±Ñ Ð¸ÑпÑавиÑÑ ÑÑо, вÑбеÑиÑе в "
++"оÑновном Ð¼ÐµÐ½Ñ Ð¡Ð¸ÑÑема->ÐдминиÑÑÑиÑование->СеÑвиÑÑ Ð¸ найдиÑе ÑеÑÐ²Ð¸Ñ 'cups'."
+
+ #: ../troubleshoot/ServerFirewalled.py:27
+ msgid "Check Server Firewall"
+-msgstr ""
++msgstr "ÐÑовеÑÑÑе межÑеÑевой ÑкÑан ÑеÑвеÑа"
+
+ #: ../troubleshoot/ServerFirewalled.py:28
+-#, fuzzy
+ msgid "It is not possible to connect to the server."
+-msgstr "ÐÑибка подклÑÑÐµÐ½Ð¸Ñ Ðº кÑеÑвеÑÑ CUPS."
++msgstr "Ðе ÑдаÑÑÑÑ Ð¿Ð¾Ð´ÐºÐ»ÑÑиÑÑÑÑ Ðº ÑеÑвеÑÑ."
+
+ #: ../troubleshoot/ServerFirewalled.py:43
+ #, python-format
+@@ -2225,71 +2212,72 @@
+ "Please check to see if a firewall or router configuration is blocking TCP "
+ "port %d on server `%s'."
+ msgstr ""
++"УбедиÑеÑÑ, ÑÑо наÑÑÑойки межÑеÑевого ÑкÑана или маÑÑÑÑÑизаÑоÑа не блокиÑÑÑÑ "
++"TCP-поÑÑ %d на ÑеÑвеÑе `%s'."
+
+ #: ../troubleshoot/Shrug.py:27
+ msgid "Sorry!"
+-msgstr ""
++msgstr "ÐзвиниÑе!"
+
+ #: ../troubleshoot/Shrug.py:28
+ msgid ""
+ "I have not been able to work out what the problem is, but I have collected "
+ "some useful information to put in a bug report."
+ msgstr ""
++"Ð ÑожалениÑ, невозможно пÑедложиÑÑ ÑеÑение ваÑей пÑоблемÑ, но бÑла ÑобÑана "
++"некоÑоÑÐ°Ñ Ð¿Ð¾Ð»ÐµÐ·Ð½Ð°Ñ Ð¸Ð½ÑоÑмаÑÐ¸Ñ Ð´Ð»Ñ Ð¾ÑпÑавки ÑообÑÐµÐ½Ð¸Ñ Ð¾Ð± оÑибке."
+
+ #: ../troubleshoot/Welcome.py:36
+ msgid "Trouble-shooting Printing"
+-msgstr ""
++msgstr "ÐÑÑвление пÑоблем Ñ Ð¿ÐµÑаÑÑÑ"
+
+ #: ../troubleshoot/Welcome.py:38
+ msgid ""
+ "In the next few screens I will ask you some questions about your problem "
+ "with printing. Based on your answers I will try to suggest a solution."
+ msgstr ""
++"Ðалее бÑÐ´ÐµÑ Ð·Ð°Ð´Ð°Ð½Ð¾ неÑколÑко вопÑоÑов о ваÑиÑ
пÑоблемаÑ
Ñ Ð¿ÐµÑаÑÑÑ. "
++"ÐÑновÑваÑÑÑ Ð½Ð° ваÑиÑ
оÑвеÑаÑ
, бÑÐ´ÐµÑ Ð¿Ñедложен ÑпоÑоб ÑеÑениÑ."
+
+ #: ../troubleshoot/Welcome.py:42
+ msgid "Click 'Forward' to begin."
+-msgstr ""
++msgstr "ЧÑÐ¾Ð±Ñ Ð½Ð°ÑаÑÑ, нажмиÑе 'ÐпеÑÑд'."
+
+ #: ../applet.py:135
-#, fuzzy
msgid "Printer added"
-msgstr "ÐÐ¼Ñ Ð¿ÑинÑеÑа"
+msgstr "ÐÑинÑÐµÑ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½"
- #: ../applet.py:1028
+ #: ../applet.py:137
-#, fuzzy
msgid "Missing printer driver"
-msgstr "ÐÑÑÑÑÑÑвÑÐµÑ Ð´ÑайвеÑ"
+msgstr "ÐÑÑÑÑÑÑвÑÐµÑ Ð´ÑÐ°Ð¹Ð²ÐµÑ Ð¿ÑинÑеÑа"
- #: ../applet.py:1032
+ #: ../applet.py:141
-#, fuzzy
msgid "Install printer driver"
-msgstr "ÐÑÑÑÑÑÑвÑÐµÑ Ð´ÑайвеÑ"
+msgstr "УÑÑановка дÑайвеÑа пÑинÑеÑа"
- #: ../applet.py:1033
+ #: ../applet.py:142
#, python-format
msgid "`%s' requires driver installation: %s."
-msgstr ""
+msgstr "`%s' ÑÑебÑÐµÑ ÑÑÑановки дÑайвеÑа: %s."
- #: ../applet.py:1036
--#, fuzzy
- msgid "Install"
--msgstr "ÐÑÑÑÑÑÑвÑÐµÑ Ð´ÑайвеÑ"
-+msgstr "УÑÑановка"
-
- #: ../applet.py:1039
+ #: ../applet.py:150
#, python-format
msgid "`%s' is ready for printing."
-msgstr ""
+msgstr "`%s' гоÑов Ð´Ð»Ñ Ð¿ÐµÑаÑи."
- #: ../applet.py:1042
+ #: ../applet.py:153
-#, fuzzy
msgid "Configure"
-msgstr "ÐаÑÑÑойка пÑинÑеÑов"
+msgstr "ÐаÑÑÑойка"
#. Model mismatch
- #: ../applet.py:1045
+ #: ../applet.py:156
#, python-format
msgid "`%s' has been added, using the `%s' driver."
-msgstr ""
+msgstr "ÐÑл добавлен `%s', иÑполÑзÑеÑÑÑ Ð´ÑÐ°Ð¹Ð²ÐµÑ `%s'."
- #: ../applet.py:1049
+ #: ../applet.py:160
-#, fuzzy
msgid "Find driver"
-msgstr "ÐÑÑÑÑÑÑвÑÐµÑ Ð´ÑайвеÑ"
+msgstr "ÐоиÑк дÑайвеÑа"
- #: ../applet.glade.h:4
- msgid "Document print status"
-@@ -2106,9 +2071,8 @@
+ #: ../applet.glade.h:1
+ msgid ""
+@@ -2324,9 +2312,8 @@
msgstr "_ÐÑиоÑÑановиÑÑ"
- #: ../applet.glade.h:13
+ #: ../applet.glade.h:12
-#, fuzzy
msgid "_Refresh"
-msgstr "_СбÑоÑиÑÑ"
+msgstr "ÐбновиÑÑ"
- #: ../applet.glade.h:14
+ #: ../applet.glade.h:13
msgid "_Release"
-@@ -2119,9 +2083,8 @@
+@@ -2337,9 +2324,8 @@
msgstr "_Ðид"
#: ../print-applet.desktop.in.h:1
@@ -1639,7 +1673,7 @@
#: ../print-applet.desktop.in.h:2
msgid "System tray icon for managing print jobs"
-@@ -2132,90 +2095,10 @@
+@@ -2350,41 +2336,15 @@
msgstr "ÐÑмениÑÑ, пÑиоÑÑановиÑÑ, возобновиÑÑ Ð¸Ð»Ð¸ повÑоÑиÑÑ Ð·Ð°Ð´Ð°Ð½Ð¸Ñ"
#: ../manage-print-jobs.desktop.in.h:2
@@ -1651,6 +1685,100 @@
-#, fuzzy
msgid "Select default printer"
-msgstr "СделаÑÑ Ð¿ÑинÑеÑом по ÑмолÑаниÑ"
+-
+-#, fuzzy
+-#~ msgid "Create a new printer group"
+-#~ msgstr ""
+-#~ "ÐÑÐ´ÐµÑ Ñоздан новÑй пÑинÑÐµÑ %s Ñ Ð¿Ð¾Ð´ÐºÐ»ÑÑением\n"
+-#~ "%s.\n"
+-
+-#, fuzzy
+-#~ msgid "Create a new printer queue"
+-#~ msgstr ""
+-#~ "ÐÑÐ´ÐµÑ Ñоздан новÑй пÑинÑÐµÑ %s Ñ Ð¿Ð¾Ð´ÐºÐ»ÑÑением\n"
+-#~ "%s.\n"
+-
+-#, fuzzy
+-#~ msgid "Make:"
+-#~ msgstr "ÐÑоизводиÑели"
+-
+-#, fuzzy
+-#~ msgid ""
+-#~ "May contain any printable characters except \"/\", \"#\", and space.\n"
+-#~ "Name must be unique on the local machine!"
+-#~ msgstr ""
+-#~ "ÐÐ¾Ð¶ÐµÑ Ð²ÐºÐ»ÑÑаÑÑ Ð»ÑбÑе пеÑаÑнÑе ÑимволÑ, за иÑклÑÑением \"/\", \"#\" и "
+-#~ "пÑобела"
++msgstr "ÐÑÐ±Ð¾Ñ Ð¿ÑинÑеÑа по ÑмолÑаниÑ"
+
+ #~ msgid "This is the default printer"
+-#~ msgstr "ÐÑо пÑинÑеÑа по ÑмолÑаниÑ"
++#~ msgstr "ÐÑо пÑинÑÐµÑ Ð¿Ð¾ ÑмолÑаниÑ"
+
+ #~ msgid "No default printer set."
+ #~ msgstr "Ðе задан пÑинÑÐµÑ Ð¿Ð¾ ÑмолÑаниÑ."
+@@ -2392,134 +2352,71 @@
+ #~ msgid "Cancel Tests"
+ #~ msgstr "ÐÑмениÑÑ Ð¿ÑобнÑе заданиÑ"
+
+-#, fuzzy
+-#~ msgid "Authentication required"
+-#~ msgstr "<b>ÐÑовеÑка подлинноÑÑи</b>"
+-
+-#, fuzzy
+-#~ msgid "Default Printer:"
+-#~ msgstr "СделаÑÑ Ð¿ÑинÑеÑом по ÑмолÑаниÑ"
+-
+-#, fuzzy
+-#~ msgid "Make Default"
+-#~ msgstr "по ÑмолÑаниÑ"
+-
+-#~ msgid "User name:"
+-#~ msgstr "ÐÐ¼Ñ Ð¿Ð¾Ð»ÑзоваÑелÑ:"
+-
+-#, fuzzy
+-#~ msgid "Search terms:"
+-#~ msgstr "Ðовое Ð¸Ð¼Ñ Ð¿ÑинÑеÑа"
+-
+-#, fuzzy
+-#~ msgid "Connect to a different print server"
+-#~ msgstr "ÐодклÑÑение к CUPS ÑеÑвеÑÑ"
+-
+-#, fuzzy
+-#~ msgid "Copy this printer queue"
+-#~ msgstr "ÐопиÑование пÑинÑеÑа"
++#~ msgid "Support for downloadable drivers is not yet completed."
++#~ msgstr "ÐоддеÑжка загÑÑзки дÑайвеÑов пока недоделана."
+
+-#~ msgid "Goto Server"
+-#~ msgstr "ÐеÑейÑи к ÑеÑвеÑÑ"
+-
+-#, fuzzy
+ #~ msgid "Password required"
+-#~ msgstr "ТÑебÑеÑÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ"
++#~ msgstr "ТÑебÑеÑÑÑ Ð¿Ð°ÑолÑ"
+
+-#~ msgid "_Goto Server"
+-#~ msgstr "_ÐеÑейÑи к ÑеÑвеÑÑ"
+-
+-#, fuzzy
+ #~ msgid "Queue Not Accepting Jobs"
+-#~ msgstr "ÐÑÐ¸Ð½Ð¸Ð¼Ð°ÐµÑ Ð·Ð°Ð´Ð°Ð½Ð¸Ñ"
++#~ msgstr "ÐÑеÑÐµÐ´Ñ Ð½Ðµ пÑÐ¸Ð½Ð¸Ð¼Ð°ÐµÑ Ð·Ð°Ð´Ð°Ð½Ð¸Ñ"
+
+-#, fuzzy
+ #~ msgid "The CUPS printer on the server is not accepting jobs."
+-#~ msgstr "ÐÑÐ¾Ñ Ð¿ÑинÑÐµÑ (обÑий ÑеÑÑÑÑ) не доÑÑÑпен."
++#~ msgstr "СеÑвеÑнÑй пÑинÑÐµÑ CUPS не пÑÐ¸Ð½Ð¸Ð¼Ð°ÐµÑ Ð·Ð°Ð´Ð°Ð½Ð¸Ñ."
+
+-#, fuzzy
+ #~ msgid "The CUPS printer on the server is not enabled."
+-#~ msgstr "ÐÑÐ¾Ñ Ð¿ÑинÑÐµÑ (обÑий ÑеÑÑÑÑ) не доÑÑÑпен."
++#~ msgstr "СеÑвеÑнÑй пÑинÑÐµÑ CUPS не акÑивиÑован."
+
+-#, fuzzy
+ #~ msgid "Printer's state reasons:"
+-#~ msgstr "СоÑÑоÑние пÑинÑеÑа:"
-
-#, fuzzy
-#~ msgid ""
@@ -1668,10 +1796,13 @@
-
-#~ msgid "Default printer is %s"
-#~ msgstr "ÐÑинÑÐµÑ Ð¿Ð¾ ÑмолÑÐ°Ð½Ð¸Ñ - %s"
--
++#~ msgstr "ÐÑиÑÐ¸Ð½Ñ ÑоÑÑоÑÐ½Ð¸Ñ Ð¿ÑинÑеÑа:"
+
-#~ msgid "Going to create a new class %s."
-#~ msgstr "ÐÑÐ´ÐµÑ Ñоздан новÑй клаÑÑ %s."
--
++#~ msgid " The reason given is: `%s'."
++#~ msgstr " ÐÑиÑина: '%s'."
+
-#~ msgid " PPD "
-#~ msgstr " PPD "
-
@@ -1689,45 +1820,78 @@
-
-#~ msgid "Apply"
-#~ msgstr "ÐÑимениÑÑ"
--
++#~ msgid "Connect to a different print server"
++#~ msgstr "ÐодклÑÑение к дÑÑÐ³Ð¾Ð¼Ñ ÑеÑвеÑÑ Ð¿ÐµÑаÑи"
+
-#~ msgid "Authors"
-#~ msgstr "ÐвÑоÑÑ"
--
++#~ msgid "Copy this printer queue"
++#~ msgstr "ÐопиÑование ÑÑой оÑеÑеди пÑинÑеÑа"
+
-#~ msgid "Change PPD"
-#~ msgstr "ÐзмениÑÑ PPD"
--
++#~ msgid "Create a new printer group"
++#~ msgstr "Создание новой гÑÑÐ¿Ð¿Ñ Ð¿ÑинÑеÑа"
+
-#~ msgid "Class Members"
-#~ msgstr "Ð§Ð»ÐµÐ½Ñ ÐºÐ»Ð°ÑÑа"
--
++#~ msgid "Create a new printer queue"
++#~ msgstr "Создание новой оÑеÑеди пÑинÑеÑа"
+
-#~ msgid "Comments: "
-#~ msgstr "ÐомменÑаÑии: "
--
++#~ msgid "Default Printer:"
++#~ msgstr "ÐÑинÑÐµÑ Ð¿Ð¾ ÑмолÑаниÑ:"
+
-#~ msgid "Copyright"
-#~ msgstr "Copyright"
--
++#~ msgid "Delete this printer queue"
++#~ msgstr "УдалиÑÑ ÑÑÑ Ð¾ÑеÑÐµÐ´Ñ Ð¿ÑинÑеÑа"
+
-#~ msgid "Device"
-#~ msgstr "УÑÑÑойÑÑво"
--
++#~ msgid "Enter some search terms for the model of your printer."
++#~ msgstr ""
++#~ "ÐведиÑе неÑколÑко Ñлов Ð´Ð»Ñ Ð¿Ð¾Ð¸Ñка, опиÑÑваÑÑиÑ
Ð¼Ð¾Ð´ÐµÐ»Ñ Ð²Ð°Ñего пÑинÑеÑа."
+
-#~ msgid "Driver"
-#~ msgstr "ÐÑайвеÑ"
--
++#~ msgid "Goto Server"
++#~ msgstr "ÐеÑейÑи к ÑеÑвеÑÑ"
+
-#~ msgid "Make Default Printer"
-#~ msgstr "СделаÑÑ Ð¿ÑинÑеÑом по ÑмолÑаниÑ"
--
++#~ msgid "Make Default"
++#~ msgstr "ÐÑбÑаÑÑ Ð¿Ð¾ ÑмолÑаниÑ"
+
-#~ msgid "PPD"
-#~ msgstr "PPD"
--
++#~ msgid ""
++#~ "May contain any printable characters except \"/\", \"#\", and space.\n"
++#~ "Name must be unique on the local machine!"
++#~ msgstr ""
++#~ "ÐÐ¾Ð¶ÐµÑ Ð²ÐºÐ»ÑÑаÑÑ Ð»ÑбÑе пеÑаÑнÑе ÑимволÑ, за иÑклÑÑением \"/\", \"#\" и "
++#~ "пÑобела.\n"
++#~ "ÐÐ¼Ñ Ð´Ð¾Ð»Ð¶Ð½Ð¾ бÑÑÑ ÑникалÑнÑм в пÑеделаÑ
локалÑной маÑинÑ!"
+
-#~ msgid "System-Config-Printer %s"
-#~ msgstr "System-Config-Printer %s"
--
++#~ msgid "Refresh the list of printer queues"
++#~ msgstr "ÐбновиÑÑ ÑпиÑок пÑинÑеÑнÑÑ
оÑеÑедей"
+
-#~ msgid ""
-#~ "This PPD is provided by the manufacturer and is included with the "
-#~ "foomatic package."
-#~ msgstr "ÐаннÑй PPD пÑедоÑÑавлен пÑоизводиÑелем и вклÑÑен в Ð¿Ð°ÐºÐµÑ foomatic."
--
++#~ msgid "Search terms:"
++#~ msgstr "Слова Ð´Ð»Ñ Ð¿Ð¾Ð¸Ñка:"
+
-#~ msgid "This PPD is provided by CUPS."
-#~ msgstr "ÐаннÑй PPD пÑедоÑÑавлен CUPS."
-+msgstr "ÐÑÐ±Ð¾Ñ Ð¿ÑинÑеÑа по ÑмолÑаниÑ"
++#~ msgid "User name:"
++#~ msgstr "ÐÐ¼Ñ Ð¿Ð¾Ð»ÑзоваÑелÑ:"
-#~ msgid "Specify default job options."
-#~ msgstr "УкажиÑе ÑÑандаÑÑнÑе паÑамеÑÑÑ Ð·Ð°Ð´Ð°Ð½Ð¸Ñ."
++#~ msgid "_Goto Server"
++#~ msgstr "ÐеÑейÑи к ÑеÑвеÑÑ"
Modified: packages/experimental/system-config-printer/debian/patches/07_es_po.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/system-config-printer/debian/patches/07_es_po.patch?rev=16199&op=diff
==============================================================================
--- packages/experimental/system-config-printer/debian/patches/07_es_po.patch (original)
+++ packages/experimental/system-config-printer/debian/patches/07_es_po.patch Sun Jun 8 12:52:40 2008
@@ -1,179 +1,201 @@
---- po/es.po.orig 2008-02-13 19:13:12.000000000 +0100
-+++ po/es.po 2008-06-04 01:08:15.829686943 +0200
-@@ -1,33 +1,33 @@
--# translation of es.po to
+--- po.orig/es.po 2008-05-27 19:09:01.000000000 +0200
++++ po/es.po 2008-06-08 13:06:21.973280613 +0200
+@@ -5,21 +5,18 @@
+ # Yelitza Louze <ylouze at redhat.com>, 2003, 2004.
+ # Eduardo Villagrán Morales <evillagr at fedoraproject.org>, 2007.
+ # Domingo Becker <domingobecker at gmail.com>, 2008.
-# translation of es.po to
-# translation of es.po to
-# translation of es.po to
-# translation of es.po to
-# translation of es.po to
--# Copyright (C) 2001 Red Hat, Inc.
-+# translation of system-config-printer.trunk.es.po to Spanish
- # Nuria Soriano <nsoriano at redhat.it>, 2001.
- # Fernando Ruiz-Tapiador Gutiérrez <frtapiador at redhat.es>, 2001.
- # Yelitza Louzé <ylouze at redhat.com>, 2002.
- # Yelitza Louze <ylouze at redhat.com>, 2003, 2004.
--# Eduardo Villagrán Morales <evillagr at fedoraproject.org>, 2007
-+# Eduardo Villagrán Morales <evillagr at fedoraproject.org>, 2007.
-+# Domingo Becker <domingobecker at gmail.com>, 2008.
+-# translation of es.po to
+#
+# Javier Fernández-Sanguino <jfs at debian.org>, february 2008
+#
-+# Copyright (C) 2001 Red Hat, Inc.
+ # Copyright (C) 2001 Red Hat, Inc.
msgid ""
msgstr ""
--"Project-Id-Version: system-config-prinet\n"
-+"Project-Id-Version: system-config-printer.trunk.es\n"
+ "Project-Id-Version: system-config-printer.trunk.es\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/bugzilla\n"
--"POT-Creation-Date: 2008-02-13 18:13+0000\n"
--"PO-Revision-Date: 2007-09-27 10:09-0300\n"
+-"POT-Creation-Date: 2008-05-27 18:07+0100\n"
+-"PO-Revision-Date: 2008-02-19 23:36-0200\n"
-"Last-Translator: Domingo Becker <domingobecker at gmail.com>\n"
--"Language-Team: Fedora Spanish <fedora-trans-es at redhat.com>\n"
-+"POT-Creation-Date: 2008-02-19 17:20+0000\n"
+-"Language-Team: Spanish <fedora-trans-es at redhat.com>\n"
++"POT-Creation-Date: 2008-06-08 12:49+0200\n"
+"PO-Revision-Date: 2008-02-29 18:17+0100\n"
+"Last-Translator: Javier Fernández-Sanguino <jfs at debian.org>\n"
+"Language-Team: Debian l10n Spanish <debian-l10n-spanish at lists.debian.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
- "X-Poedit-Language: Spanish\n"
-+"X-Generator: KBabel 1.11.4\n"
-
- #: ../cupshelpers.py:33
- msgid "Idle"
- msgstr "Listo"
-
--#: ../cupshelpers.py:34 ../troubleshoot.py:872 ../applet.py:731
-+#: ../cupshelpers.py:34 ../troubleshoot/PrintTestPage.py:30 ../applet.py:647
- msgid "Processing"
- msgstr "Procesando"
-
-@@ -35,52 +35,56 @@
- msgid "Busy"
- msgstr "Ocupado"
-
--#: ../cupshelpers.py:36 ../troubleshoot.py:873 ../applet.py:732
-+#: ../cupshelpers.py:36 ../troubleshoot/PrintTestPage.py:31 ../applet.py:648
- msgid "Stopped"
- msgstr "Detenido"
-
--#: ../cupshelpers.py:53 ../troubleshoot.py:648 ../troubleshoot.py:649
--#: ../troubleshoot.py:652 ../troubleshoot.py:653 ../troubleshoot.py:1415
--#: ../troubleshoot.py:1416 ../troubleshoot.py:1419 ../troubleshoot.py:1420
--#: ../applet.py:741
-+#: ../cupshelpers.py:53 ../troubleshoot/ChooseNetworkPrinter.py:96
-+#: ../troubleshoot/ChooseNetworkPrinter.py:97
-+#: ../troubleshoot/ChooseNetworkPrinter.py:100
-+#: ../troubleshoot/ChooseNetworkPrinter.py:101
-+#: ../troubleshoot/ChoosePrinter.py:85 ../troubleshoot/ChoosePrinter.py:86
-+#: ../troubleshoot/ChoosePrinter.py:89 ../troubleshoot/ChoosePrinter.py:90
-+#: ../applet.py:657
- msgid "Unknown"
- msgstr "Desconocido"
-
- #: ../my-default-printer.py:136 ../my-default-printer.desktop.in.h:1
+@@ -28,7 +25,7 @@
+
+ #: ../authconn.py:30 ../system-config-printer.glade.h:249
+ msgid "Username:"
+-msgstr "Nombre de Usuario:"
++msgstr "Nombre de usuario:"
+
+ #: ../authconn.py:31 ../system-config-printer.glade.h:184 ../applet.glade.h:4
+ msgid "Password:"
+@@ -37,7 +34,7 @@
+ #: ../authconn.py:32
+ #, fuzzy
+ msgid "Domain:"
+-msgstr "Márgen superior:"
++msgstr "Margen superior:"
+
+ #: ../authconn.py:34
+ msgid "Authentication"
+@@ -101,12 +98,12 @@
+ "The password may be incorrect, or the server may be configured to deny "
+ "remote administration."
+ msgstr ""
+-"La contraseña puede ser incorrecta, o el servidor fue configurado para negar "
+-"la administración remota."
++"La contraseña puede ser incorrecta, o bien se ha configurado el servidor "
++"para rechazar la administración remota."
+
+ #: ../errordialogs.py:78
+ msgid "Bad request"
+-msgstr "Mal pedido"
++msgstr "Solicitud inválida"
+
+ #: ../errordialogs.py:80
+ msgid "Not found"
+@@ -114,11 +111,11 @@
+
+ #: ../errordialogs.py:82
+ msgid "Request timeout"
+-msgstr "Pasó el tiempo para el pedido"
++msgstr "Expiró el tiempo para la solicitud"
+
+ #: ../errordialogs.py:84
+ msgid "Upgrade required"
+-msgstr "Se requiere actualización"
++msgstr "Actualización necesaria"
+
+ #: ../errordialogs.py:86
+ msgid "Server error"
+@@ -136,7 +133,7 @@
+ #: ../errordialogs.py:92
+ #, python-format
+ msgid "There was an HTTP error: %s."
+-msgstr "Hubo un error HTTP: %s."
++msgstr "Se produjo un error HTTP: %s."
+
+ #: ../jobviewer.py:89 ../troubleshoot/PrintTestPage.py:78
+ msgid "Job"
+@@ -172,7 +169,7 @@
+
+ #: ../jobviewer.py:94
+ msgid "Time submitted"
+-msgstr "Hora de ingreso"
++msgstr "Hora de envÃo"
+
+ #: ../jobviewer.py:95 ../troubleshoot/PrintTestPage.py:83
+ msgid "Status"
+@@ -190,7 +187,7 @@
+ #: ../jobviewer.py:132
+ #, fuzzy
+ msgid "all jobs"
+-msgstr "Cancelar Todos los Trabajos"
++msgstr "Cancelar todos los trabajos"
+
+ #: ../jobviewer.py:133
+ #, fuzzy, python-format
+@@ -316,15 +313,15 @@
+
+ #: ../my-default-printer.py:141 ../my-default-printer.desktop.in.h:1
msgid "Default Printer"
-msgstr "Impresora Predeterminada"
+msgstr "Impresora predeterminada"
- #: ../my-default-printer.py:140 ../my-default-printer.py:171
+ #: ../my-default-printer.py:145 ../my-default-printer.py:181
msgid "_Use System Default"
-msgstr "_Usar los valores por defecto del Sistema"
+msgstr "_Usar los valores por omisión del sistema"
- #: ../my-default-printer.py:141 ../my-default-printer.py:173
+ #: ../my-default-printer.py:146 ../my-default-printer.py:183
msgid "_Set Default"
-msgstr "_Poner por defecto"
+msgstr "Fijar valore_s por omisión"
- # ../gui/printconf-gui.glade.str:141
- # ../gui/printconf-gui.glade.str:153
- # ../gui/printconf-gui.glade.str:153
--#: ../my-default-printer.py:151 ../troubleshoot.py:904 ../applet.py:186
--#: ../applet.py:226
-+#: ../my-default-printer.py:151 ../troubleshoot/PrintTestPage.py:68
-+#: ../applet.py:95 ../applet.py:135
- msgid "Printer"
- msgstr "Impresora"
-
- #: ../my-default-printer.py:155 ../system-config-printer.py:2373
--#: ../troubleshoot.py:592 ../troubleshoot.py:1368
-+#: ../troubleshoot/ChooseNetworkPrinter.py:37
-+#: ../troubleshoot/ChoosePrinter.py:38
- msgid "Location"
- msgstr "Ubicación"
+ #: ../my-default-printer.py:162 ../system-config-printer.py:2430
+ #: ../troubleshoot/ChooseNetworkPrinter.py:37
+@@ -334,12 +331,12 @@
#: ../optionwidgets.py:116
msgid "Conflicts with:"
-msgstr "Conflicto con:"
+msgstr "Entra en conflicto con:"
- # ../gui/printconf-gui.glade.str:82
- # ../gui/printconf-gui.glade.str:88
- # ../gui/printconf-gui.glade.str:88
- #: ../system-config-printer.py:360
- msgid "Server Settings"
--msgstr "Opciones del Servidor"
-+msgstr "Opciones del servidor"
-
- #: ../system-config-printer.py:366 ../system-config-printer.py:368
- msgid "Members of this class"
-@@ -117,7 +121,7 @@
-
- #: ../system-config-printer.py:374 ../system-config-printer.glade.h:107
+ #: ../system-config-printer.py:275
+ #, fuzzy
+ msgid "Class"
+-msgstr "Clase nueva"
++msgstr "Nueva clase"
+
+ #. Set up "Problems?" link button
+ #: ../system-config-printer.py:305
+@@ -382,7 +379,7 @@
+
+ #: ../system-config-printer.py:353 ../system-config-printer.glade.h:101
msgid "Downloadable Drivers"
--msgstr ""
+-msgstr "Controladores Descargables"
+msgstr "Controladores descargables"
# ../util/printconf_tui.py:508 ../util/printconf_tui.py:566
# ../util/printconf_tui.py:1147 ../util/printconf_tui.py:1206
-@@ -131,12 +135,12 @@
-
- #: ../system-config-printer.py:402
- msgid "Automatic rotation"
--msgstr ""
-+msgstr "Rotación automática"
-
- #: ../system-config-printer.py:556
+@@ -401,12 +398,12 @@
+ #: ../system-config-printer.py:554
+ #, fuzzy, python-format
+ msgid "Printer Properties - `%s' on %s"
+-msgstr "Informe de la Impresora"
++msgstr "Opciones de la Impresora"
+
+ #: ../system-config-printer.py:657
#, python-format
msgid "Printer configuration - %s"
-msgstr "Configuracion de la impresora - %s"
+msgstr "Configuración de la impresora - %s"
- #: ../system-config-printer.py:559
- #, python-format
-@@ -156,18 +160,18 @@
-
- #: ../system-config-printer.py:673
- msgid "Local Classes"
+ #: ../system-config-printer.py:660
+ #, python-format
+@@ -416,7 +413,7 @@
+ #: ../system-config-printer.py:751
+ #, fuzzy
+ msgid "Remote class"
+-msgstr "Clases Remotas"
++msgstr "Clases remotas"
+
+ # ../gui/printconf-gui.glade.str:141
+ # ../gui/printconf-gui.glade.str:153
+@@ -424,12 +421,12 @@
+ #: ../system-config-printer.py:753
+ #, fuzzy
+ msgid "Remote printer"
+-msgstr "Impresoras Remotas"
++msgstr "Impresoras remotas"
+
+ #: ../system-config-printer.py:757
+ #, fuzzy
+ msgid "Local class"
-msgstr "Clases Locales"
+msgstr "Clases locales"
- # ../gui/printconf-gui.glade.str:141
- # ../gui/printconf-gui.glade.str:153
- # ../gui/printconf-gui.glade.str:153
- #: ../system-config-printer.py:674
- msgid "Remote Printers"
--msgstr "Impresoras Remotas"
-+msgstr "Impresoras remotas"
-
- #: ../system-config-printer.py:675
- msgid "Remote Classes"
--msgstr "Clases Remotas"
-+msgstr "Clases remotas"
-
- #: ../system-config-printer.py:783
- #, python-format
-@@ -180,7 +184,7 @@
-
- #: ../system-config-printer.py:1202
+ # ../gui/printconf-gui.glade.str:126
+ # ../gui/printconf-gui.glade.str:138
+@@ -450,7 +447,7 @@
+
+ #: ../system-config-printer.py:1190
msgid "Installable Options"
-msgstr "Opciones Instalables"
+msgstr "Opciones instalables"
- #: ../system-config-printer.py:1203 ../system-config-printer.glade.h:209
+ #: ../system-config-printer.py:1191 ../system-config-printer.glade.h:198
msgid "Printer Options"
-@@ -192,21 +196,22 @@
+@@ -462,17 +459,18 @@
"Changes can only be applied after\n"
"these conflicts are resolved."
msgstr ""
@@ -185,772 +207,235 @@
+"hasta que no se resuelvan los\n"
+"conflictos."
- #: ../system-config-printer.py:1241 ../system-config-printer.py:1257
--#: ../applet.py:349
-+#: ../applet.py:258
- msgid "Not authorized"
- msgstr "No autorizado"
-
--#: ../system-config-printer.py:1242 ../applet.py:350
-+#: ../system-config-printer.py:1242 ../applet.py:259
- msgid "The password may be incorrect."
- msgstr "La contraseña puede ser incorrecta."
-
- #: ../system-config-printer.py:1245 ../system-config-printer.py:1278
--#: ../applet.py:353
-+#: ../applet.py:262
- msgid "CUPS server error"
- msgstr "Error del servidor CUPS"
-
-@@ -215,7 +220,7 @@
- # ../util/printconf_gui.py:1812 ../util/printconf_gui.py:1829
- # ../util/printconf_gui.py:1863 ../util/printconf_tui.py:1805
- # ../util/printconf_gui.py:1942 ../util/printconf_tui.py:1834
--#: ../system-config-printer.py:1246 ../applet.py:354
-+#: ../system-config-printer.py:1246 ../applet.py:263
- #, python-format
- msgid "There was an error during the CUPS operation: '%s'."
- msgstr "Se ha producido un error en CUPS durante la operación: '%s'."
-@@ -224,13 +229,11 @@
- msgid ""
- "The password may be incorrect, or the server may be configured to deny "
- "remote administration."
--msgstr ""
--"La contraseña puede ser incorrecta, o el servidor fue configurado para negar "
--"la administración remota."
-+msgstr "La contraseña puede ser incorrecta, o bien se ha configurado el servidor para rechazar la administración remota."
-
- #: ../system-config-printer.py:1263
- msgid "Bad request"
--msgstr "Mal pedido"
-+msgstr "Solicitud inválida"
-
- #: ../system-config-printer.py:1265
- msgid "Not found"
-@@ -238,11 +241,11 @@
-
- #: ../system-config-printer.py:1267
- msgid "Request timeout"
--msgstr "Pasó el tiempo para el pedido"
-+msgstr "Expiró el tiempo para la solicitud"
-
- #: ../system-config-printer.py:1269
- msgid "Upgrade required"
--msgstr "Se requiere actualización"
-+msgstr "Actualización necesaria"
-
- #: ../system-config-printer.py:1271
- msgid "Server error"
-@@ -256,15 +259,15 @@
- #: ../system-config-printer.py:1279
- #, python-format
- msgid "There was an HTTP error: %s."
--msgstr "Hubo un error HTTP: %s."
-+msgstr "Se produjo un error HTTP: %s."
-
- #: ../system-config-printer.py:1303
+ #: ../system-config-printer.py:1239
msgid "This will delete this class!"
-msgstr "Esto eliminará esta clase!"
+msgstr "¡Esto eliminará esta clase!"
- #: ../system-config-printer.py:1304
+ #: ../system-config-printer.py:1240
msgid "Proceed anyway?"
-msgstr "¿Proceder de todos modos?"
+msgstr "¿Continuar de todos modos?"
- #: ../system-config-printer.py:1518 ../system-config-printer.py:1552
+ #: ../system-config-printer.py:1419 ../system-config-printer.py:1449
msgid "Submitted"
-@@ -284,14 +287,12 @@
- msgid ""
+@@ -493,8 +491,8 @@
"The remote server did not accept the print job, most likely because the "
"printer is not shared."
--msgstr ""
+ msgstr ""
-"El servidor remoto no aceptó el trabajo de impresión, muy probablemente "
-"debido a que la impresora no es compartida."
-+msgstr "El servidor remoto no aceptó el trabajo de impresión, seguramente porque la impresora no está compartida."
-
- #: ../system-config-printer.py:1553
--#, fuzzy, python-format
-+#, python-format
- msgid "Maintenance command submitted as job %d"
--msgstr "Página de prueba enviada como trabajo %d"
-+msgstr "Comando de mantenimiento enviado como trabajo %d"
-
- #: ../system-config-printer.py:1649 ../system-config-printer.py:1791
- msgid "Error"
-@@ -308,26 +309,26 @@
-
- #: ../system-config-printer.py:1703
- msgid "This is the default printer"
--msgstr "Esta es la impresora por defecto"
-+msgstr "Esta es la impresora por omisión"
-
- #: ../system-config-printer.py:1707
- msgid "No default printer set."
--msgstr "No se configuró la impresora por defecto."
-+msgstr "No se configuró la impresora por omisión."
-
- #: ../system-config-printer.py:1792
- #, python-format
- msgid "Option '%s' has value '%s' and cannot be edited."
--msgstr ""
-+msgstr "La opción '%s' tiene el valor '%s' y no se puede editar."
-
- #: ../system-config-printer.py:1832
- msgid "Cancel Tests"
--msgstr "Cancelar Pruebas"
-+msgstr "Cancelar pruebas"
-
- #. Not more than 25 characters
--#: ../system-config-printer.py:1836 ../troubleshoot.py:894
--#: ../system-config-printer.glade.h:208
-+#: ../system-config-printer.py:1836 ../system-config-printer.glade.h:208
-+#: ../troubleshoot/PrintTestPage.py:56
- msgid "Print Test Page"
--msgstr "Imprimir Página de Prueba"
-+msgstr "Imprimir página de prueba"
++"El servidor remoto no aceptó el trabajo de impresión, seguramente porque la "
++"impresora no está compartida."
+
+ #: ../system-config-printer.py:1450
+ #, python-format
+@@ -528,7 +526,7 @@
+ #: ../system-config-printer.py:2045
+ #, fuzzy, python-format
+ msgid "Really delete class `%s'?"
+-msgstr "¿Realmente eliminar la clase %s? "
++msgstr "¿Desea realmente eliminar la clase %s? "
# ../util/printconf_tui.py:1740
# ../util/printconf_tui.py:1830
-@@ -335,7 +336,7 @@
- #: ../system-config-printer.py:2066
- #, python-format
- msgid "Really delete printer %s?"
+@@ -536,7 +534,7 @@
+ #: ../system-config-printer.py:2047
+ #, fuzzy, python-format
+ msgid "Really delete printer `%s'?"
-msgstr "¿Realmente eliminar la impresora %s? "
+msgstr "¿Desea realmente eliminar la impresora %s? "
# ../util/printconf_tui.py:1740
# ../util/printconf_tui.py:1830
-@@ -343,7 +344,7 @@
- #: ../system-config-printer.py:2068
- #, python-format
- msgid "Really delete class %s?"
--msgstr "¿Realmente eliminar la clase %s? "
-+msgstr "¿Desea realmente eliminar la clase %s? "
-
- #. SMB list columns
- #: ../system-config-printer.py:2345
-@@ -357,46 +358,46 @@
- #. IPP list columns
- #: ../system-config-printer.py:2367
- msgid "Queue"
--msgstr ""
-+msgstr "Cola"
-
- #: ../system-config-printer.py:2381
--#, fuzzy
- msgid ""
- "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
- "PPD.GZ)"
--msgstr "Descripción de Impresora PostScript (*ppd[.gz])"
-+msgstr ""
-+"Archivo de Descripción de Impresora PostScript (*.ppd, *.PPD, *.ppd.gz, *."
-+"PPD.gz, *.PPD.GZ)"
-
- #: ../system-config-printer.py:2390
- msgid "All files (*)"
--msgstr ""
-+msgstr "Todos los archivos (*)"
-
- #: ../system-config-printer.py:2425 ../system-config-printer.py:3741
- #: ../system-config-printer.py:3775
--#, fuzzy
- msgid "Search"
--msgstr "Buscando"
-+msgstr "Buscar"
+@@ -544,7 +542,7 @@
+ #: ../system-config-printer.py:2049
+ #, fuzzy
+ msgid "Really delete selected destinations?"
+-msgstr "¿Realmente eliminar la impresora %s? "
++msgstr "¿Desea realmente eliminar la impresora %s? "
+
+ #: ../system-config-printer.py:2389 ../system-config-printer.py:2399
+ msgid "Share"
+@@ -581,22 +579,22 @@
+ # ../gui/printconf-gui.glade.str:153
+ #: ../system-config-printer.py:2488 ../system-config-printer.glade.h:144
+ msgid "New Printer"
+-msgstr "Impresora Nueva"
++msgstr "Nueva impresora"
+
+ #: ../system-config-printer.py:2499
+ msgid "New Class"
+-msgstr "Clase nueva"
++msgstr "Nueva clase"
+
+ #: ../system-config-printer.py:2504
+ msgid "Change Device URI"
+-msgstr "Cambiar el URI del Dispositivo"
++msgstr "Cambiar el URI del dispositivo"
+
+ # ../util/printconf_tui.py:1002
+ # ../util/printconf_tui.py:1053
+ # ../util/printconf_tui.py:1050
+ #: ../system-config-printer.py:2513
+ msgid "Change Driver"
+-msgstr "Cambiar controlador"
++msgstr "Cambiar el controlador"
+
+ #: ../system-config-printer.py:2607 ../system-config-printer.py:2872
+ #: ../system-config-printer.py:3058 ../system-config-printer.py:4092
+@@ -630,7 +628,7 @@
+
+ #: ../system-config-printer.py:3307
+ msgid " (Current)"
+-msgstr "(Actual)"
++msgstr " (Actual)"
+
+ #: ../system-config-printer.py:3336 ../system-config-printer.py:3342
+ #: ../system-config-printer.py:3769
+@@ -703,11 +701,11 @@
+
+ #: ../system-config-printer.py:4290
+ msgid " (recommended)"
+-msgstr "(recomendado)"
++msgstr " (recomendado)"
+
+ #: ../system-config-printer.py:4304
+ msgid "This PPD is generated by foomatic."
+-msgstr "Este PPD es generado por foomatic."
++msgstr "Foomatic genera este PPD."
+
+ # ../gui/printconf-gui.glade.str:141
+ # ../gui/printconf-gui.glade.str:153
+@@ -736,7 +734,7 @@
+ #: ../system-config-printer.py:4383
+ #, python-format
+ msgid "The '%s' driver cannot be used with printer '%s %s'."
+-msgstr "El controlador '%s' no se puede usar con la impresora '%s %s'."
++msgstr "No se puede usar el controlador '%s' con la impresora '%s %s'."
+
+ #. This printer references some XML that is not
+ #. installed by default. Point the user at the
+@@ -749,7 +747,7 @@
+ #. This error came from trying to open the PPD file.
+ #: ../system-config-printer.py:4400
+ msgid "PPD error"
+-msgstr "Error del PPD"
++msgstr "Error de PPD"
+
+ #: ../system-config-printer.py:4402
+ msgid "Failed to read PPD file. Possible reason follows:"
+@@ -766,18 +764,18 @@
+
+ #: ../system-config-printer.py:4450 ../system-config-printer.py:4488
+ msgid "No Installable Options"
+-msgstr "No hay Opciones Instalables"
++msgstr "No hay opciones instalables"
# ../gui/printconf-gui.glade.str:141
# ../gui/printconf-gui.glade.str:153
# ../gui/printconf-gui.glade.str:153
- #: ../system-config-printer.py:2428 ../system-config-printer.glade.h:155
- msgid "New Printer"
--msgstr "Impresora Nueva"
-+msgstr "Nueva impresora"
-
- #: ../system-config-printer.py:2438 ../system-config-printer.glade.h:154
- msgid "New Class"
--msgstr "Clase nueva"
-+msgstr "Nueva clase"
-
- #: ../system-config-printer.py:2443
- msgid "Change Device URI"
--msgstr "Cambiar el URI del Dispositivo"
-+msgstr "Cambiar el URI del dispositivo"
-
- # ../util/printconf_tui.py:1002
- # ../util/printconf_tui.py:1053
- # ../util/printconf_tui.py:1050
- #: ../system-config-printer.py:2452
- msgid "Change Driver"
--msgstr "Cambiar controlador"
-+msgstr "Cambiar el controlador"
-
- #: ../system-config-printer.py:2551 ../system-config-printer.py:2775
- #: ../system-config-printer.py:2941 ../system-config-printer.py:3764
-@@ -420,12 +421,11 @@
-
- #: ../system-config-printer.py:3162
- msgid " (Current)"
--msgstr "(Actual)"
-+msgstr " (Actual)"
-
- #: ../system-config-printer.py:3188 ../system-config-printer.py:3449
--#, fuzzy
- msgid "Scanning..."
--msgstr "Escala:"
-+msgstr "Examinando..."
-
- #: ../system-config-printer.py:3360 ../system-config-printer.py:3427
- msgid "Verified"
-@@ -445,15 +445,15 @@
-
- #: ../system-config-printer.py:3483
- msgid "It is not possible to obtain a list of queues from this host."
--msgstr ""
-+msgstr "No es posible obtener una lista de las colas desde este equipo."
-
- #: ../system-config-printer.py:3487
- msgid "No queues"
--msgstr ""
-+msgstr "No hay colas"
-
- #: ../system-config-printer.py:3488
- msgid "There are no queues available."
--msgstr ""
-+msgstr "No hay colas disponibles."
-
- #: ../system-config-printer.py:3545
- msgid "A printer connected to the parallel port."
-@@ -484,42 +484,39 @@
- "Impresora local detectada por la Capa de Abstracción de Hardware (HAL)."
-
- #: ../system-config-printer.py:3787
--#, fuzzy
- msgid "-- Select printer model --"
--msgstr "Seleccione Impresora desde la base de datos"
-+msgstr "-- Seleccione el modelo de impresora --"
-
- #: ../system-config-printer.py:3789
- msgid "-- No matches found --"
--msgstr ""
-+msgstr "-- No se encontraron coincidencias --"
-
- #: ../system-config-printer.py:3954
- msgid " (recommended)"
--msgstr "(recomendado)"
-+msgstr " (recomendado)"
-
- #: ../system-config-printer.py:3968
- msgid "This PPD is generated by foomatic."
--msgstr "Este PPD es generado por foomatic."
-+msgstr "Foomatic genera este PPD."
-
- # ../gui/printconf-gui.glade.str:141
- # ../gui/printconf-gui.glade.str:153
- # ../gui/printconf-gui.glade.str:153
- #: ../system-config-printer.py:3994
--#, fuzzy
- msgid "OpenPrinting"
--msgstr "Imprimiendo"
-+msgstr "OpenPrinting"
-
- #: ../system-config-printer.py:3996
- msgid "Distributable"
--msgstr ""
-+msgstr "Distribuible"
-
- #: ../system-config-printer.py:3998
--#, fuzzy
- msgid "None"
--msgstr "ninguno"
-+msgstr "Ninguno"
-
- #: ../system-config-printer.py:4006
- msgid "Not specified."
--msgstr ""
-+msgstr "No especificado."
-
- #. Foomatic database problem of some sort.
- #: ../system-config-printer.py:4033
-@@ -529,7 +526,7 @@
- #: ../system-config-printer.py:4034
- #, python-format
- msgid "The '%s' driver cannot be used with printer '%s %s'."
--msgstr "El controlador '%s' no se puede usar con la impresora '%s %s'."
-+msgstr "No se puede usar el controlador '%s' con la impresora '%s %s'."
-
- #. This printer references some XML that is not
- #. installed by default. Point the user at the
-@@ -542,7 +539,7 @@
- #. This error came from trying to open the PPD file.
- #: ../system-config-printer.py:4051
- msgid "PPD error"
--msgstr "Error del PPD"
-+msgstr "Error de PPD"
-
- #: ../system-config-printer.py:4053
- msgid "Failed to read PPD file. Possible reason follows:"
-@@ -551,27 +548,26 @@
- #. Failed to get PPD downloaded from OpenPrinting XXX
- #: ../system-config-printer.py:4064
- msgid "Downloadable drivers"
--msgstr ""
-+msgstr "Controladores descargables"
-
- #: ../system-config-printer.py:4065
- msgid "Support for downloadable drivers is not yet completed."
--msgstr ""
-+msgstr "TodavÃa no se ha completado el soporte para controladores descargables."
-
- #: ../system-config-printer.py:4115 ../system-config-printer.py:4152
--#, fuzzy
- msgid "No Installable Options"
--msgstr "Opciones Instalables"
-+msgstr "No hay opciones instalables"
-
- # ../gui/printconf-gui.glade.str:141
- # ../gui/printconf-gui.glade.str:153
- # ../gui/printconf-gui.glade.str:153
- #: ../system-config-printer.py:4199
+ #: ../system-config-printer.py:4534
msgid "Adding"
-msgstr "Agregando"
+msgstr "Añadiendo"
- #: ../system-config-printer.py:4200
+ #: ../system-config-printer.py:4535
msgid "Adding printer"
-msgstr "Agregando impresoras"
+msgstr "Añadiendo la impresora"
- #: ../system-config-printer.py:4352
+ #: ../system-config-printer.py:4696
msgid "Install driver"
-@@ -580,7 +576,7 @@
- #: ../system-config-printer.py:4353
+@@ -786,7 +784,7 @@
+ #: ../system-config-printer.py:4697
#, python-format
msgid "Printer '%s' requires the %s package but it is not currently installed."
-msgstr "La impresora '%s' necesita el paquete %s que no está instalado."
+msgstr "La impresora '%s' necesita el paquete %s, pero no está instalado."
- #: ../system-config-printer.py:4360
+ #: ../system-config-printer.py:4722
msgid "Missing driver"
-@@ -595,320 +591,6 @@
- "La impresora '%s' necesita el paquete '%s' que no está instalado. Por favor, "
- "instálelo antes de usar esta impresora."
-
--#: ../troubleshoot.py:46
--msgid ""
--"To start this tool, select System->Administration->Printing from the main "
--"menu."
--msgstr ""
--
--#: ../troubleshoot.py:56
--#, fuzzy
--msgid "Authentication"
--msgstr "<b>Autenticación</b>"
--
--#: ../troubleshoot.py:71
--#, fuzzy
--msgid "Password required"
--msgstr "Se requiere actualización"
--
--#: ../troubleshoot.py:79 ../system-config-printer.glade.h:195
--#: ../applet.glade.h:5
--msgid "Password:"
--msgstr "Contraseña:"
--
--#: ../troubleshoot.py:104
--msgid "Printing troubleshooter"
--msgstr ""
--
--#: ../troubleshoot.py:401
--msgid "Trouble-shooting Printing"
--msgstr ""
--
--#: ../troubleshoot.py:403
--msgid ""
--"In the next few screens I will ask you some questions about your problem "
--"with printing. Based on your answers I will try to suggest a solution."
--msgstr ""
--
--#: ../troubleshoot.py:407
--msgid "Click 'Forward' to begin."
--msgstr ""
--
--#: ../troubleshoot.py:418
--msgid "Sorry!"
--msgstr ""
--
--#: ../troubleshoot.py:419
--msgid ""
--"I have not been able to work out what the problem is, but I have collected "
--"some useful information to put in a bug report."
--msgstr ""
--
--#: ../troubleshoot.py:488
--#, fuzzy
--msgid "Queue Not Accepting Jobs"
--msgstr "Aceptando trabajos"
--
--#: ../troubleshoot.py:489
--#, fuzzy
--msgid "The CUPS printer on the server is not accepting jobs."
--msgstr "Esta impresora compartida no es accesible."
--
--#: ../troubleshoot.py:513 ../troubleshoot.py:1259
--msgid "Queue Not Enabled"
--msgstr ""
--
--#: ../troubleshoot.py:514
--#, fuzzy
--msgid "The CUPS printer on the server is not enabled."
--msgstr "Esta impresora compartida no es accesible."
--
--#: ../troubleshoot.py:531 ../troubleshoot.py:1253
--#, python-format
--msgid "The reason given is: `%s'."
--msgstr ""
--
--#: ../troubleshoot.py:533 ../troubleshoot.py:1255
--msgid "This may be due to the printer being disconnected or switched off."
--msgstr ""
--
--#: ../troubleshoot.py:549
--msgid "Queue Not Shared"
--msgstr ""
--
--#: ../troubleshoot.py:550
--msgid "The CUPS printer on the server is not shared."
--msgstr ""
--
--# ../gui/printconf-gui.glade.str:141
--# ../gui/printconf-gui.glade.str:153
--# ../gui/printconf-gui.glade.str:153
--#: ../troubleshoot.py:584
--#, fuzzy
--msgid "Choose Network Printer"
--msgstr "Impresora Nueva"
--
--#: ../troubleshoot.py:585
--msgid ""
--"Please select the network printer you are trying to use from the list below. "
--"If it does not appear in the list, select 'Not listed'."
--msgstr ""
--
--#: ../troubleshoot.py:590 ../troubleshoot.py:1366
--msgid "Name"
--msgstr "Nombre"
--
--#: ../troubleshoot.py:594 ../troubleshoot.py:1370
--#, fuzzy
--msgid "Information"
--msgstr "Ubicación"
--
--#: ../troubleshoot.py:627 ../troubleshoot.py:1394
--#, fuzzy
--msgid "Not listed"
--msgstr "No conectado"
--
--# ../gui/printconf-gui.glade.str:141
--# ../gui/printconf-gui.glade.str:153
--# ../gui/printconf-gui.glade.str:153
--#: ../troubleshoot.py:788
--#, fuzzy
--msgid "Remote Address"
--msgstr "Impresoras Remotas"
--
--#: ../troubleshoot.py:789
--msgid ""
--"Please enter as many details as you can about the network address of this "
--"printer."
--msgstr ""
--
--#: ../troubleshoot.py:797
--#, fuzzy
--msgid "Server name:"
--msgstr "Nombre de Usuario:"
--
--#: ../troubleshoot.py:803
--msgid "Server IP address:"
--msgstr ""
--
--#: ../troubleshoot.py:824
--#, fuzzy
--msgid "Printer Location"
--msgstr "Opciones de la Impresora"
--
--#: ../troubleshoot.py:825
--#, fuzzy
--msgid "Is the printer connected to this computer or available on the network?"
--msgstr "Una impresora conectada al puerto paralelo."
--
--# ../util/printconf_tui.py:1740
--# ../util/printconf_tui.py:1830
--# ../util/printconf_tui.py:1859
--#: ../troubleshoot.py:827
--#, fuzzy
--msgid "Locally connected printer"
--msgstr "¿Realmente eliminar la impresora %s? "
--
--# ../gui/printconf-gui.glade.str:141
--# ../gui/printconf-gui.glade.str:153
--# ../gui/printconf-gui.glade.str:153
--#: ../troubleshoot.py:828
--#, fuzzy
--msgid "Network printer"
--msgstr "Impresora Nueva"
--
--#: ../troubleshoot.py:840
--msgid "CUPS Service Stopped"
--msgstr ""
--
--#: ../troubleshoot.py:841
--msgid ""
--"The CUPS print spooler does not appear to be running. To correct this, "
--"choose System->Administration->Services from the main menu and look for the "
--"`cups' service."
--msgstr ""
--
--# ../gui/printconf-gui.glade.str:141
--# ../gui/printconf-gui.glade.str:153
--# ../gui/printconf-gui.glade.str:153
--#: ../troubleshoot.py:870 ../applet.py:729
--msgid "Pending"
--msgstr "Pendiente"
--
--#: ../troubleshoot.py:871 ../applet.py:730
--msgid "Held"
--msgstr "Mantenido"
--
--#: ../troubleshoot.py:874 ../applet.py:733
--msgid "Canceled"
--msgstr "Cancelado"
--
--#: ../troubleshoot.py:875 ../applet.py:734
--msgid "Aborted"
--msgstr "Abortado"
--
--#: ../troubleshoot.py:876 ../applet.py:735
--msgid "Completed"
--msgstr "Completo"
--
--#: ../troubleshoot.py:885
--#, fuzzy
--msgid "Test Page"
--msgstr "Imprimir Página de Prueba"
--
--#: ../troubleshoot.py:897
--msgid "Cancel All Jobs"
--msgstr ""
--
--#: ../troubleshoot.py:902 ../applet.py:184
--msgid "Job"
--msgstr "Trabajo"
--
--#: ../troubleshoot.py:906 ../applet.py:185
--msgid "Document"
--msgstr "Documento"
--
--#: ../troubleshoot.py:907 ../applet.py:189
--msgid "Status"
--msgstr "Estado"
--
--#: ../troubleshoot.py:928
--msgid "Did the test page print correctly?"
--msgstr ""
--
--#: ../troubleshoot.py:935
--msgid "Yes"
--msgstr ""
--
--#: ../troubleshoot.py:936
--msgid "No"
--msgstr ""
--
--#: ../troubleshoot.py:1118
--#, fuzzy
--msgid "Status Messages"
--msgstr "Mensaje"
--
--#: ../troubleshoot.py:1119
--msgid "There are status messages associated with this queue."
--msgstr ""
--
--#: ../troubleshoot.py:1125
--#, fuzzy
--msgid "Printer's state message:"
--msgstr "Estado de la Impresora:"
--
--#: ../troubleshoot.py:1133
--#, fuzzy
--msgid "Printer's state reasons:"
--msgstr "Estado de la Impresora:"
--
--#: ../troubleshoot.py:1186
--msgid "Queue Rejecting Jobs"
--msgstr ""
--
--#: ../troubleshoot.py:1211
--#, python-format
--msgid "The queue `%s' is rejecting jobs."
--msgstr ""
--
--#: ../troubleshoot.py:1215
--#, python-format
--msgid " The reason given is: `%s'."
--msgstr ""
--
--#: ../troubleshoot.py:1218
--msgid ""
--"To make the queue accept jobs, select the `Accepting Jobs' checkbox in the "
--"`Policies' tab for the printer in the printer administration tool."
--msgstr ""
--
--#: ../troubleshoot.py:1260
--#, python-format
--msgid "The queue `%s' is not enabled."
--msgstr ""
--
--#: ../troubleshoot.py:1263
--msgid ""
--"To enable it, select the `Enabled' checkbox in the `Policies' tab for the "
--"printer in the printer administration tool."
--msgstr ""
--
--#: ../troubleshoot.py:1278
--msgid "Check Server Firewall"
--msgstr ""
--
--# ../util/printconf_gui.py:1721 ../util/printconf_gui.py:1738
--# ../util/printconf_gui.py:1755 ../util/printconf_tui.py:1715
--# ../util/printconf_gui.py:1812 ../util/printconf_gui.py:1829
--# ../util/printconf_gui.py:1863 ../util/printconf_tui.py:1805
--# ../util/printconf_gui.py:1942 ../util/printconf_tui.py:1834
--#: ../troubleshoot.py:1279
--#, fuzzy
--msgid "It is not possible to connect to the server."
--msgstr "Hubo un problema al conectar al servidor CUPS."
--
--#: ../troubleshoot.py:1292
--#, python-format
--msgid ""
--"Please check to see if a firewall or router configuration is blocking TCP "
--"port %d on server `%s'."
--msgstr ""
--
--# ../gui/printconf-gui.glade.str:141
--# ../gui/printconf-gui.glade.str:153
--# ../gui/printconf-gui.glade.str:153
--#: ../troubleshoot.py:1360
--#, fuzzy
--msgid "Choose Printer"
--msgstr "Copiar Impresora"
--
--#: ../troubleshoot.py:1361
--msgid ""
--"Please select the printer you are trying to use from the list below. If it "
--"does not appear in the list, select 'Not listed'."
--msgstr ""
--
- #: ../system-config-printer.glade.h:1
- msgid " "
- msgstr " "
-@@ -938,11 +620,11 @@
+@@ -842,11 +840,11 @@
# ../gui/printconf-gui.glade.str:88
- #: ../system-config-printer.glade.h:9
+ #: ../system-config-printer.glade.h:11
msgid "<b>Basic Server Settings</b>"
-msgstr "<b>Opciones Básicas del Servidor</b>"
+msgstr "<b>Opciones básicas del servidor</b>"
- #: ../system-config-printer.glade.h:10
+ #: ../system-config-printer.glade.h:12
msgid "<b>Common Options</b>"
-msgstr "<b>Opciones Comúnes</b>"
+msgstr "<b>Opciones comúnes</b>"
- #: ../system-config-printer.glade.h:11
+ #: ../system-config-printer.glade.h:13
msgid "<b>Description</b>"
-@@ -953,32 +635,28 @@
- msgstr "<b>Descripción</b> (opcional)"
-
- #: ../system-config-printer.glade.h:13
--#, fuzzy
+@@ -858,7 +856,7 @@
+
+ #: ../system-config-printer.glade.h:15
msgid "<b>Download Printer Driver</b>"
--msgstr "<b>Comentario acerca del Controlador</b>"
+-msgstr "<b>Descargar Controlador de Impresora</b>"
+msgstr "<b>Descargar controlador de impresora</b>"
- #: ../system-config-printer.glade.h:14
+ #: ../system-config-printer.glade.h:16
msgid "<b>Enter device URI</b>"
- msgstr "<b>Ingrese el URI del Dispositivo</b>"
-
- #: ../system-config-printer.glade.h:15
--#, fuzzy
- msgid "<b>IPP Printer</b>"
--msgstr "<b>Impresora SMB</b>"
-+msgstr "<b>Impresora IPP</b>"
-
- #: ../system-config-printer.glade.h:16
+@@ -870,15 +868,15 @@
+
+ #: ../system-config-printer.glade.h:18
msgid "<b>Image Options</b>"
-msgstr "<b>Opciones de Imágen</b>"
+msgstr "<b>Opciones de imagen</b>"
- #: ../system-config-printer.glade.h:17
--#, fuzzy
+ #: ../system-config-printer.glade.h:19
msgid "<b>Installed Options</b>"
--msgstr "<b>Opciones de Imágen</b>"
+-msgstr "<b>Opciones Instaladas</b>"
+msgstr "<b>Opciones instaladas</b>"
- #: ../system-config-printer.glade.h:18
--#, fuzzy
+ #: ../system-config-printer.glade.h:20
msgid "<b>License Terms</b>"
--msgstr "<b>Nombre de Impresora</b>"
+-msgstr "<b>Términos de la Licencia</b>"
+msgstr "<b>Términos de la licencia</b>"
- #: ../system-config-printer.glade.h:19
+ #: ../system-config-printer.glade.h:21
msgid "<b>Location of the LPD network printer</b>"
-@@ -993,13 +671,12 @@
- msgstr "<b>Ubicación</b> (opcional)"
-
- #: ../system-config-printer.glade.h:22
--#, fuzzy
- msgid "<b>Note</b>"
--msgstr "<b>Estado</b>"
-+msgstr "<b>Nota</b>"
-
- #: ../system-config-printer.glade.h:23
+@@ -898,7 +896,7 @@
+
+ #: ../system-config-printer.glade.h:25
msgid "<b>Other Options (Advanced)</b>"
-msgstr "<b>Otras Opciones (Avanzado)</b>"
+msgstr "<b>Otras opciones (avanzado)</b>"
- #: ../system-config-printer.glade.h:24
+ #: ../system-config-printer.glade.h:26
msgid "<b>Policies</b>"
-@@ -1019,12 +696,11 @@
-
- #: ../system-config-printer.glade.h:28
+@@ -918,11 +916,11 @@
+
+ #: ../system-config-printer.glade.h:30
msgid "<b>Select Connection</b>"
-msgstr "<b>Seleccione Conexión</b>"
+msgstr "<b>Seleccione una conexión</b>"
- #: ../system-config-printer.glade.h:29
--#, fuzzy
+ #: ../system-config-printer.glade.h:31
msgid "<b>Select Driver</b>"
--msgstr "<b>Impresora Predeterminada</b>"
+-msgstr "<b>Seleccione Controlador</b>"
+msgstr "<b>Seleccione un controlador</b>"
- #: ../system-config-printer.glade.h:30
+ #: ../system-config-printer.glade.h:32
msgid "<b>Settings of the serial port</b>"
-@@ -1040,11 +716,11 @@
-
- #: ../system-config-printer.glade.h:33
+@@ -938,11 +936,11 @@
+
+ #: ../system-config-printer.glade.h:35
msgid "<b>Tests and Maintenance</b>"
--msgstr ""
+-msgstr "<b>Pruebas y Mantenimiento</b>"
+msgstr "<b>Pruebas y mantenimiento</b>"
- #: ../system-config-printer.glade.h:34
+ #: ../system-config-printer.glade.h:36
msgid "<b>Text Options</b>"
-msgstr "<b>Opciones de Texto</b>"
+msgstr "<b>Opciones del texto</b>"
- #: ../system-config-printer.glade.h:35
+ #: ../system-config-printer.glade.h:37
msgid ""
-@@ -1064,7 +740,7 @@
+@@ -962,7 +960,7 @@
"\n"
"Any changes you have made will be lost unless you apply them."
msgstr ""
@@ -959,86 +444,44 @@
"\n"
"Cualquier cambio que haya hecho se perderá a menos que los aplique."
-@@ -1077,26 +753,24 @@
- "\n"
-
- #: ../system-config-printer.glade.h:44
--#, fuzzy
- msgid "A CUPS configuration tool."
--msgstr "Configuracion de la impresora - %s"
-+msgstr "Una herramienta de configuración de CUPS."
+@@ -976,15 +974,15 @@
#: ../system-config-printer.glade.h:45
- msgid "Accepting jobs"
- msgstr "Aceptando trabajos"
+ msgid "Access Control"
+-msgstr "Control de Acceso"
++msgstr "Control de acceso"
#: ../system-config-printer.glade.h:46
--#, fuzzy
- msgid "Access Control"
- msgstr "Control de acceso"
-
- #: ../system-config-printer.glade.h:47
msgid "Add or Remove Members"
-msgstr "Agregar o Eliminar Miembros"
+msgstr "Añadir o eliminar miembros"
- #: ../system-config-printer.glade.h:48
+ #: ../system-config-printer.glade.h:47
msgid "Allow printing for everyone except these users:"
-msgstr "Permitir la impresión a todos menos a estos usuarios:"
+msgstr "Permitir la impresión a todos los usuarios salvo a estos:"
- #: ../system-config-printer.glade.h:49
+ #: ../system-config-printer.glade.h:48
msgid "Allow printing from the Internet"
-@@ -1112,9 +786,8 @@
- "Permitir que los usuarios cancelen cualquier trabajo (no solamente el suyo)"
+@@ -1005,7 +1003,7 @@
+ #: ../system-config-printer.glade.h:51
+ #, fuzzy
+ msgid "Basic Server Settings"
+-msgstr "<b>Opciones Básicas del Servidor</b>"
++msgstr "<b>Opciones básicas del servidor</b>"
#: ../system-config-printer.glade.h:52
--#, fuzzy
- msgid "Authentication required"
--msgstr "<b>Autenticación</b>"
-+msgstr "Se requiere autenticación"
-
- #: ../system-config-printer.glade.h:53
msgid "Baud Rate"
-@@ -1130,7 +803,7 @@
-
- #: ../system-config-printer.glade.h:56
- msgid "Browse..."
--msgstr ""
-+msgstr "Navegar..."
-
- #: ../system-config-printer.glade.h:57
- msgid "CUPS server:"
-@@ -1147,25 +820,23 @@
+@@ -1038,7 +1036,7 @@
#. Not more than 25 characters
+ #: ../system-config-printer.glade.h:60
+ msgid "Clean Print Heads"
+-msgstr "Limpiar Cabezales de Impresión"
++msgstr "Limpiar cabezales de impresión"
+
#: ../system-config-printer.glade.h:61
- msgid "Clean Print Heads"
--msgstr ""
-+msgstr "Limpiar cabezales de impresión"
-
- #: ../system-config-printer.glade.h:62
msgid "Columns:"
- msgstr "Columnas:"
-
- #: ../system-config-printer.glade.h:63
--#, fuzzy
- msgid "Comments..."
--msgstr "Comentario"
-+msgstr "Comentarios..."
-
- #: ../system-config-printer.glade.h:64
- msgid "Connect to CUPS server"
- msgstr "Conectar a un servidor CUPS"
-
- #: ../system-config-printer.glade.h:65
--#, fuzzy
- msgid "Connect to a different print server"
--msgstr "Conectar a un servidor CUPS"
-+msgstr "Conectar a un servidor de impresión distinto"
-
- #: ../system-config-printer.glade.h:66
- msgid "Connecting"
-@@ -1177,7 +848,7 @@
+@@ -1062,7 +1060,7 @@
"Connecting to Server:\n"
"%s\n"
msgstr ""
@@ -1046,48 +489,17 @@
+"Conectando al servidor:\n"
"%s\n"
- #: ../system-config-printer.glade.h:71
-@@ -1189,34 +860,26 @@
+ #: ../system-config-printer.glade.h:69
+@@ -1074,7 +1072,7 @@
# ../gui/printconf-gui.glade.str:153
- #: ../system-config-printer.glade.h:72
+ #: ../system-config-printer.glade.h:70
msgid "Copy Printer"
-msgstr "Copiar Impresora"
+msgstr "Copiar impresora"
- # ../gui/printconf-gui.glade.str:141
- # ../gui/printconf-gui.glade.str:153
- # ../gui/printconf-gui.glade.str:153
- #: ../system-config-printer.glade.h:73
--#, fuzzy
- msgid "Copy this printer queue"
--msgstr "Copiar Impresora"
-+msgstr "Copiar esta cola de impresión"
-
- #: ../system-config-printer.glade.h:74
--#, fuzzy
- msgid "Copyright © 2006-2007 Red Hat, Inc."
--msgstr "Copyright 2006, 2007 Red Hat, Inc."
-+msgstr "Copyright © 2006-2007 Red Hat, Inc."
-
- #: ../system-config-printer.glade.h:75
--#, fuzzy
- msgid "Create a new printer group"
--msgstr ""
--"Se va a crear una nueva impresora %s en\n"
--"%s.\n"
-+msgstr "Crear un nuevo grupo de impresoras"
-
- #: ../system-config-printer.glade.h:76
--#, fuzzy
- msgid "Create a new printer queue"
--msgstr ""
--"Se va a crear una nueva impresora %s en\n"
--"%s.\n"
-+msgstr "Crear una nueva cola de impresión"
-
- #: ../system-config-printer.glade.h:77
- msgid "Data Bits"
-@@ -1234,7 +897,7 @@
+ #: ../system-config-printer.glade.h:71
+ #, fuzzy
+@@ -1102,7 +1100,7 @@
"57600\n"
"115200"
msgstr ""
@@ -1096,7 +508,7 @@
"1200\n"
"2400\n"
"4800\n"
-@@ -1250,7 +913,7 @@
+@@ -1118,7 +1116,7 @@
"8\n"
"7"
msgstr ""
@@ -1105,7 +517,7 @@
"8\n"
"7"
-@@ -1261,7 +924,7 @@
+@@ -1129,7 +1127,7 @@
"Odd\n"
"Even"
msgstr ""
@@ -1114,7 +526,7 @@
"Ninguna\n"
"Impar\n"
"Par"
-@@ -1274,24 +937,23 @@
+@@ -1142,7 +1140,7 @@
"RTS/CTS (Hardware)\n"
"DTR/DSR (Hardware)"
msgstr ""
@@ -1123,143 +535,95 @@
"Ninguno\n"
"XON/XOFF (Software)\n"
"RTS/CTS (Hardware)\n"
- "DTR/DSR (Hardware)"
-
- #: ../system-config-printer.glade.h:99
--#, fuzzy
- msgid "Default Printer:"
--msgstr "Impresora Predeterminada"
-+msgstr "Impresora predeterminada:"
-
- #: ../system-config-printer.glade.h:100
- msgid "Delete this printer queue"
--msgstr ""
-+msgstr "Borrar esta cola de impresión"
-
- #: ../system-config-printer.glade.h:101
+@@ -1150,7 +1148,7 @@
+
+ #: ../system-config-printer.glade.h:95
msgid "Deny printing for everyone except these users:"
-msgstr "Negar la impresión a todos menos a estos usuarios:"
+msgstr "No permitir la impresión a nadie salvo a estos usuarios:"
- #: ../system-config-printer.glade.h:102
+ #: ../system-config-printer.glade.h:96
msgid "Description:"
-@@ -1299,11 +961,11 @@
-
- #: ../system-config-printer.glade.h:103
+@@ -1158,11 +1156,11 @@
+
+ #: ../system-config-printer.glade.h:97 ../troubleshoot/DeviceListed.py:40
msgid "Device URI"
-msgstr "URI del Dispositivo"
+msgstr "URI del dispositivo"
- #: ../system-config-printer.glade.h:104
+ #: ../system-config-printer.glade.h:98
msgid "Device URI:"
-msgstr "URI del Dispositivo:"
+msgstr "URI del dispositivo:"
- #: ../system-config-printer.glade.h:105
+ #: ../system-config-printer.glade.h:99
msgid "Device description."
-@@ -1317,9 +979,8 @@
- # ../gui/printconf-gui.glade.str:85 ../util/printconf_tui.py:812
- # ../gui/printconf-gui.glade.str:85 ../util/printconf_tui.py:805
- #: ../system-config-printer.glade.h:108
--#, fuzzy
- msgid "Driver details"
--msgstr "Controladores"
-+msgstr "Detalles del controlador"
-
- #: ../system-config-printer.glade.h:109
- msgid "Empty"
-@@ -1331,11 +992,11 @@
-
- #: ../system-config-printer.glade.h:111
+@@ -1194,7 +1192,7 @@
+
+ #: ../system-config-printer.glade.h:106
msgid "Ending Banner:"
-msgstr "Mensaje de Finalización:"
+msgstr "Mensaje de finalización:"
- #: ../system-config-printer.glade.h:112
- msgid "Enter some search terms for the model of your printer."
--msgstr ""
-+msgstr "Introduzca algunos términos de búsqueda para el modelo de su impresora."
-
- #: ../system-config-printer.glade.h:113
+ #: ../system-config-printer.glade.h:107
msgid "Error Policy: \t"
-@@ -1343,7 +1004,7 @@
-
- #: ../system-config-printer.glade.h:114
+@@ -1202,7 +1200,7 @@
+
+ #: ../system-config-printer.glade.h:108
msgid "Find _Queue..."
--msgstr ""
+-msgstr "Encontrar _Cola..."
+msgstr "Encontrar _cola..."
- #: ../system-config-printer.glade.h:115
+ #: ../system-config-printer.glade.h:109
msgid "Finishings:"
-@@ -1351,12 +1012,12 @@
-
- #: ../system-config-printer.glade.h:116
+@@ -1210,14 +1208,14 @@
+
+ #: ../system-config-printer.glade.h:110
msgid "Flow Control"
-msgstr "Control de Flujo"
+msgstr "Control de flujo"
- #: ../system-config-printer.glade.h:117
+ #: ../system-config-printer.glade.h:111
msgid ""
"For the printer you have selected there are drivers available for download."
--msgstr ""
-+msgstr "Hay controladores disponibles para descarga para la impresora que ha seleccionado."
-
- #: ../system-config-printer.glade.h:118
+ msgstr ""
+-"Para la impresora que ha seleccionado hay controladores disponibles para "
+-"descargar."
++"Hay controladores disponibles para descarga para la impresora que ha "
++"seleccionado."
+
+ #: ../system-config-printer.glade.h:112
msgid "Gamma:"
-@@ -1364,16 +1025,15 @@
-
- #: ../system-config-printer.glade.h:119
- msgid "Goto Server"
--msgstr "Ir al Servidor"
-+msgstr "Ir al servidor"
-
- #: ../system-config-printer.glade.h:120
- msgid "Hold until:"
- msgstr "Retener hasta:"
-
- #: ../system-config-printer.glade.h:121
--#, fuzzy
- msgid "Host:"
--msgstr "Nombre de Equipo"
-+msgstr "Equipo:"
-
- #: ../system-config-printer.glade.h:122
- msgid "Hue adjustment:"
-@@ -1381,11 +1041,11 @@
-
- #: ../system-config-printer.glade.h:123
+@@ -1237,11 +1235,12 @@
+
+ #: ../system-config-printer.glade.h:116
msgid "Human-readable description such as \"HP LaserJet with Duplexer\""
-msgstr "Descripción legible para humanos tal como \"HP LaserJet con Duplex\""
-+msgstr "Descripción entendible para personas tal como \"HP LaserJet con Duplexer\""
-
- #: ../system-config-printer.glade.h:124
++msgstr ""
++"Descripción entendible para personas tal como \"HP LaserJet con Duplexer\""
+
+ #: ../system-config-printer.glade.h:117
msgid "Human-readable location such as \"Lab 1\""
-msgstr "Ubicación legible al humano tal como \"Lab 1\""
+msgstr "Ubicación entendible para otras personas tal como \"Lab 1\""
- #: ../system-config-printer.glade.h:125
+ #: ../system-config-printer.glade.h:118
msgid "IPP"
-@@ -1393,16 +1053,15 @@
-
- #: ../system-config-printer.glade.h:126
- msgid "IPP Browser"
--msgstr ""
-+msgstr "Navegador IPP"
-
- #: ../system-config-printer.glade.h:127
--#, fuzzy
+@@ -1253,11 +1252,11 @@
+
+ #: ../system-config-printer.glade.h:120
msgid "Installed Options"
--msgstr "Opciones Instalables"
+-msgstr "Opciones Instaladas"
+msgstr "Opciones instaladas"
- #: ../system-config-printer.glade.h:128
+ #: ../system-config-printer.glade.h:121
msgid "Job Options"
-msgstr "Opciones de Trabajo"
+msgstr "Opciones del trabajo"
- #: ../system-config-printer.glade.h:129
+ #: ../system-config-printer.glade.h:122
msgid "Job priority:"
-@@ -1431,14 +1090,14 @@
+@@ -1286,9 +1285,9 @@
"Izquierda a derecha, abajo a arriba\n"
"Derecha a izquierda, arriba a abajo\n"
"Derecha a izquierda, abajo a arriba\n"
@@ -1271,53 +635,25 @@
+"Abajo a arriba, izquierda a derecha\n"
"Abajo a arriba, derecha a izquierda"
- #: ../system-config-printer.glade.h:140
- msgid "License:"
--msgstr ""
-+msgstr "Licencia:"
-
- #: ../system-config-printer.glade.h:141
- msgid "Lines per inch:"
-@@ -1448,9 +1107,8 @@
- # ../gui/printconf-gui.glade.str:138
- # ../gui/printconf-gui.glade.str:138
- #: ../system-config-printer.glade.h:142
--#, fuzzy
- msgid "Local Driver"
--msgstr "Impresoras locales"
-+msgstr "Controlador Local"
-
- #: ../system-config-printer.glade.h:143
- msgid "Location:"
-@@ -1458,21 +1116,20 @@
-
- #. Not more than 25 characters
- #: ../system-config-printer.glade.h:145
--#, fuzzy
- msgid "Make Default"
--msgstr "_Poner por defecto"
-+msgstr "Hacerla _predeterminada"
-
- #: ../system-config-printer.glade.h:146
+ #: ../system-config-printer.glade.h:133
+@@ -1312,12 +1311,12 @@
+
+ #: ../system-config-printer.glade.h:137
msgid "Make and Model:"
-msgstr "Hacer y Modelar:"
+msgstr "Hacer y modelar:"
- #: ../system-config-printer.glade.h:147
--#, fuzzy
- msgid ""
- "May contain any printable characters except \"/\", \"#\", and space.\n"
- "Name must be unique on the local machine!"
- msgstr ""
--"Puede contener cualquier caracter imprimible excepto \"/\", \"#\", y espacio"
-+"Puede contener cualquier carácter imprimible excepto «/», «#», y espacio.\n"
-+"¡El nombre debe ser único en la máquina local!"
-
- #: ../system-config-printer.glade.h:149
+ #: ../system-config-printer.glade.h:138
+ #, fuzzy
+ msgid "Make and model:"
+-msgstr "Hacer y Modelar:"
++msgstr "Hacer y modelar:"
+
+ #: ../system-config-printer.glade.h:139
msgid "Media:"
-@@ -1492,14 +1149,14 @@
-
- #: ../system-config-printer.glade.h:153
+@@ -1337,14 +1336,14 @@
+
+ #: ../system-config-printer.glade.h:143
msgid "New Clas_s"
-msgstr "Cla_se nueva"
+msgstr "Nueva cla_se"
@@ -1325,23 +661,14 @@
# ../gui/printconf-gui.glade.str:141
# ../gui/printconf-gui.glade.str:153
# ../gui/printconf-gui.glade.str:153
- #: ../system-config-printer.glade.h:156
+ #: ../system-config-printer.glade.h:145
msgid "New _Printer"
-msgstr "_Impresora Nueva"
+msgstr "Nueva _impresora"
# ../gui/printconf-gui.glade.str:141
# ../gui/printconf-gui.glade.str:153
-@@ -1510,7 +1167,7 @@
-
- #: ../system-config-printer.glade.h:158
- msgid "No, I do not accept this license"
--msgstr ""
-+msgstr "No, no acepto esta licencia"
-
- #: ../system-config-printer.glade.h:159
- msgid ""
-@@ -1555,7 +1212,7 @@
+@@ -1400,7 +1399,7 @@
"Bale\n"
"Creador de folletos\n"
"Desplazamiento del trabajo\n"
@@ -1350,7 +677,7 @@
"Abrochar (abajo izquierda)\n"
"Abrochar (arriba derecha)\n"
"Abrochar (abajo derecha)\n"
-@@ -1578,13 +1235,13 @@
+@@ -1423,13 +1422,13 @@
"Two-sided (long edge)\n"
"Two-sided (short edge)"
msgstr ""
@@ -1361,40 +688,23 @@
+"Dos caras (a lo largo)\n"
+"Dos caras (a lo ancho)"
- #: ../system-config-printer.glade.h:190
+ #: ../system-config-printer.glade.h:179
msgid "Operation Policy:"
-msgstr "PolÃtica de Operación:"
+msgstr "PolÃtica de operación:"
- #: ../system-config-printer.glade.h:191
+ #: ../system-config-printer.glade.h:180
msgid "Orientation:"
-@@ -1602,18 +1259,22 @@
- msgid "Parity"
- msgstr "Paridad"
-
-+#: ../system-config-printer.glade.h:195 ../troubleshoot/base.py:76
-+#: ../applet.glade.h:5
-+msgid "Password:"
-+msgstr "Contraseña:"
-+
- #: ../system-config-printer.glade.h:196
+@@ -1449,7 +1448,7 @@
+
+ #: ../system-config-printer.glade.h:185
msgid "Please Wait"
-msgstr "Por favor, Espere"
+msgstr "Por favor, espere"
- #: ../system-config-printer.glade.h:197
+ #: ../system-config-printer.glade.h:186
msgid "Policies"
- msgstr "PolÃticas"
-
- #: ../system-config-printer.glade.h:198
--#, fuzzy
- msgid "Port number:"
--msgstr "Número de Puerto"
-+msgstr "Número de puerto:"
-
- #: ../system-config-printer.glade.h:199
- msgid ""
-@@ -1623,21 +1284,16 @@
+@@ -1467,8 +1466,8 @@
"Reverse portrait (180°)"
msgstr ""
"Vertical (sin rotación)\n"
@@ -1404,312 +714,216 @@
+"Apaisado invertido (270°)\n"
"Vertical invertido (180°)"
- #: ../system-config-printer.glade.h:203
--#, fuzzy
- msgid ""
- "PostScript Printer Description (PPD) files can often be found on the driver "
- "disk that comes with the printer. For PostScript printers they are often "
+ #: ../system-config-printer.glade.h:192
+@@ -1478,9 +1477,9 @@
"part of the Windows<sup>®</sup> driver."
--msgstr ""
--"Los archivos de Descripción de Impresora PostScript (PPD) se pueden "
+ msgstr ""
+ "Los archivos de Descripción de Impresora PostScript (PPD) se pueden "
-"encontrar a menudo en el disco de controladores que viene con la impresora. "
-"Para las impresoras PostScript son a menudo parte del controlador para "
-"Windows<sup>®</sup>."
-+msgstr "Los archivos de Descripción de Impresora PostScript (PPD) se pueden encontrar a menudo en el disco de controladores que se proporciona con la impresora. Para las impresoras PostScript son a menudo parte del controlador para Windows<sup>®</sup>."
-
- #: ../system-config-printer.glade.h:204
++"encontrar a menudo en el disco de controladores que se proporciona con la "
++"impresora. Para las impresoras PostScript son a menudo parte del controlador "
++"para Windows<sup>®</sup>."
+
+ #: ../system-config-printer.glade.h:193
msgid "Pretty print"
-@@ -1645,42 +1301,39 @@
-
+@@ -1489,21 +1488,21 @@
#. Not more than 25 characters
- #: ../system-config-printer.glade.h:206
--#, fuzzy
+ #: ../system-config-printer.glade.h:195
msgid "Print Self-Test Page"
+-msgstr "Imprimir Página de Auto-Prueba"
++msgstr "Imprimir página de auto-prueba"
+
+ #. Not more than 25 characters
+ #: ../system-config-printer.glade.h:197 ../troubleshoot/PrintTestPage.py:68
+ msgid "Print Test Page"
-msgstr "Imprimir Página de Prueba"
-+msgstr "Imprimir página de auto-prueba"
-
- #: ../system-config-printer.glade.h:210
++msgstr "Imprimir página de prueba"
+
+ #: ../system-config-printer.glade.h:199
+ #, fuzzy
+ msgid "Printer Properties"
+-msgstr "Informe de la Impresora"
++msgstr "Informe de la impresora"
+
+ #: ../system-config-printer.glade.h:200
msgid "Printer State:"
-msgstr "Estado de la Impresora:"
+msgstr "Estado de la impresora:"
# ../gui/printconf-gui.glade.str:141
# ../gui/printconf-gui.glade.str:153
- # ../gui/printconf-gui.glade.str:153
- #: ../system-config-printer.glade.h:211
--#, fuzzy
- msgid "Printer model:"
--msgstr "Impresora agregada"
-+msgstr "Modelo de impresora:"
-
- #: ../system-config-printer.glade.h:212
- msgid "Probe"
- msgstr "Probar"
-
- #: ../system-config-printer.glade.h:213
--#, fuzzy
- msgid "Provide PPD file"
- msgstr "Proveer archivo PPD"
-
- #: ../system-config-printer.glade.h:214
- msgid "Queue:"
--msgstr ""
-+msgstr "Cola:"
-
- #: ../system-config-printer.glade.h:215
- msgid "Refresh the list of printer queues"
--msgstr ""
-+msgstr "Refrescar la lista de colas de impresora"
-
- #: ../system-config-printer.glade.h:216
+@@ -1531,7 +1530,7 @@
+
+ #: ../system-config-printer.glade.h:206
msgid "Require encryption"
-msgstr "Requerir encriptado"
+msgstr "Requerir cifrado"
- #: ../system-config-printer.glade.h:217
+ #: ../system-config-printer.glade.h:207
msgid "Reset"
-@@ -1688,11 +1341,11 @@
-
- #: ../system-config-printer.glade.h:218
+@@ -1539,11 +1538,11 @@
+
+ #: ../system-config-printer.glade.h:208
msgid "Reset to system default"
-msgstr "Resetear a los valores por defecto del sistema"
+msgstr "Resetear a los valores predeterminados del sistema"
- #: ../system-config-printer.glade.h:219
+ #: ../system-config-printer.glade.h:209
msgid "Right margin:"
-msgstr "Márgen derecho:"
+msgstr "Margen derecho:"
- #: ../system-config-printer.glade.h:220
+ #: ../system-config-printer.glade.h:210
msgid "SCSI"
-@@ -1704,11 +1357,11 @@
-
- #: ../system-config-printer.glade.h:222
- msgid "SMB Browser"
--msgstr ""
-+msgstr "Navegador SMB"
-
- #: ../system-config-printer.glade.h:223
+@@ -1559,7 +1558,7 @@
+
+ #: ../system-config-printer.glade.h:213
msgid "Saturation:"
-msgstr "Saturación"
+msgstr "Saturación:"
- #: ../system-config-printer.glade.h:224
+ #: ../system-config-printer.glade.h:214
msgid "Save debugging information for troubleshooting"
-@@ -1724,24 +1377,22 @@
-
- #: ../system-config-printer.glade.h:227
- msgid "Search for a printer driver to download"
--msgstr ""
-+msgstr "Buscar un controlador de impresora para descargar"
-
- # ../gui/printconf-gui.glade.str:141
- # ../gui/printconf-gui.glade.str:153
- # ../gui/printconf-gui.glade.str:153
- #: ../system-config-printer.glade.h:228
--#, fuzzy
- msgid "Search terms:"
--msgstr "Buscando impresoras"
-+msgstr "Palabras a buscar:"
-
- #: ../system-config-printer.glade.h:229
+@@ -1579,7 +1578,7 @@
+
+ #: ../system-config-printer.glade.h:218
msgid "Select A File"
-msgstr "Seleccionar Un Archivo"
+msgstr "Seleccionar un archivo"
- #: ../system-config-printer.glade.h:230
--#, fuzzy
+ #: ../system-config-printer.glade.h:219
msgid "Select printer from database"
--msgstr "Seleccione Impresora desde la base de datos"
-+msgstr "Seleccionar impresora desde la base de datos"
-
- #: ../system-config-printer.glade.h:231
- msgid "Serial"
-@@ -1764,7 +1415,7 @@
-
- #: ../system-config-printer.glade.h:235
+@@ -1592,12 +1591,12 @@
+ #: ../system-config-printer.glade.h:221
+ #, fuzzy
+ msgid "Set As De_fault"
+-msgstr "_Poner por defecto"
++msgstr "Fijar valore_s por omisión"
+
+ #: ../system-config-printer.glade.h:222
+ #, fuzzy
+ msgid "Set As Default"
+-msgstr "_Poner por defecto"
++msgstr "Fijar valore_s por omisión"
+
+ #: ../system-config-printer.glade.h:223
+ #, fuzzy
+@@ -1625,7 +1624,7 @@
+
+ #: ../system-config-printer.glade.h:228
msgid "Show printers shared by other systems"
-msgstr "Mostrar impresoras compartidas por otros sistemas"
+msgstr "Mostrar las impresoras compartidas por otros sistemas"
- #: ../system-config-printer.glade.h:236
+ #: ../system-config-printer.glade.h:229
msgid "Sides:"
-@@ -1775,10 +1426,7 @@
- "Specify the default job options for this printer. Jobs arriving at this "
+@@ -1637,9 +1636,9 @@
"print server will have these options added if they are not already set by "
"the application."
--msgstr ""
+ msgstr ""
-"Especifique las opciones por defecto del trabajo para esta impresora. Los "
--"trabajos que lleguen a este servidor de impresión tendrán estas opciones si "
++"Especifique las opciones por omisión para los trabajo e esta impresora. Los "
+ "trabajos que lleguen a este servidor de impresión tendrán estas opciones si "
-"es que no vinieron configuradas por la aplicación."
-+msgstr "Especifique las opciones por omisión para los trabajo e esta impresora. Los trabajos que lleguen a este servidor de impresión tendrán estas opciones si la aplicación no configuró ninguna."
-
- #: ../system-config-printer.glade.h:238
++"la aplicación no configuró ninguna."
+
+ #: ../system-config-printer.glade.h:231
msgid "Starting Banner:"
-@@ -1786,8 +1434,9 @@
-
- #: ../system-config-printer.glade.h:239
+@@ -1649,6 +1648,7 @@
msgid "Supplier:"
--msgstr ""
-+msgstr "Proveedor:"
+ msgstr "Proveedor:"
+# (jfs) Translate the name of the program?
- #: ../system-config-printer.glade.h:240
+ #: ../system-config-printer.glade.h:233
msgid "System-Config-Printer"
msgstr "Sistema-Configurar-Impresora"
-@@ -1799,26 +1448,22 @@
- "for a large number of (non PostScript) printers. But in general manufacturer "
+@@ -1661,9 +1661,9 @@
"provided PPD files provide better access to the specific features of the "
"printer."
--msgstr ""
+ msgstr ""
-"La base de datos de impresora foomatic contiene varios archivos de "
--"Descripción de Impresora PostScript (PPD en inglés) provistos por los "
++"La base de datos de impresoras foomatic contiene varios archivos de "
+ "Descripción de Impresora PostScript (PPD en inglés) provistos por los "
-"fabricantes, y puede generar archivos PPD para un gran número de impresora "
--"(no PostScript). Pero, en general, los archivos PPD provistos por los "
--"fabricantes dan un mejor acceso a las caracterÃsticas especÃficas de las "
--"impresoras."
-+msgstr "La base de datos de impresoras foomatic contiene varios archivos de Descripción de Impresora PostScript (PPD en inglés) provistos por los fabricantes, y puede generar archivos PPD para un gran número de impresoras (no PostScript). Pero, en general, los archivos PPD provistos por los fabricantes dan un mejor acceso a las caracterÃsticas especÃficas de las impresoras."
-
- #: ../system-config-printer.glade.h:242
- msgid ""
- "These drivers do not come from your operating system supplier and will not "
++"fabricantes, y puede generar archivos PPD para un gran número de impresoras "
+ "(no PostScript). Pero, en general, los archivos PPD provistos por los "
+ "fabricantes dan un mejor acceso a las caracterÃsticas especÃficas de las "
+ "impresoras."
+@@ -1674,9 +1674,9 @@
"be covered by their commercial support. See the support and license terms "
"of the driver's supplier."
--msgstr ""
-+msgstr "Estos controladores no los proporciona el proveedor de su sistema operativo y no los cubrirá por su soporte comercial. Vea los términos de la licencia y soporte del proveedor del controlador."
-
- #: ../system-config-printer.glade.h:243
+ msgstr ""
+-"Estos controladores no vienen desde el proveedor de su sistema operativo y "
+-"no serán cubiertos por su soporte comercial. Vea los términos de la licencia "
+-"y soporte del proveedor del controlador."
++"Estos controladores no los proporciona el proveedor de su sistema operativo "
++"y no los cubrirá por su soporte comercial. Vea los términos de la licencia y "
++"soporte del proveedor del controlador."
+
+ #: ../system-config-printer.glade.h:236
msgid ""
- "This driver supports additional hardware that may be installed in the "
- "printer."
- msgstr ""
-+"Este controlador provee soporte para hardware adicional y se puede instalar "
-+"en la impresora."
-
- #: ../system-config-printer.glade.h:244
- msgid ""
-@@ -1848,6 +1493,19 @@
- "this program; if not, write to the Free Software Foundation, Inc., 675 Mass "
- "Ave, Cambridge, MA 02139, USA."
- msgstr ""
-+"Este programa es software libre; puede redistribuirlo y/o modificarlo bajo "
-+"los términos de la Licencia Pública General de GNU como fue publicada por la "
-+"Fundación de Software Libre; ya sea en su versión 2 de la Licencia, o (a su "
-+"opción) cualquier opción posterior.\n"
-+"\n"
-+"Este programa se distribuye con la esperanza que le sea útil, pero sin "
-+"NINGUNA GARANTÃA; sin siquiera la garantÃa COMERCIAL explÃcita o AJUSTE A UN "
-+"PROPÃSITO PARTICULAR. Vea la Licencia Pública General de GNU para más "
-+"detalles.\n"
-+"\n"
-+"Debe haber recibido una copia de la Licencia Pública General de GNU junto "
-+"con este programa; sino, escriba a la Fundación de Software Libre, Inc., 675 "
-+"Mass Ave, Cambridge, MA 02139, USA."
-
- #: ../system-config-printer.glade.h:250
- msgid ""
-@@ -1865,7 +1523,7 @@
-
- #: ../system-config-printer.glade.h:252
+@@ -1744,7 +1744,7 @@
+
+ #: ../system-config-printer.glade.h:245
msgid "Top margin:"
-msgstr "Márgen superior:"
+msgstr "Margen superior:"
+ #: ../system-config-printer.glade.h:246
+ msgid "Try to copy the option settings over from the old PPD. "
+@@ -1766,7 +1766,7 @@
+ #: ../system-config-printer.glade.h:250
+ #, fuzzy
+ msgid "View Print _Queue"
+-msgstr "Impresora Nueva"
++msgstr "Nueva impresora"
+
+ #: ../system-config-printer.glade.h:251
+ msgid ""
+@@ -1782,7 +1782,7 @@
+
#: ../system-config-printer.glade.h:253
- msgid "Try to copy the option settings over from the old PPD. "
-@@ -1874,7 +1532,7 @@
+ msgid "Yes, I accept this license"
+-msgstr "Si, acepto esta licencia"
++msgstr "SÃ, acepto esta licencia"
#: ../system-config-printer.glade.h:254
- msgid "URI:"
--msgstr ""
-+msgstr "URI:"
-
+ #, fuzzy
+@@ -1792,7 +1792,7 @@
#: ../system-config-printer.glade.h:255
- msgid "Use the new PPD (Postscript Printer Description) as is."
-@@ -1887,22 +1545,23 @@
-
- #: ../system-config-printer.glade.h:257
- msgid "Username:"
--msgstr "Nombre de Usuario:"
-+msgstr "Nombre de usuario:"
-
- #: ../system-config-printer.glade.h:258
- msgid ""
- "With this choice no driver download will be performed. In the next steps a "
- "locally installed driver will be selected."
- msgstr ""
-+"Con esta selección, no se descargarán controladores. En los siguientes "
-+"pasos, se seleccionará un controlador instalado localmente."
-
- #: ../system-config-printer.glade.h:259
- msgid "Word wrap"
- msgstr "Ajuste de lÃnea"
-
- #: ../system-config-printer.glade.h:260
--#, fuzzy
- msgid "Yes, I accept this license"
--msgstr "Aceptando trabajos"
-+msgstr "SÃ, acepto esta licencia"
-
- #: ../system-config-printer.glade.h:261
- msgid "_Do not apply"
-@@ -1918,7 +1577,7 @@
-
+ #, fuzzy
+ msgid "_Create Class"
+-msgstr "Clases Remotas"
++msgstr "Clases remotas"
+
+ #: ../system-config-printer.glade.h:256
+ #, fuzzy
+@@ -1834,7 +1834,7 @@
#: ../system-config-printer.glade.h:264
- msgid "_Goto Server"
--msgstr "_Ir al Servidor"
-+msgstr "_Ir al servidor"
+ #, fuzzy
+ msgid "_Server Settings..."
+-msgstr "Opciones del Servidor"
++msgstr "Opciones del servidor"
#: ../system-config-printer.glade.h:265
- msgid "_Help"
-@@ -1929,13 +1588,12 @@
- msgstr "_Instalar"
+ msgid "_Troubleshoot"
+@@ -1846,7 +1846,7 @@
#: ../system-config-printer.glade.h:267
--#, fuzzy
- msgid "_Search"
--msgstr "Buscando"
-+msgstr "_Buscar"
-
- #: ../system-config-printer.glade.h:268
- msgid "_Troubleshoot"
--msgstr ""
-+msgstr "_Resolver problemas"
-
- #: ../system-config-printer.glade.h:269
- msgid "_Verify..."
-@@ -1943,7 +1601,7 @@
-
- #: ../system-config-printer.glade.h:270
msgid "default"
-msgstr "por defecto"
+msgstr "por omisión"
- #: ../system-config-printer.glade.h:271
+ #: ../system-config-printer.glade.h:268
msgid "none"
-@@ -1954,21 +1612,27 @@
- msgstr "puntos"
-
- #: ../system-config-printer.glade.h:273
--#, fuzzy
- msgid ""
- "points\n"
- "(72 points per inch)"
--msgstr "puntos (72 puntos por pulgada)"
+@@ -1863,7 +1863,13 @@
+ #. TRANSLATORS: Replace this string with your names, one name per line. Thank you very much for your effort on translating system-config-printer and all our other tools!
+ #: ../system-config-printer.glade.h:272
+ msgid "translator-credits"
+-msgstr "Domingo Becker <domingobecker at gmail.com>, 2006, 2007, 2008"
+msgstr ""
-+"puntos\n"
-+"(72 puntos por pulgada)"
-
- #: ../system-config-printer.glade.h:275
--#, fuzzy
- msgid "system-config-printer"
--msgstr "Sistema-Configurar-Impresora"
-+msgstr "system-config-printer"
-
- #. TRANSLATORS: Replace this string with your names, one name per line. Thank you very much for your effort on translating system-config-printer and all our other tools!
- #: ../system-config-printer.glade.h:277
- msgid "translator-credits"
- msgstr ""
+"Nuria Soriano <nsoriano at redhat.it>, 2001.\n"
+"Fernando Ruiz-Tapiador Gutiérrez <frtapiador at redhat.es>, 2001.\n"
+"Yelitza Louze <ylouze at redhat.com>, 2002-2004.\n"
@@ -1719,658 +933,440 @@
#: ../system-config-printer.desktop.in.h:1
msgid "Configure printers"
-@@ -1981,165 +1645,512 @@
- msgid "Printing"
- msgstr "Imprimiendo"
-
--#: ../applet.py:80
-+#: ../statereason.py:73
+@@ -1878,16 +1884,16 @@
+
+ #: ../statereason.py:85
msgid "Toner low"
-msgstr "Toner bajo"
+msgstr "Baja de tóner"
--#: ../applet.py:81
-+#: ../statereason.py:74
+ #: ../statereason.py:86
#, python-format
msgid "Printer '%s' is low on toner."
--msgstr "Impresora '%s' baja de toner"
+-msgstr "La impresora '%s' tiene el toner bajo."
+msgstr "La impresora '%s' está baja de toner."
--#: ../applet.py:82
-+#: ../statereason.py:75
+ #: ../statereason.py:87
msgid "Toner empty"
-msgstr "Toner vacÃo"
+msgstr "Tóner vacÃo"
--#: ../applet.py:83
-+#: ../statereason.py:76
- #, python-format
- msgid "Printer '%s' has no toner left."
--msgstr "La impresora '%s' ya no tiene toner."
-+msgstr "La impresora '%s' no tiene toner."
-
--#: ../applet.py:84
-+#: ../statereason.py:77
+ #: ../statereason.py:88
+ #, python-format
+@@ -1896,12 +1902,12 @@
+
+ #: ../statereason.py:89
msgid "Cover open"
- msgstr "Cubierta abierta"
-
--#: ../applet.py:85
-+#: ../statereason.py:78
+-msgstr "La tapa está abierta"
++msgstr "Cubierta abierta"
+
+ #: ../statereason.py:90
#, python-format
msgid "The cover is open on printer '%s'."
-msgstr "La tapa de la impresora '%s' está abierta."
+msgstr "Está abierta la cubierta de la impresora '%s'."
--#: ../applet.py:86
-+#: ../statereason.py:79
+ #: ../statereason.py:91
msgid "Door open"
- msgstr "Puerta abierta"
-
--#: ../applet.py:87
-+#: ../statereason.py:80
+@@ -1910,16 +1916,16 @@
+ #: ../statereason.py:92
#, python-format
msgid "The door is open on printer '%s'."
-msgstr "La puerta de la impresora '%s' está abierta."
+msgstr "Está abierta la puerta de la impresora '%s'."
--#: ../applet.py:88
-+#: ../statereason.py:81
+ #: ../statereason.py:93
msgid "Paper low"
-msgstr "Papel bajo"
+msgstr "Baja de papel"
--#: ../applet.py:89
-+#: ../statereason.py:82
+ #: ../statereason.py:94
#, python-format
msgid "Printer '%s' is low on paper."
--msgstr "Impresora '%s' escazo de papel"
+-msgstr "La impresora '%s' se está quedando sin papel."
+msgstr "No le queda casi papel a la impresora '%s'."
--#: ../applet.py:90
-+#: ../statereason.py:83
+ #: ../statereason.py:95
msgid "Out of paper"
- msgstr "Sin papel"
-
--#: ../applet.py:91
-+#: ../statereason.py:84
- #, python-format
- msgid "Printer '%s' is out of paper."
--msgstr "Impresora '%s' sin papel"
-+msgstr "La impresora '%s' no tiene papel."
-
--#: ../applet.py:92
-+#: ../statereason.py:85
+@@ -1932,12 +1938,12 @@
+
+ #: ../statereason.py:97
msgid "Ink low"
-msgstr "Tinta baja"
+msgstr "Baja de tinta"
--#: ../applet.py:93
-+#: ../statereason.py:86
+ #: ../statereason.py:98
#, python-format
msgid "Printer '%s' is low on ink."
--msgstr "Impresora '%s' baja de tinta"
+-msgstr "La impresora '%s' tiene poca tinta."
+msgstr "La impresora '%s' no tiene casi tinta."
--#: ../applet.py:94
-+#: ../statereason.py:87
+ #: ../statereason.py:99
msgid "Ink empty"
- msgstr "Tinta vacÃa"
-
--#: ../applet.py:95
-+#: ../statereason.py:88
+@@ -1946,7 +1952,7 @@
+ #: ../statereason.py:100
#, python-format
msgid "Printer '%s' has no ink left."
--msgstr "Impresora '%s' no tiene tinta restante"
+-msgstr "La impresora '%s' ya no tiene tinta."
+msgstr "La impresora '%s' no tiene tinta."
--#: ../applet.py:96
-+#: ../statereason.py:89
+ #: ../statereason.py:101
+ #, fuzzy
+@@ -1960,12 +1966,12 @@
+
+ #: ../statereason.py:103
msgid "Not connected?"
- msgstr "¿No conectado?"
-
--#: ../applet.py:97
-+#: ../statereason.py:90
+-msgstr "¿No conectada?"
++msgstr "¿No conectado?"
+
+ #: ../statereason.py:104
#, python-format
msgid "Printer '%s' may not be connected."
--msgstr "La impresora '%s' puede no estar conectada."
+-msgstr "La impresora '%s' puede estar desconectada."
+msgstr "Puede que la impresora '%s' no esté conectada."
--#: ../applet.py:104
-+#: ../statereason.py:97
+ #: ../statereason.py:105 ../statereason.py:121
+ msgid "Printer error"
+@@ -1974,15 +1980,15 @@
+ #: ../statereason.py:106
+ #, fuzzy, python-format
+ msgid "There is a problem on printer `%s'."
+-msgstr "La puerta de la impresora '%s' está abierta."
++msgstr "Está abierta la puerta de la impresora '%s'."
+
+ #: ../statereason.py:117
msgid "Printer report"
--msgstr "Reporte de impresora"
+-msgstr "Informe de la Impresora"
+msgstr "Informe de la impresora"
--# ../gui/printconf-gui.glade.str:141
--# ../gui/printconf-gui.glade.str:153
--# ../gui/printconf-gui.glade.str:153
--#: ../applet.py:106
-+#: ../statereason.py:99
+ #: ../statereason.py:119
msgid "Printer warning"
--msgstr "Advertencia de impresora"
+-msgstr "Advertencia de la Impresora"
+msgstr "Aviso de la impresora"
--#: ../applet.py:108
-+#: ../statereason.py:101
- msgid "Printer error"
--msgstr "Error de impresora"
-+msgstr "Error de la impresora"
-
--#: ../applet.py:109
-+#: ../statereason.py:102
- #, python-format
- msgid "Printer '%s': '%s'."
--msgstr "Impresora '%s': '%s'"
-+msgstr "Impresora '%s': '%s'."
-+
-+#: ../troubleshoot/__init__.py:37
-+msgid "Printing troubleshooter"
-+msgstr "Asistente para resolver problemas de impresión"
-+
-+#: ../troubleshoot/base.py:33
-+msgid ""
-+"To start this tool, select System->Administration->Printing from the main "
-+"menu."
-+msgstr ""
-+"Para iniciar esta herramienta, seleccione Sistema->Administración-"
-+">Impresoras desde el menú principal."
-+
-+#: ../troubleshoot/base.py:53
-+msgid "Authentication"
-+msgstr "Autenticación"
-+
-+#: ../troubleshoot/base.py:68
-+msgid "Password required"
-+msgstr "Se requiere contraseña"
-+
-+# ../gui/printconf-gui.glade.str:141
-+# ../gui/printconf-gui.glade.str:153
-+# ../gui/printconf-gui.glade.str:153
-+#: ../troubleshoot/ChooseNetworkPrinter.py:29
-+msgid "Choose Network Printer"
-+msgstr "Seleccionar Impresora de Red"
-+
-+#: ../troubleshoot/ChooseNetworkPrinter.py:30
-+msgid ""
-+"Please select the network printer you are trying to use from the list below. "
-+"If it does not appear in the list, select 'Not listed'."
-+msgstr ""
-+"Por favor, seleccione la impresora de red que intenta usar desde la lista de "
-+"abajo. Si no aparece en la lista, seleccione 'No listada'."
-+
-+#: ../troubleshoot/ChooseNetworkPrinter.py:35
-+#: ../troubleshoot/ChoosePrinter.py:36
-+msgid "Name"
-+msgstr "Nombre"
-+
-+#: ../troubleshoot/ChooseNetworkPrinter.py:39
-+#: ../troubleshoot/ChoosePrinter.py:40
-+msgid "Information"
-+msgstr "Información"
-+
-+#: ../troubleshoot/ChooseNetworkPrinter.py:75
-+#: ../troubleshoot/ChoosePrinter.py:64
-+msgid "Not listed"
-+msgstr "No listada"
-+
-+# ../gui/printconf-gui.glade.str:141
-+# ../gui/printconf-gui.glade.str:153
-+# ../gui/printconf-gui.glade.str:153
-+#: ../troubleshoot/ChoosePrinter.py:30
-+msgid "Choose Printer"
-+msgstr "Elija Impresora"
-+
-+#: ../troubleshoot/ChoosePrinter.py:31
-+msgid ""
-+"Please select the printer you are trying to use from the list below. If it "
-+"does not appear in the list, select 'Not listed'."
-+msgstr ""
-+"Por favor, seleccione la impresora que intenta usar desde la lista de abajo. "
-+"Si no aparece en la lista, seleccione 'No listada'."
-+
-+#: ../troubleshoot/ErrorLogCheckpoint.py:30
-+#: ../troubleshoot/ErrorLogFetch.py:30
-+msgid "Debugging"
-+msgstr "Depuración"
-+
-+#: ../troubleshoot/ErrorLogCheckpoint.py:31
-+msgid ""
-+"I would like to enable debugging output from the CUPS scheduler. This may "
-+"cause the scheduler to restart. Click the button below to enable debugging."
-+msgstr "DesearÃa activar la depuración de la salida del programador de CUPS. Esto puede hacer que se reinicie el programador. Pulse el botón mostrado abajo para activar la depuración."
-+
-+#: ../troubleshoot/ErrorLogCheckpoint.py:35
-+msgid "Enable Debugging"
-+msgstr "Activar la depuración"
-+
-+#: ../troubleshoot/ErrorLogCheckpoint.py:159
-+msgid "Debug logging enabled."
-+msgstr "Registro de depuración activado."
-+
-+#: ../troubleshoot/ErrorLogCheckpoint.py:161
-+msgid "Debug logging was already enabled."
-+msgstr "El registro de depuración ya estaba activo."
-+
-+#: ../troubleshoot/ErrorLogFetch.py:31
-+msgid ""
-+"I would like to disable debugging output from the CUPS scheduler. This may "
-+"cause the scheduler to restart. Click the button below to disable debugging."
-+msgstr "DesearÃa deshabilitar la salida de depuración del programador de CUPS. Esto puede hacer que el programador se reinicie. Pulse el botón mostrado abajo para deshabilitar la depuración."
-+
-+#: ../troubleshoot/ErrorLogFetch.py:35
-+msgid "Disable Debugging"
-+msgstr "Deshabilitar la depuración"
-+
-+#: ../troubleshoot/ErrorLogFetch.py:145
-+msgid "Debug logging disabled."
-+msgstr "Se ha deshabilitado el registro de depuración."
-+
-+#: ../troubleshoot/ErrorLogFetch.py:147
-+msgid "Debug logging was already disabled."
-+msgstr "El registro de depuración ya estaba deshabilitado."
-+
-+#: ../troubleshoot/ErrorLogParse.py:30
-+msgid "Error log messages"
-+msgstr "Registro de mensajes de error"
-+
-+#: ../troubleshoot/ErrorLogParse.py:31
-+msgid "There are messages in the error log."
-+msgstr "Hay mensajes en el registro de errores."
-+
-+#: ../troubleshoot/LocalOrRemote.py:27
-+msgid "Printer Location"
-+msgstr "Ubicación de la Impresora"
-+
-+#: ../troubleshoot/LocalOrRemote.py:28
-+msgid "Is the printer connected to this computer or available on the network?"
-+msgstr ""
-+"¿La impresora está conectada a esta computadora o está disponible en la red?"
-+
-+# ../util/printconf_tui.py:1740
-+# ../util/printconf_tui.py:1830
-+# ../util/printconf_tui.py:1859
-+#: ../troubleshoot/LocalOrRemote.py:30
-+msgid "Locally connected printer"
-+msgstr "Impresora conectada localmente"
-+
-+# ../gui/printconf-gui.glade.str:141
-+# ../gui/printconf-gui.glade.str:153
-+# ../gui/printconf-gui.glade.str:153
-+#: ../troubleshoot/LocalOrRemote.py:31
-+msgid "Network printer"
-+msgstr "Impresora de red"
-+
-+#: ../troubleshoot/NetworkCUPSPrinterShared.py:28
-+msgid "Queue Not Shared"
-+msgstr "Cola No Compartida"
-+
-+#: ../troubleshoot/NetworkCUPSPrinterShared.py:29
-+msgid "The CUPS printer on the server is not shared."
-+msgstr "La impresora CUPS en el servidor no está compartida."
-+
-+#: ../troubleshoot/PrinterStateReasons.py:29
-+msgid "Status Messages"
-+msgstr "Mensajes de Estado"
-+
-+#: ../troubleshoot/PrinterStateReasons.py:30
-+msgid "There are status messages associated with this queue."
-+msgstr "No hay mensajes de estado asociados a esta cola."
-+
-+#: ../troubleshoot/PrinterStateReasons.py:53
-+#, python-format
-+msgid "The printer's state message is: `%s'."
-+msgstr "El estado de la impresora es: `%s'."
-+
-+#: ../troubleshoot/PrinterStateReasons.py:78
-+msgid "Errors are listed below:"
-+msgstr "Los errores se muestran a continuación:"
-+
-+#: ../troubleshoot/PrinterStateReasons.py:83
-+msgid "Warnings are listed below:"
-+msgstr "A continuación se muestran los avisos:"
-+
-+# ../gui/printconf-gui.glade.str:141
-+# ../gui/printconf-gui.glade.str:153
-+# ../gui/printconf-gui.glade.str:153
-+#: ../troubleshoot/PrintTestPage.py:28 ../applet.py:645
-+msgid "Pending"
-+msgstr "Pendiente"
-+
-+#: ../troubleshoot/PrintTestPage.py:29 ../applet.py:646
-+msgid "Held"
-+msgstr "Mantenido"
-+
-+#: ../troubleshoot/PrintTestPage.py:32 ../applet.py:649
-+msgid "Canceled"
-+msgstr "Cancelado"
-+
-+#: ../troubleshoot/PrintTestPage.py:33 ../applet.py:650
-+msgid "Aborted"
-+msgstr "Abortado"
-+
-+#: ../troubleshoot/PrintTestPage.py:34 ../applet.py:651
-+msgid "Completed"
-+msgstr "Completo"
-+
-+#: ../troubleshoot/PrintTestPage.py:43
-+msgid "Test Page"
-+msgstr "Página de Prueba"
-
--#: ../applet.py:187
-+#: ../troubleshoot/PrintTestPage.py:44
-+msgid ""
-+"Now print a test page. If you are having problems printing a specific "
-+"document, print that document now and mark the print job below."
-+msgstr "Imprima ahora una página de prueba. Si tiene problemas para imprimir un documento concreto, hágalo ahora y marque el trabajo de impresión a continuación."
-+
-+#: ../troubleshoot/PrintTestPage.py:59
-+msgid "Cancel All Jobs"
-+msgstr "Cancelar todos los trabajos"
-+
-+#: ../troubleshoot/PrintTestPage.py:65
-+msgid "Test"
-+msgstr "Probar"
-+
-+#: ../troubleshoot/PrintTestPage.py:66 ../applet.py:93
-+msgid "Job"
-+msgstr "Trabajo"
-+
-+#: ../troubleshoot/PrintTestPage.py:70 ../applet.py:94
-+msgid "Document"
-+msgstr "Documento"
-+
-+#: ../troubleshoot/PrintTestPage.py:71 ../applet.py:98
-+msgid "Status"
-+msgstr "Estado"
-+
-+#: ../troubleshoot/PrintTestPage.py:95
-+msgid "Did the marked print jobs print correctly?"
-+msgstr "¿Se imprimió correctamente la página de prueba?"
-+
-+#: ../troubleshoot/PrintTestPage.py:102
-+msgid "Yes"
-+msgstr "SÃ"
-+
-+#: ../troubleshoot/PrintTestPage.py:103
-+msgid "No"
-+msgstr "No"
-+
-+#: ../troubleshoot/QueueNotEnabled.py:57
-+#: ../troubleshoot/QueueRejectingJobs.py:67
-+#, python-format
-+msgid "The reason given is: `%s'."
-+msgstr "Se proporcionó el siguiente motivo: `%s'."
-+
-+#: ../troubleshoot/QueueNotEnabled.py:59
-+msgid "This may be due to the printer being disconnected or switched off."
-+msgstr "Esto puede deberse a que se apagó o desconectó la impresora."
-+
-+#: ../troubleshoot/QueueNotEnabled.py:63
-+msgid "Queue Not Enabled"
-+msgstr "Cola deshabilitada"
-+
-+#: ../troubleshoot/QueueNotEnabled.py:64
-+#, python-format
-+msgid "The queue `%s' is not enabled."
-+msgstr "La cola `%s' está deshabilitada."
-+
-+#: ../troubleshoot/QueueNotEnabled.py:72
-+msgid ""
-+"To enable it, select the `Enabled' checkbox in the `Policies' tab for the "
-+"printer in the printer administration tool."
-+msgstr ""
-+"Para habilitarla, seleccione la casilla `Habilitada' en la pestaña de "
-+"`PolÃticas' de la impresora, en la herramienta de administración de "
-+"impresión."
-+
-+#: ../troubleshoot/QueueRejectingJobs.py:32
-+msgid "Queue Rejecting Jobs"
-+msgstr "Cola rechazando trabajos"
-+
-+#: ../troubleshoot/QueueRejectingJobs.py:64
-+#, python-format
-+msgid "The queue `%s' is rejecting jobs."
-+msgstr "La cola `%s' está rechazando trabajos."
-+
-+#: ../troubleshoot/QueueRejectingJobs.py:71
-+msgid ""
-+"To make the queue accept jobs, select the `Accepting Jobs' checkbox in the "
-+"`Policies' tab for the printer in the printer administration tool."
-+msgstr "Para hacer que la cola acepte trabajos, marque `Aceptar trabajos' en la pestaña `PolÃticas' de la impresora en la herramienta de administración de impresión."
-+
-+# ../gui/printconf-gui.glade.str:141
-+# ../gui/printconf-gui.glade.str:153
-+# ../gui/printconf-gui.glade.str:153
-+#: ../troubleshoot/RemoteAddress.py:27
-+msgid "Remote Address"
-+msgstr "Dirección remota"
-+
-+#: ../troubleshoot/RemoteAddress.py:28
-+msgid ""
-+"Please enter as many details as you can about the network address of this "
-+"printer."
-+msgstr "Por favor, introduzca tantos detalles como pueda acerca de la dirección de red de esta impresora."
-+
-+#: ../troubleshoot/RemoteAddress.py:36
-+msgid "Server name:"
-+msgstr "Nombre del servidor:"
-+
-+#: ../troubleshoot/RemoteAddress.py:43
-+msgid "Server IP address:"
-+msgstr "Dirección IP del servidor:"
-+
-+#: ../troubleshoot/SchedulerNotRunning.py:28
-+msgid "CUPS Service Stopped"
-+msgstr "Servicio CUPS detenido"
-+
-+#: ../troubleshoot/SchedulerNotRunning.py:29
-+msgid ""
-+"The CUPS print spooler does not appear to be running. To correct this, "
-+"choose System->Administration->Services from the main menu and look for the "
-+"`cups' service."
-+msgstr "El administrador de impresión CUPS parece estar detenido. Para corregir esto, elija Sistema->Administración->Servicios desde el menú principal y busque el servicio `cups'."
-+
-+#: ../troubleshoot/ServerFirewalled.py:27
-+msgid "Check Server Firewall"
-+msgstr "Comprobar el cortafuegos del servidor"
-+
+ #: ../statereason.py:122
+ #, python-format
+@@ -2033,27 +2039,32 @@
+ "Possible reason follows:"
+ msgstr ""
+
+# ../util/printconf_gui.py:1721 ../util/printconf_gui.py:1738
+# ../util/printconf_gui.py:1755 ../util/printconf_tui.py:1715
+# ../util/printconf_gui.py:1812 ../util/printconf_gui.py:1829
+# ../util/printconf_gui.py:1863 ../util/printconf_tui.py:1805
+# ../util/printconf_gui.py:1942 ../util/printconf_tui.py:1834
-+#: ../troubleshoot/ServerFirewalled.py:28
-+msgid "It is not possible to connect to the server."
+ #. Perhaps cupstestppd is not in the path.
+ #: ../troubleshoot/CheckPPDSanity.py:95
+ #, fuzzy, python-format
+ msgid "There is a problem with the PPD file for printer `%s'."
+-msgstr "La puerta de la impresora '%s' está abierta."
++msgstr "Hubo un problema al conectar al servidor CUPS."
+
+ #: ../troubleshoot/CheckPPDSanity.py:105
+ #, fuzzy
+ msgid "Missing Printer Driver"
+-msgstr "Falta el controlador de impresora"
++msgstr "Falta el controlador de la impresora"
+
+ #: ../troubleshoot/CheckPPDSanity.py:108
+ #, fuzzy, python-format
+ msgid "Printer `%s' requires the %s package but it is not currently installed."
+-msgstr "La impresora '%s' necesita el paquete %s que no está instalado."
++msgstr "La impresora '%s' necesita el paquete %s, pero no está instalado."
+
+ #: ../troubleshoot/CheckPPDSanity.py:113
+ #, fuzzy, python-format
+ msgid ""
+ "Printer `%s' requires the `%s' program but it is not currently installed."
+-msgstr "La impresora '%s' necesita el paquete %s que no está instalado."
++msgstr "La impresora '%s' necesita el paquete %s, pero no está instalado."
+
+ # ../gui/printconf-gui.glade.str:141
+ # ../gui/printconf-gui.glade.str:153
+@@ -2103,7 +2114,7 @@
+ #: ../troubleshoot/DeviceListed.py:30
+ #, fuzzy
+ msgid "Choose Device"
+-msgstr "Cambiar el URI del Dispositivo"
++msgstr "Cambiar el URI del dispositivo"
+
+ #: ../troubleshoot/DeviceListed.py:31
+ #, fuzzy
+@@ -2124,50 +2135,50 @@
+ "I would like to enable debugging output from the CUPS scheduler. This may "
+ "cause the scheduler to restart. Click the button below to enable debugging."
+ msgstr ""
+-"Deseo habilitar la salida de depuración desde el planificador de CUPS. Esto "
+-"hará que el planificador se reinicie. Haga clic en el botón de abajo para "
+-"habilitar la depuración."
++"DesearÃa activar la depuración de la salida del programador de CUPS. Esto "
++"puede hacer que se reinicie el programador. Pulse el botón mostrado abajo "
++"para activar la depuración."
+
+ #: ../troubleshoot/ErrorLogCheckpoint.py:35
+ msgid "Enable Debugging"
+-msgstr "Habilitar la Depuración"
++msgstr "Activar la depuración"
+
+ #: ../troubleshoot/ErrorLogCheckpoint.py:143
+ msgid "Debug logging enabled."
+-msgstr "Registrado de depuración habilitado."
++msgstr "Registro de depuración activado."
+
+ #: ../troubleshoot/ErrorLogCheckpoint.py:145
+ msgid "Debug logging was already enabled."
+-msgstr "El registrado de depuración ya fue habilitado."
++msgstr "El registro de depuración ya estaba activo."
+
+ #: ../troubleshoot/ErrorLogFetch.py:31
+ msgid ""
+ "I would like to disable debugging output from the CUPS scheduler. This may "
+ "cause the scheduler to restart. Click the button below to disable debugging."
+ msgstr ""
+-"Deseo deshabilitar la salida de depuración desde el planificador de CUPS. "
+-"Esto hará que el planificador se reinicie. Haga clic en el botón de abajo "
+-"para deshabilitar la depuración"
++"DesearÃa deshabilitar la salida de depuración del programador de CUPS. Esto "
++"puede hacer que el programador se reinicie. Pulse el botón mostrado abajo "
++"para deshabilitar la depuración."
+
+ #: ../troubleshoot/ErrorLogFetch.py:35
+ msgid "Disable Debugging"
+-msgstr "Deshabilitar la Depuración"
++msgstr "Deshabilitar la depuración"
+
+ #: ../troubleshoot/ErrorLogFetch.py:123
+ msgid "Debug logging disabled."
+-msgstr "El registrado de depuración está deshabilitado."
++msgstr "Se ha deshabilitado el registro de depuración."
+
+ #: ../troubleshoot/ErrorLogFetch.py:125
+ msgid "Debug logging was already disabled."
+-msgstr "El registrado de depuración ya fue desactivado."
++msgstr "El registro de depuración ya estaba deshabilitado."
+
+ #: ../troubleshoot/ErrorLogParse.py:30
+ msgid "Error log messages"
+-msgstr "Mensajes log de Error"
++msgstr "Registro de mensajes de error"
+
+ #: ../troubleshoot/ErrorLogParse.py:31
+ msgid "There are messages in the error log."
+-msgstr "Hay mensajes en el log de errores."
++msgstr "Hay mensajes en el registro de errores."
+
+ #: ../troubleshoot/LocalOrRemote.py:27
+ msgid "Printer Location"
+@@ -2211,15 +2222,15 @@
+ #: ../troubleshoot/PrinterStateReasons.py:53
+ #, python-format
+ msgid "The printer's state message is: `%s'."
+-msgstr "El estado de la Impresora es: `%s'."
++msgstr "El estado de la impresora es: `%s'."
+
+ #: ../troubleshoot/PrinterStateReasons.py:78
+ msgid "Errors are listed below:"
+-msgstr "Los errores se listan abajo:"
++msgstr "Los errores se muestran a continuación:"
+
+ #: ../troubleshoot/PrinterStateReasons.py:83
+ msgid "Warnings are listed below:"
+-msgstr "Las advertencias se listan abajo:"
++msgstr "A continuación se muestran los avisos:"
+
+ #: ../troubleshoot/PrintTestPage.py:55
+ msgid "Test Page"
+@@ -2230,13 +2241,13 @@
+ "Now print a test page. If you are having problems printing a specific "
+ "document, print that document now and mark the print job below."
+ msgstr ""
+-"Ahora imprima una página de prueba. Si está teniendo problemas de impresión "
+-"en un documento especÃfico, imprima ese documento ahora y el trabajo de "
+-"impresión abajo."
++"Imprima ahora una página de prueba. Si tiene problemas para imprimir un "
++"documento concreto, hágalo ahora y marque el trabajo de impresión a "
++"continuación."
+
+ #: ../troubleshoot/PrintTestPage.py:71
+ msgid "Cancel All Jobs"
+-msgstr "Cancelar Todos los Trabajos"
++msgstr "Cancelar todos los trabajos"
+
+ #: ../troubleshoot/PrintTestPage.py:77
+ msgid "Test"
+@@ -2244,11 +2255,11 @@
+
+ #: ../troubleshoot/PrintTestPage.py:107
+ msgid "Did the marked print jobs print correctly?"
+-msgstr "¿Los trabajos de impresión marcados se imprimieron correctamente?"
++msgstr "¿Se imprimió correctamente la página de prueba?"
+
+ #: ../troubleshoot/PrintTestPage.py:114
+ msgid "Yes"
+-msgstr "Si"
++msgstr "SÃ"
+
+ #: ../troubleshoot/PrintTestPage.py:115
+ msgid "No"
+@@ -2262,15 +2273,15 @@
+ #: ../troubleshoot/QueueRejectingJobs.py:67
+ #, python-format
+ msgid "The reason given is: `%s'."
+-msgstr "La razón dada es: `%s'."
++msgstr "Se proporcionó el siguiente motivo: `%s'."
+
+ #: ../troubleshoot/QueueNotEnabled.py:59
+ msgid "This may be due to the printer being disconnected or switched off."
+-msgstr "Esto puede deberse a que la impresora se desconectó o fue apagada."
++msgstr "Esto puede deberse a que se apagó o desconectó la impresora."
+
+ #: ../troubleshoot/QueueNotEnabled.py:63
+ msgid "Queue Not Enabled"
+-msgstr "Cola Deshabilitada"
++msgstr "Cola deshabilitada"
+
+ #: ../troubleshoot/QueueNotEnabled.py:64
+ #, python-format
+@@ -2288,7 +2299,7 @@
+
+ #: ../troubleshoot/QueueRejectingJobs.py:32
+ msgid "Queue Rejecting Jobs"
+-msgstr "Cola Rechazando Trabajos"
++msgstr "Cola rechazando trabajos"
+
+ #: ../troubleshoot/QueueRejectingJobs.py:64
+ #, python-format
+@@ -2300,7 +2311,7 @@
+ "To make the queue accept jobs, select the `Accepting Jobs' checkbox in the "
+ "`Policies' tab for the printer in the printer administration tool."
+ msgstr ""
+-"Para hacer que la cola acepte trabajos, marque `Aceptar Trabajos' en la "
++"Para hacer que la cola acepte trabajos, marque `Aceptar trabajos' en la "
+ "pestaña `PolÃticas' de la impresora en la herramienta de administración de "
+ "impresión."
+
+@@ -2309,15 +2320,15 @@
+ # ../gui/printconf-gui.glade.str:153
+ #: ../troubleshoot/RemoteAddress.py:27
+ msgid "Remote Address"
+-msgstr "Dirección Remota"
++msgstr "Dirección remota"
+
+ #: ../troubleshoot/RemoteAddress.py:28
+ msgid ""
+ "Please enter as many details as you can about the network address of this "
+ "printer."
+ msgstr ""
+-"Por favor, ingrese tantos detalles como pueda acerca de la dirección de red "
+-"de esta impresora."
++"Por favor, introduzca tantos detalles como pueda acerca de la dirección de "
++"red de esta impresora."
+
+ #: ../troubleshoot/RemoteAddress.py:36
+ msgid "Server name:"
+@@ -2329,7 +2340,7 @@
+
+ #: ../troubleshoot/SchedulerNotRunning.py:28
+ msgid "CUPS Service Stopped"
+-msgstr "Servicio CUPS Detenido"
++msgstr "Servicio CUPS detenido"
+
+ #: ../troubleshoot/SchedulerNotRunning.py:29
+ msgid ""
+@@ -2343,7 +2354,7 @@
+
+ #: ../troubleshoot/ServerFirewalled.py:27
+ msgid "Check Server Firewall"
+-msgstr "Chequear el Cortafuego del Servidor"
++msgstr "Comprobar el cortafuegos del servidor"
+
+ # ../util/printconf_gui.py:1721 ../util/printconf_gui.py:1738
+ # ../util/printconf_gui.py:1755 ../util/printconf_tui.py:1715
+@@ -2352,7 +2363,7 @@
+ # ../util/printconf_gui.py:1942 ../util/printconf_tui.py:1834
+ #: ../troubleshoot/ServerFirewalled.py:28
+ msgid "It is not possible to connect to the server."
+-msgstr "No es posible conectar al servidor."
+msgstr "No fue posible conectarse al servidor."
-+
-+#: ../troubleshoot/ServerFirewalled.py:43
-+#, python-format
-+msgid ""
-+"Please check to see if a firewall or router configuration is blocking TCP "
-+"port %d on server `%s'."
-+msgstr "Por favor, verifique si la configuración del cortafuegos o del encaminador está bloqueando el puerto TCP %d en el servidor `%s'."
-+
-+#: ../troubleshoot/Shrug.py:27
-+msgid "Sorry!"
-+msgstr "¡Lo siento!"
-+
-+#: ../troubleshoot/Shrug.py:28
-+msgid ""
-+"I have not been able to work out what the problem is, but I have collected "
-+"some useful information to put in a bug report."
-+msgstr "No se ha podido determinar cuál es su problema, pero se ha recogido suficiente información como para generar un informe de error."
-+
-+#: ../troubleshoot/Welcome.py:34
-+msgid "Trouble-shooting Printing"
-+msgstr "Asistente para resolver problemas de impresión"
-+
-+#: ../troubleshoot/Welcome.py:36
-+msgid ""
-+"In the next few screens I will ask you some questions about your problem "
-+"with printing. Based on your answers I will try to suggest a solution."
-+msgstr "Se le harán algunas preguntas sobre de su problema con la impresión en las siguientes pantallas. Se intentará sugerir una solución basándose en su problema."
-+
-+#: ../troubleshoot/Welcome.py:40
-+msgid "Click 'Forward' to begin."
+
+ #: ../troubleshoot/ServerFirewalled.py:43
+ #, python-format
+@@ -2360,8 +2371,8 @@
+ "Please check to see if a firewall or router configuration is blocking TCP "
+ "port %d on server `%s'."
+ msgstr ""
+-"Por favor, verifique si la configuración del cortafuego o del ruteador está "
+-"bloqueando el puerto TCP %d en el servidor `%s'."
++"Por favor, verifique si la configuración del cortafuegos o del encaminador "
++"está bloqueando el puerto TCP %d en el servidor `%s'."
+
+ #: ../troubleshoot/Shrug.py:27
+ msgid "Sorry!"
+@@ -2372,8 +2383,8 @@
+ "I have not been able to work out what the problem is, but I have collected "
+ "some useful information to put in a bug report."
+ msgstr ""
+-"No se ha podido determinar cuál es su problema, pero se ha recolectado "
+-"suficiente información como para informar un error."
++"No se ha podido determinar cuál es su problema, pero se ha recogido "
++"suficiente información como para generar un informe de error."
+
+ #: ../troubleshoot/Welcome.py:36
+ msgid "Trouble-shooting Printing"
+@@ -2384,27 +2395,28 @@
+ "In the next few screens I will ask you some questions about your problem "
+ "with printing. Based on your answers I will try to suggest a solution."
+ msgstr ""
+-"En las siguientes pantallas se le preguntará acerca de su problema con la "
+-"impresión. Basado en sus respuestas, se intentará sugerir una solución."
++"Se le harán algunas preguntas sobre de su problema con la impresión en las "
++"siguientes pantallas. Se intentará sugerir una solución basándose en su "
++"problema."
+
+ #: ../troubleshoot/Welcome.py:42
+ msgid "Click 'Forward' to begin."
+-msgstr "Clic en 'Siguiente' para comenzar."
+msgstr "Pulse 'Siguiente' para comenzar."
-+
-+#: ../applet.py:96
- msgid "Size"
- msgstr "Tamaño"
-
--#: ../applet.py:188
-+#: ../applet.py:97
- msgid "Time submitted"
--msgstr "Hora de ingreso"
-+msgstr "Hora de envÃo"
-
--#: ../applet.py:239
-+#: ../applet.py:148
- msgid "Message"
- msgstr "Mensaje"
-
--#: ../applet.py:592
-+#: ../applet.py:508
- msgid "1 hour ago"
- msgstr "hace 1 hora"
-
--#: ../applet.py:594
-+#: ../applet.py:510
- msgid "1 hour and 1 minute ago"
- msgstr "hace 1 hora y 1 minuto"
-
--#: ../applet.py:596
-+#: ../applet.py:512
- #, python-format
- msgid "1 hour and %d minutes ago"
- msgstr "hace 1 hora y %d minutos"
-
--#: ../applet.py:599
-+#: ../applet.py:515
- #, python-format
- msgid "%d hours ago"
- msgstr "hace %d horas"
-
--#: ../applet.py:601
-+#: ../applet.py:517
- #, python-format
- msgid "%d hours and 1 minute ago"
- msgstr "hace %d horas y 1 minuto"
-
--#: ../applet.py:603
-+#: ../applet.py:519
- #, python-format
- msgid "%d hours and %d minutes ago"
- msgstr "hace %d horas y %d minutos"
-
--#: ../applet.py:609
-+#: ../applet.py:525
- msgid "a minute ago"
- msgstr "hace un minuto"
-
--#: ../applet.py:611
-+#: ../applet.py:527
- #, python-format
- msgid "%d minutes ago"
- msgstr "hace %d minutos"
-
--#: ../applet.py:666
-+#: ../applet.py:582
- msgid "No documents queued"
- msgstr "No hay documentos en la cola"
-
--#: ../applet.py:669
-+#: ../applet.py:585
- msgid "1 document queued"
- msgstr "1 documento encolado"
-
--#: ../applet.py:672
-+#: ../applet.py:588
- #, python-format
- msgid "%d documents queued"
- msgstr "%d documentos en la cola"
-@@ -2147,45 +2158,43 @@
+
# ../gui/printconf-gui.glade.str:141
# ../gui/printconf-gui.glade.str:153
# ../gui/printconf-gui.glade.str:153
--#: ../applet.py:1026
-+#: ../applet.py:943
+ #: ../applet.py:135
msgid "Printer added"
-msgstr "Impresora agregada"
+msgstr "Impresora añadida"
--#: ../applet.py:1028
-+#: ../applet.py:945
+ #: ../applet.py:137
msgid "Missing printer driver"
-msgstr "Falta el controlador de impresora"
+msgstr "Falta el controlador de la impresora"
--#: ../applet.py:1032
--#, fuzzy
-+#: ../applet.py:949
+ #: ../applet.py:141
msgid "Install printer driver"
--msgstr "Instalar controlador"
+-msgstr "Instalar controlador de impresora"
+msgstr "Instalar controlador de la impresora"
--#: ../applet.py:1033
-+#: ../applet.py:950
- #, python-format
- msgid "`%s' requires driver installation: %s."
--msgstr ""
-+msgstr "`%s' requiere la instalación del controlador: %s."
-
--#: ../applet.py:1036
--#, fuzzy
-+#: ../applet.py:953
- msgid "Install"
--msgstr "_Instalar"
-+msgstr "Instalar"
-
--#: ../applet.py:1039
-+#: ../applet.py:956
- #, python-format
- msgid "`%s' is ready for printing."
- msgstr "`%s' está lista para imprimir."
-
--#: ../applet.py:1042
-+#: ../applet.py:959
- msgid "Configure"
- msgstr "Configurar"
-
- #. Model mismatch
--#: ../applet.py:1045
-+#: ../applet.py:962
+ #: ../applet.py:142
+ #, python-format
+@@ -2424,7 +2436,7 @@
+ #: ../applet.py:156
#, python-format
msgid "`%s' has been added, using the `%s' driver."
-msgstr "`%s' se ha agregado, usando el controlador `%s'."
+msgstr "se ha añadido `%s', usando el controlador `%s'."
--#: ../applet.py:1049
-+#: ../applet.py:966
+ #: ../applet.py:160
msgid "Find driver"
- msgstr "Buscar controlador"
-
-@@ -2195,7 +2204,7 @@
-
- #: ../applet.glade.h:6
+@@ -2440,7 +2452,7 @@
+
+ #: ../applet.glade.h:5
msgid "Printer status"
-msgstr "Estado de la Impresora:"
+msgstr "Estado de la impresora"
- #: ../applet.glade.h:7
+ #: ../applet.glade.h:6
msgid "Re_print"
-@@ -2218,9 +2227,8 @@
- msgstr "_Mantener"
-
- #: ../applet.glade.h:13
--#, fuzzy
- msgid "_Refresh"
--msgstr "Libe_rar"
-+msgstr "_Refrescar"
-
- #: ../applet.glade.h:14
- msgid "_Release"
-@@ -2232,11 +2240,11 @@
+@@ -2476,11 +2488,11 @@
#: ../print-applet.desktop.in.h:1
msgid "Print Queue Applet"
@@ -2384,109 +1380,139 @@
#: ../manage-print-jobs.desktop.in.h:1
msgid "Cancel, pause, resume or reprint jobs"
-@@ -2250,95 +2258,17 @@
+@@ -2494,55 +2506,59 @@
msgid "Select default printer"
msgstr "Elegir impresora predeterminada"
+-#~ msgid "Create a new printer group"
+-#~ msgstr "Crear un nuevo grupo de impresoras"
++#~ msgid "This is the default printer"
++#~ msgstr "Esta es la impresora por omisión"
+
+-#~ msgid "Create a new printer queue"
+-#~ msgstr "Crear una nueva cola de impresión"
++#~ msgid "No default printer set."
++#~ msgstr "No se configuró la impresora por omisión."
+
-#, fuzzy
+-#~ msgid "Make:"
+-#~ msgstr "Marcas"
++#~ msgid "Cancel Tests"
++#~ msgstr "Cancelar pruebas"
+
-#~ msgid ""
--#~ "THe remote server did not accept the print job, most likely because the "
--#~ "printer is not shared."
--#~ msgstr ""
--#~ "El servidor remoto no aceptó el trabajo de impresión, muy probablemente "
--#~ "debido a que la impresora no es compartida."
+-#~ "May contain any printable characters except \"/\", \"#\", and space.\n"
+-#~ "Name must be unique on the local machine!"
++#~ msgid "Support for downloadable drivers is not yet completed."
+ #~ msgstr ""
+-#~ "Puede contener cualquier caracter imprimible excepto \"/\", \"#\", y "
+-#~ "espacio.\n"
+-#~ "¡El nombre debe ser único en la máquina local!"
-
--#~ msgid "Hostname"
--#~ msgstr "Nombre de Equipo"
+-#~ msgid "Refresh the list of printer queues"
+-#~ msgstr "Refrescar la lista de colas de impresora"
++#~ "TodavÃa no se ha completado el soporte para controladores descargables."
+
+-#~ msgid "This is the default printer"
+-#~ msgstr "Esta es la impresora por defecto"
++#~ msgid "Connect to a different print server"
++#~ msgstr "Conectar a un servidor de impresión distinto"
+
+-#~ msgid "No default printer set."
+-#~ msgstr "No se configuró la impresora por defecto."
++# ../gui/printconf-gui.glade.str:141
++# ../gui/printconf-gui.glade.str:153
++# ../gui/printconf-gui.glade.str:153
++#~ msgid "Copy this printer queue"
++#~ msgstr "Copiar esta cola de impresión"
+
+-#~ msgid "Cancel Tests"
+-#~ msgstr "Cancelar Pruebas"
++#~ msgid "Create a new printer group"
++#~ msgstr "Crear un nuevo grupo de impresoras"
+
+-#, fuzzy
+-#~ msgid "Authentication required"
+-#~ msgstr "Autenticación"
++#~ msgid "Create a new printer queue"
++#~ msgstr "Crear una nueva cola de impresión"
+
+ #~ msgid "Default Printer:"
+-#~ msgstr "Impresora Predeterminada:"
++#~ msgstr "Impresora predeterminada:"
+
+-#~ msgid "Make Default"
+-#~ msgstr "_Predeterminada"
++#~ msgid "Delete this printer queue"
++#~ msgstr "Borrar esta cola de impresión"
+
+-#~ msgid "User name:"
+-#~ msgstr "Nombre de Usuario:"
++#~ msgid "Enter some search terms for the model of your printer."
++#~ msgstr ""
++#~ "Introduzca algunos términos de búsqueda para el modelo de su impresora."
+
+-#~ msgid "Support for downloadable drivers is not yet completed."
++#~ msgid "Goto Server"
++#~ msgstr "Ir al servidor"
++
++#~ msgid "Make Default"
++#~ msgstr "Hacerla _predeterminada"
++
++#~ msgid ""
++#~ "May contain any printable characters except \"/\", \"#\", and space.\n"
++#~ "Name must be unique on the local machine!"
+ #~ msgstr ""
+-#~ "El soporte para controladores descargables no está completo todavÃa."
++#~ "Puede contener cualquier carácter imprimible excepto «/», «#», y espacio.\n"
++#~ "¡El nombre debe ser único en la máquina local!"
+
+-#~ msgid "Enter some search terms for the model of your printer."
+-#~ msgstr "Ingrese algunos términos para buscar el modelo de su impresora."
++#~ msgid "Refresh the list of printer queues"
++#~ msgstr "Refrescar la lista de colas de impresora"
+
+ # ../gui/printconf-gui.glade.str:141
+ # ../gui/printconf-gui.glade.str:153
+@@ -2550,23 +2566,26 @@
+ #~ msgid "Search terms:"
+ #~ msgstr "Palabras a buscar:"
+
+-#~ msgid "Connect to a different print server"
+-#~ msgstr "Conectar a un servidor de impresión distinto"
-
-# ../gui/printconf-gui.glade.str:141
-# ../gui/printconf-gui.glade.str:153
-# ../gui/printconf-gui.glade.str:153
--#~ msgid "Printername"
--#~ msgstr "Nombre de la impresora"
+-#~ msgid "Copy this printer queue"
+-#~ msgstr "Copiar esta cola de impresión"
-
--#~ msgid "Default printer is %s"
--#~ msgstr "La impresora por defecto es %s"
--
--#~ msgid "Going to create a new class %s."
--#~ msgstr "Se va a crear una nueva clase %s."
--
--#~ msgid " PPD "
--#~ msgstr " PPD "
--
--#~ msgid "<b>Comment about the Printer</b>"
--#~ msgstr "<b>Comentario acerca de la Impresora</b>"
--
--#~ msgid "<b>Information about the PPD</b>"
--#~ msgstr "<b>Información acerca del PPD</b>"
--
--#~ msgid "About"
--#~ msgstr "Acerca de"
--
--#~ msgid "About System-Config-Printer"
--#~ msgstr "Acerca de Sistema-Configurar-Impresora"
--
--#~ msgid "Apply"
--#~ msgstr "Aplicar"
--
--#~ msgid "Authors"
--#~ msgstr "Autores"
--
--# ../util/printconf_tui.py:1002
--# ../util/printconf_tui.py:1053
--# ../util/printconf_tui.py:1050
--#~ msgid "Change PPD"
--#~ msgstr "Cambiar PPD"
--
--#~ msgid "Class Members"
--#~ msgstr "Miembros de la Clase"
--
--#~ msgid "Comments: "
--#~ msgstr "Comentarios:"
--
--#~ msgid "Copyright"
--#~ msgstr "Copyright"
--
--# ../gui/printconf-gui.glade.str:76 ../util/printconf_tui.py:361
--# ../gui/printconf-gui.glade.str:82 ../util/printconf_tui.py:383
--# ../gui/printconf-gui.glade.str:82 ../util/printconf_tui.py:376
--#~ msgid "Device"
--#~ msgstr "Dispositivo"
--
--# ../gui/printconf-gui.glade.str:79
--# ../gui/printconf-gui.glade.str:85 ../util/printconf_tui.py:812
--# ../gui/printconf-gui.glade.str:85 ../util/printconf_tui.py:805
--#~ msgid "Driver"
--#~ msgstr "Controlador"
--
--#~ msgid "Make Default Printer"
--#~ msgstr "Establecer como predeterminada"
+-#~ msgid "Delete this printer queue"
+-#~ msgstr "Borrar esta cola de impresión"
++#~ msgid "User name:"
++#~ msgstr "Nombre de Usuario:"
+
+-#~ msgid "Goto Server"
+-#~ msgstr "Ir al Servidor"
++#~ msgid "_Goto Server"
++#~ msgstr "_Ir al servidor"
+
+ #~ msgid "Password required"
+ #~ msgstr "Se requiere contraseña"
+
+-#~ msgid "_Goto Server"
+-#~ msgstr "_Ir al Servidor"
+#~ msgid "Queue Not Accepting Jobs"
+#~ msgstr "La Cola no Acepta Trabajos"
-
--#~ msgid "PPD"
--#~ msgstr "PPD"
++
+#~ msgid "The CUPS printer on the server is not accepting jobs."
+#~ msgstr "La impresora CUPS en el servidor no está aceptando trabajos."
-
--#~ msgid "System-Config-Printer %s"
--#~ msgstr "Sistema-Configurar-Impresora %s"
--
--#~ msgid ""
--#~ "This PPD is provided by the manufacturer and is included with the "
--#~ "foomatic package."
--#~ msgstr ""
--#~ "Este PPD es provisto por el fabricante y está incluÃdo en el paquete "
--#~ "foomatic."
++
+#~ msgid "The CUPS printer on the server is not enabled."
+#~ msgstr "La impresora CUPS en el servidor está deshabilitada."
-
--#~ msgid "This PPD is provided by CUPS."
--#~ msgstr "Este PPD es provisto por CUPS."
++
+#~ msgid "Printer's state reasons:"
+#~ msgstr "Razones del estado de la Impresora:"
-
--#~ msgid "Specify default job options."
--#~ msgstr "Especificar las opciones de trabajo por defecto."
++
+#~ msgid " The reason given is: `%s'."
+#~ msgstr " La razón dada es: `%s'."
Modified: packages/experimental/system-config-printer/debian/patches/08_stock_icons.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/system-config-printer/debian/patches/08_stock_icons.patch?rev=16199&op=diff
==============================================================================
--- packages/experimental/system-config-printer/debian/patches/08_stock_icons.patch (original)
+++ packages/experimental/system-config-printer/debian/patches/08_stock_icons.patch Sun Jun 8 12:52:40 2008
@@ -1,20 +1,11 @@
---- system-config-printer.glade.orig 2008-02-13 19:12:40.000000000 +0100
-+++ system-config-printer.glade 2008-04-22 00:14:07.193060063 +0200
-@@ -118,7 +118,7 @@
+--- system-config-printer.glade.orig 2008-06-08 13:11:01.229281585 +0200
++++ system-config-printer.glade 2008-06-08 13:13:11.829284169 +0200
+@@ -139,7 +139,7 @@
<child internal-child="image">
- <widget class="GtkImage" id="image35">
+ <widget class="GtkImage" id="image70">
<property name="visible">True</property>
- <property name="stock">gtk-add</property>
+ <property name="stock">gtk-new</property>
<property name="icon_size">1</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
-@@ -215,7 +215,7 @@
- <property name="tooltip" translatable="yes">Create a new printer queue</property>
- <property name="label" translatable="yes">New Printer</property>
- <property name="use_underline">True</property>
-- <property name="stock_id">gtk-new</property>
-+ <property name="stock_id">gtk-add</property>
- <property name="visible_horizontal">True</property>
- <property name="visible_vertical">True</property>
- <property name="is_important">True</property>
Modified: packages/experimental/system-config-printer/debian/patches/11_use_gksu.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/system-config-printer/debian/patches/11_use_gksu.patch?rev=16199&op=diff
==============================================================================
--- packages/experimental/system-config-printer/debian/patches/11_use_gksu.patch (original)
+++ packages/experimental/system-config-printer/debian/patches/11_use_gksu.patch Sun Jun 8 12:52:40 2008
@@ -1,11 +1,13 @@
---- system-config-printer.desktop.in.orig 2008-02-17 11:19:37.620206509 +0100
-+++ system-config-printer.desktop.in 2008-02-17 11:20:02.728203420 +0100
-@@ -2,7 +2,7 @@
+--- system-config-printer.desktop.in.orig 2008-06-08 14:49:16.581284423 +0200
++++ system-config-printer.desktop.in 2008-06-08 14:50:51.318484053 +0200
+@@ -2,8 +2,8 @@
Encoding=UTF-8
_Name=Printing
_Comment=Configure printers
--Exec=/usr/bin/system-config-printer
+-Exec=system-config-printer
+Exec=gksu system-config-printer
Terminal=false
Type=Application
Icon=printer
+-StartupNotify=true
++StartupNotify=false
Added: packages/experimental/system-config-printer/debian/patches/12_remove_redhat.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/system-config-printer/debian/patches/12_remove_redhat.patch?rev=16199&op=file
==============================================================================
--- packages/experimental/system-config-printer/debian/patches/12_remove_redhat.patch (added)
+++ packages/experimental/system-config-printer/debian/patches/12_remove_redhat.patch Sun Jun 8 12:52:40 2008
@@ -1,0 +1,106 @@
+--- Makefile.am.orig 2008-06-08 13:19:54.097285829 +0200
++++ Makefile.am 2008-06-08 13:22:17.021810733 +0200
+@@ -74,42 +74,38 @@
+ install-desktopDATA: $(desktop_DATA)
+ mkdir -p $(DESTDIR)$(desktopdir)
+ mkdir -p $(DESTDIR)$(desktopdir)
+- desktop-file-install --vendor redhat \
++ desktop-file-install \
+ --dir $(DESTDIR)$(desktopdir) \
+- --add-category X-Red-Hat-Base \
+ --add-category System \
+ --add-category Settings \
+ --add-category HardwareSettings \
+ --add-category Printing \
+ --add-category GTK \
+ system-config-printer.desktop
+- desktop-file-install --vendor redhat \
++ desktop-file-install \
+ --dir $(DESTDIR)$(desktopdir) \
+- --add-category X-Red-Hat-Base \
+ --add-category System \
+ --add-category Monitor \
+ --add-category GTK \
+ manage-print-jobs.desktop
+- desktop-file-install --vendor redhat \
++ desktop-file-install \
+ --dir $(DESTDIR)$(desktopdir) \
+- --add-category X-Red-Hat-Base \
+ --add-category Settings \
+ --add-category HardwareSettings \
+ --add-category GTK \
+ my-default-printer.desktop
+- desktop-file-install --vendor redhat \
++ desktop-file-install \
+ --dir $(DESTDIR)$(autostartdir) \
+- --add-category X-Red-Hat-Base \
+ --add-category System \
+ --add-category Monitor \
+ --add-category GTK \
+ print-applet.desktop
+
+ uninstall-desktopDATA:
+- rm -f $(DESTDIR)$(desktopdir)/redhat-system-config-printer.desktop
+- rm -f $(DESTDIR)$(desktopdir)/redhat-manage-print-jobs.desktop
+- rm -f $(DESTDIR)$(desktopdir)/redhat-my-default-printer.desktop
+- rm -f $(DESTDIR)$(autostartdir)/redhat-print-applet.desktop
++ rm -f $(DESTDIR)$(desktopdir)/system-config-printer.desktop
++ rm -f $(DESTDIR)$(desktopdir)/manage-print-jobs.desktop
++ rm -f $(DESTDIR)$(desktopdir)/my-default-printer.desktop
++ rm -f $(DESTDIR)$(autostartdir)/print-applet.desktop
+
+ EXTRA_DIST=\
+ $(nobase_pkgdata_SCRIPTS) \
+--- Makefile.in.orig 2008-05-27 19:14:22.000000000 +0200
++++ Makefile.in 2008-06-08 13:22:40.633281953 +0200
+@@ -889,42 +889,38 @@
+ install-desktopDATA: $(desktop_DATA)
+ mkdir -p $(DESTDIR)$(desktopdir)
+ mkdir -p $(DESTDIR)$(desktopdir)
+- desktop-file-install --vendor redhat \
++ desktop-file-install \
+ --dir $(DESTDIR)$(desktopdir) \
+- --add-category X-Red-Hat-Base \
+ --add-category System \
+ --add-category Settings \
+ --add-category HardwareSettings \
+ --add-category Printing \
+ --add-category GTK \
+ system-config-printer.desktop
+- desktop-file-install --vendor redhat \
++ desktop-file-install \
+ --dir $(DESTDIR)$(desktopdir) \
+- --add-category X-Red-Hat-Base \
+ --add-category System \
+ --add-category Monitor \
+ --add-category GTK \
+ manage-print-jobs.desktop
+- desktop-file-install --vendor redhat \
++ desktop-file-install \
+ --dir $(DESTDIR)$(desktopdir) \
+- --add-category X-Red-Hat-Base \
+ --add-category Settings \
+ --add-category HardwareSettings \
+ --add-category GTK \
+ my-default-printer.desktop
+- desktop-file-install --vendor redhat \
++ desktop-file-install \
+ --dir $(DESTDIR)$(autostartdir) \
+- --add-category X-Red-Hat-Base \
+ --add-category System \
+ --add-category Monitor \
+ --add-category GTK \
+ print-applet.desktop
+
+ uninstall-desktopDATA:
+- rm -f $(DESTDIR)$(desktopdir)/redhat-system-config-printer.desktop
+- rm -f $(DESTDIR)$(desktopdir)/redhat-manage-print-jobs.desktop
+- rm -f $(DESTDIR)$(desktopdir)/redhat-my-default-printer.desktop
+- rm -f $(DESTDIR)$(autostartdir)/redhat-print-applet.desktop
++ rm -f $(DESTDIR)$(desktopdir)/system-config-printer.desktop
++ rm -f $(DESTDIR)$(desktopdir)/manage-print-jobs.desktop
++ rm -f $(DESTDIR)$(desktopdir)/my-default-printer.desktop
++ rm -f $(DESTDIR)$(autostartdir)/print-applet.desktop
+
+ @INTLTOOL_DESKTOP_RULE@
+
Added: packages/experimental/system-config-printer/debian/patches/13_python_paths.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/system-config-printer/debian/patches/13_python_paths.patch?rev=16199&op=file
==============================================================================
--- packages/experimental/system-config-printer/debian/patches/13_python_paths.patch (added)
+++ packages/experimental/system-config-printer/debian/patches/13_python_paths.patch Sun Jun 8 12:52:40 2008
@@ -1,0 +1,152 @@
+diff -pruN system-config-printer-1.0.0.orig/applet.py system-config-printer-1.0.0/applet.py
+--- system-config-printer-1.0.0.orig/applet.py 2008-05-27 15:13:13.000000000 +0200
++++ system-config-printer-1.0.0/applet.py 2008-06-08 14:19:04.598244819 +0200
+@@ -19,9 +19,10 @@
+
+ import cups
+ import sys
++sys.path.append("/usr/share/system-config-printer")
+ import statereason
+ from statereason import StateReason
+-from debug import *
++from cupsutils.debug import *
+ import pprint
+
+ import dbus
+@@ -124,11 +125,11 @@ class NewPrinterNotification(dbus.servic
+ os.unlink (filename)
+ import sys
+ sys.path.append (APPDIR)
+- import cupshelpers
++ from cupsutils import cupshelpers
+ (missing_pkgs,
+ missing_exes) = cupshelpers.missingPackagesAndExecutables (ppd)
+
+- from ppds import ppdMakeModelSplit
++ from cupsutils.ppds import ppdMakeModelSplit
+ (make, model) = ppdMakeModelSplit (printer['printer-make-and-model'])
+ driver = make + " " + model
+ if status < self.STATUS_GENERIC_DRIVER:
+diff -pruN system-config-printer-1.0.0.orig/authconn.py system-config-printer-1.0.0/authconn.py
+--- system-config-printer-1.0.0.orig/authconn.py 2008-05-27 11:42:33.000000000 +0200
++++ system-config-printer-1.0.0/authconn.py 2008-06-08 14:20:20.021282175 +0200
+@@ -19,7 +19,7 @@
+
+ import cups
+ import gtk
+-from debug import *
++from cupsutils.debug import *
+
+ _ = lambda x: x
+ def set_gettext_function (fn):
+diff -pruN system-config-printer-1.0.0.orig/contextmenu.py system-config-printer-1.0.0/contextmenu.py
+--- system-config-printer-1.0.0.orig/contextmenu.py 2008-05-27 17:05:41.000000000 +0200
++++ system-config-printer-1.0.0/contextmenu.py 2008-06-08 14:20:28.470253692 +0200
+@@ -23,7 +23,7 @@
+ import cups
+ import errordialogs
+ import jobviewer
+-from debug import *
++from cupsutils.debug import *
+
+ _ = lambda x: x
+ def set_gettext_function (x):
+diff -pruN system-config-printer-1.0.0.orig/jobviewer.py system-config-printer-1.0.0/jobviewer.py
+--- system-config-printer-1.0.0.orig/jobviewer.py 2008-05-27 17:42:10.000000000 +0200
++++ system-config-printer-1.0.0/jobviewer.py 2008-06-08 14:20:57.317282644 +0200
+@@ -33,7 +33,7 @@ import pango
+ import sys
+ import time
+
+-from debug import *
++from cupsutils.debug import *
+ import config
+ import statereason
+ import errordialogs
+diff -pruN system-config-printer-1.0.0.orig/monitor.py system-config-printer-1.0.0/monitor.py
+--- system-config-printer-1.0.0.orig/monitor.py 2008-05-27 19:09:01.000000000 +0200
++++ system-config-printer-1.0.0/monitor.py 2008-06-08 14:21:05.934257916 +0200
+@@ -22,7 +22,7 @@ import dbus
+ import dbus.glib
+ import gobject
+ import time
+-from debug import *
++from cupsutils.debug import *
+ import pprint
+
+ global _
+diff -pruN system-config-printer-1.0.0.orig/pysmb.py system-config-printer-1.0.0/pysmb.py
+--- system-config-printer-1.0.0.orig/pysmb.py 2008-05-27 11:42:33.000000000 +0200
++++ system-config-printer-1.0.0/pysmb.py 2008-06-08 14:21:16.213282065 +0200
+@@ -30,7 +30,7 @@ import gobject
+ import gtk
+ import os
+ import pwd
+-from debug import *
++from cupsutils.debug import *
+
+ class AuthContext:
+ def __init__ (self, parent=None, workgroup='', user='', passwd=''):
+diff -pruN system-config-printer-1.0.0.orig/system-config-printer.py system-config-printer-1.0.0/system-config-printer.py
+--- system-config-printer-1.0.0.orig/system-config-printer.py 2008-05-27 17:24:28.000000000 +0200
++++ system-config-printer-1.0.0/system-config-printer.py 2008-06-08 14:39:49.353285194 +0200
+@@ -20,9 +20,6 @@
+ ## along with this program; if not, write to the Free Software
+ ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+-# config is generated from config.py.in by configure
+-import config
+-
+ import errno
+ import sys, os, tempfile, time, traceback, re, httplib
+ import signal, thread
+@@ -54,16 +51,21 @@ if len(sys.argv)>1 and sys.argv[1] == '-
+ import cups
+ cups.require ("1.9.27")
+
++sys.path.append("/usr/share/system-config-printer")
++# config is generated from config.py.in by configure
++import config
++
+ import pysmb
+-import cupshelpers, options
++from cupsutils import cupshelpers
++import options
+ import gobject # for TYPE_STRING and TYPE_PYOBJECT
+ from optionwidgets import OptionWidget
+-from debug import *
+-import ppds
++from cupsutils.debug import *
++from cupsutils import ppds
+ import probe_printer
+ import gtk_label_autowrap
+ from gtk_treeviewtooltips import TreeViewTooltips
+-import openprinting
++from cupsutils import openprinting
+ import urllib
+ import troubleshoot
+ import contextmenu
+diff -pruN system-config-printer-1.0.0.orig/troubleshoot/base.py system-config-printer-1.0.0/troubleshoot/base.py
+--- system-config-printer-1.0.0.orig/troubleshoot/base.py 2008-05-27 11:42:33.000000000 +0200
++++ system-config-printer-1.0.0/troubleshoot/base.py 2008-06-08 14:42:41.638421783 +0200
+@@ -21,7 +21,7 @@
+
+ import gtk
+ from gettext import gettext as _
+-from debug import *
++from cupsutils.debug import *
+
+ TEXT_start_print_admin_tool = _("To start this tool, select "
+ "System->Administration->Printing "
+diff -pruN system-config-printer-1.0.0.orig/troubleshoot/CheckPPDSanity.py system-config-printer-1.0.0/troubleshoot/CheckPPDSanity.py
+--- system-config-printer-1.0.0.orig/troubleshoot/CheckPPDSanity.py 2008-05-23 13:07:16.000000000 +0200
++++ system-config-printer-1.0.0/troubleshoot/CheckPPDSanity.py 2008-06-08 14:42:16.869281082 +0200
+@@ -20,7 +20,7 @@
+ ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+ import cups
+-import cupshelpers
++from cupsutils import cupshelpers
+ import os
+ import subprocess
+ from base import *
Added: packages/experimental/system-config-printer/debian/postinst
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/system-config-printer/debian/postinst?rev=16199&op=file
==============================================================================
--- packages/experimental/system-config-printer/debian/postinst (added)
+++ packages/experimental/system-config-printer/debian/postinst Sun Jun 8 12:52:40 2008
@@ -1,0 +1,11 @@
+#! /bin/sh
+set -e
+
+#DEBHELPER#
+
+# Remove old configuration file
+if dpkg --compare-versions "$2" lt "1.0.0-1"; then
+ rm -f /etc/xdg/autostart/redhat-print-applet.desktop
+fi
+
+exit 0
Added: packages/experimental/system-config-printer/debian/python-cupsutils.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/system-config-printer/debian/python-cupsutils.install?rev=16199&op=file
==============================================================================
--- packages/experimental/system-config-printer/debian/python-cupsutils.install (added)
+++ packages/experimental/system-config-printer/debian/python-cupsutils.install Sun Jun 8 12:52:40 2008
@@ -1,0 +1,4 @@
+debian/tmp/usr/share/system-config-printer/cupshelpers.py /usr/share/python-support/python-cupsutils/cupsutils
+debian/tmp/usr/share/system-config-printer/debug.py /usr/share/python-support/python-cupsutils/cupsutils
+debian/tmp/usr/share/system-config-printer/openprinting.py /usr/share/python-support/python-cupsutils/cupsutils
+debian/tmp/usr/share/system-config-printer/ppds.py /usr/share/python-support/python-cupsutils/cupsutils
Modified: packages/experimental/system-config-printer/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/system-config-printer/debian/rules?rev=16199&op=diff
==============================================================================
--- packages/experimental/system-config-printer/debian/rules (original)
+++ packages/experimental/system-config-printer/debian/rules Sun Jun 8 12:52:40 2008
@@ -1,16 +1,26 @@
#!/usr/bin/make -f
DEB_PYTHON_SYSTEM = pysupport
-GNOME_DOWNLOAD_URL = http://cyberelk.net/tim/data/system-config-printer/$(GNOME_TARBALL)
+GNOME_DOWNLOAD_URL = http://cyberelk.net/tim/data/system-config-printer/1.0.x/$(GNOME_TARBALL)
TARBALL_EXT := tar.bz2
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+include /usr/share/gnome-pkg-tools/1/rules/check-dist.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
DEB_CONFIGURE_EXTRA_FLAGS := --sbindir=/usr/bin
binary-install/system-config-printer::
- dh_pysupport
+ for i in debian/tmp/usr/share/system-config-printer/*.py; do \
+ if ! grep -q ^$$i debian/*install; then \
+ cp $$i debian/system-config-printer/usr/share/system-config-printer/ ; \
+ fi ; done
+ sed -i 's,^#!/usr/bin/env python,#!/usr/bin/python,' debian/system-config-printer/usr/bin/*.py
+ rename 's/\.py$$//' debian/system-config-printer/usr/bin/*.py
+ mv debian/system-config-printer/usr/bin/applet debian/system-config-printer/usr/bin/system-config-printer-applet
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+ dh_pysupport -p$(cdbs_curpkg)
Modified: packages/experimental/system-config-printer/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/system-config-printer/debian/watch?rev=16199&op=diff
==============================================================================
--- packages/experimental/system-config-printer/debian/watch (original)
+++ packages/experimental/system-config-printer/debian/watch Sun Jun 8 12:52:40 2008
@@ -1,2 +1,3 @@
version=3
-http://cyberelk.net/tim/data/system-config-printer/system-config-printer-(.*).tar.bz2 debian git-import-orig
+http://cyberelk.net/tim/data/system-config-printer/([\d\.]+)x?/system-config-printer-(.*).tar.bz2
+debian git-import-orig
More information about the pkg-gnome-commits
mailing list