* merged apt--main and make sure that the po files come from apt--main (because they are more recent)

1 files changed, 24 insertions, 19 deletions

diff --git a/po/he.po b/po/he.po
index ebab198ec..242155eff 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.25\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-05 12:06+0100\n"
+"POT-Creation-Date: 2005-03-29 07:17+0200\n"
 "PO-Revision-Date: 2004-06-10 19:58+0300\n"
 "Last-Translator: Lior Kaplan <webmaster@guides.co.il>\n"
 "Language-Team: Hebrew\n"
@@ -303,7 +303,7 @@ msgid ""
 "  --no-delink Enable delinking debug mode\n"
 "  --contents  Control contents file generation\n"
 "  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitary configuration option"
+"  -o=?  Set an arbitrary configuration option"
 msgstr ""
 
 #: ftparchive/apt-ftparchive.cc:757
@@ -535,16 +535,16 @@ msgstr "לחבילות הבאות יש תלויות שלא נענו:"
 #: cmdline/apt-get.cc:325
 #, c-format
 msgid "but %s is installed"
-msgstr "אבל %s מותקן"
+msgstr "אבל %s מותקנת"
 
 #: cmdline/apt-get.cc:327
 #, c-format
 msgid "but %s is to be installed"
-msgstr ""
+msgstr "אבל %s הולכת להיות מותקנת"
 
 #: cmdline/apt-get.cc:334
 msgid "but it is not installable"
-msgstr ""
+msgstr "אבל היא אינה ניתנת להתקנה"
 
 #: cmdline/apt-get.cc:336
 msgid "but it is a virtual package"
@@ -572,7 +572,7 @@ msgstr "החבילות הבאות יוסרו:"
 
 #: cmdline/apt-get.cc:421
 msgid "The following packages have been kept back:"
-msgstr "החבילות הבאות מעוקבות:"
+msgstr "החבילות הבאות מעובות:"
 
 #: cmdline/apt-get.cc:442
 msgid "The following packages will be upgraded:"
@@ -596,6 +596,8 @@ msgid ""
 "WARNING: The following essential packages will be removed\n"
 "This should NOT be done unless you know exactly what you are doing!"
 msgstr ""
+"א ז ה ר ה: החבילות החיוניות הבאות יוסרו\n"
+"על הפעולה להעשות *רק* אם אתה יודע מה אתה עושה!"
 
 #: cmdline/apt-get.cc:575
 #, c-format
@@ -637,6 +639,8 @@ msgstr "לא מצליח לתקן תלויות"
 #: cmdline/apt-get.cc:656
 msgid "Unable to minimize the upgrade set"
 msgstr ""
+"א ז ה ר ה: החבילות החיוניות הבאות יוסרו\n"
+"על הפעולה להעשות *רק* אם אתה יודע מה אתה עושה!"
 
 #: cmdline/apt-get.cc:658
 msgid " Done"
@@ -656,7 +660,7 @@ msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "החבילות הבאות ישודרגו:"
 
 #: cmdline/apt-get.cc:698
-msgid "Install these packages without verification? [y/N] "
+msgid "Install these packages without verification [y/N]? "
 msgstr ""
 
 #: cmdline/apt-get.cc:700
@@ -726,7 +730,8 @@ msgid "Abort."
 msgstr "בטל."
 
 #: cmdline/apt-get.cc:886
-msgid "Do you want to continue? [Y/n] "
+#, fuzzy
+msgid "Do you want to continue [Y/n]? "
 msgstr "האם אתה רוצה להמשיך? [Y/n]"
 
 #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
@@ -1359,7 +1364,7 @@ msgid "Internal error adding a diversion"
 msgstr ""
 
 #: apt-inst/deb/dpkgdb.cc:383
-msgid "The pkg cache must be initialize first"
+msgid "The pkg cache must be initialized first"
 msgstr ""
 
 #: apt-inst/deb/dpkgdb.cc:386
@@ -1420,7 +1425,7 @@ msgid ""
 msgstr ""
 
 #: methods/cdrom.cc:130 methods/cdrom.cc:168
-msgid "Wrong CD"
+msgid "Wrong CD-ROM"
 msgstr ""
 
 #: methods/cdrom.cc:163
@@ -2174,37 +2179,37 @@ msgstr ""
 
 #: apt-pkg/pkgcachegen.cc:117
 #, c-format
-msgid "Error occured while processing %s (NewPackage)"
+msgid "Error occurred while processing %s (NewPackage)"
 msgstr ""
 
 #: apt-pkg/pkgcachegen.cc:129
 #, c-format
-msgid "Error occured while processing %s (UsePackage1)"
+msgid "Error occurred while processing %s (UsePackage1)"
 msgstr ""
 
 #: apt-pkg/pkgcachegen.cc:150
 #, c-format
-msgid "Error occured while processing %s (UsePackage2)"
+msgid "Error occurred while processing %s (UsePackage2)"
 msgstr ""
 
 #: apt-pkg/pkgcachegen.cc:154
 #, c-format
-msgid "Error occured while processing %s (NewFileVer1)"
+msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr ""
 
 #: apt-pkg/pkgcachegen.cc:184
 #, c-format
-msgid "Error occured while processing %s (NewVersion1)"
+msgid "Error occurred while processing %s (NewVersion1)"
 msgstr ""
 
 #: apt-pkg/pkgcachegen.cc:188
 #, c-format
-msgid "Error occured while processing %s (UsePackage3)"
+msgid "Error occurred while processing %s (UsePackage3)"
 msgstr ""
 
 #: apt-pkg/pkgcachegen.cc:192
 #, c-format
-msgid "Error occured while processing %s (NewVersion2)"
+msgid "Error occurred while processing %s (NewVersion2)"
 msgstr ""
 
 #: apt-pkg/pkgcachegen.cc:207
@@ -2221,12 +2226,12 @@ msgstr ""
 
 #: apt-pkg/pkgcachegen.cc:241
 #, c-format
-msgid "Error occured while processing %s (FindPkg)"
+msgid "Error occurred while processing %s (FindPkg)"
 msgstr ""
 
 #: apt-pkg/pkgcachegen.cc:254
 #, c-format
-msgid "Error occured while processing %s (CollectFileProvides)"
+msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr ""
 
 #: apt-pkg/pkgcachegen.cc:260