summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xanaconda7
-rw-r--r--anaconda.spec26
-rw-r--r--image.py4
-rw-r--r--installclass.py4
-rw-r--r--instdata.py6
-rw-r--r--iw/GroupSelector.py3
-rw-r--r--loader2/hdinstall.c10
-rw-r--r--loader2/nfsinstall.c6
-rw-r--r--loader2/urlinstall.c4
-rw-r--r--loader2/urls.c13
-rw-r--r--loader2/urls.h2
-rw-r--r--partitions.py5
-rw-r--r--po/bal.po46
-rw-r--r--po/nb.po1979
-rw-r--r--po/pa.po493
-rw-r--r--users.py7
-rw-r--r--yuminstall.py38
17 files changed, 1216 insertions, 1437 deletions
diff --git a/anaconda b/anaconda
index 61ebacab5..ba3735245 100755
--- a/anaconda
+++ b/anaconda
@@ -583,11 +583,8 @@ class Anaconda:
f.write("url --url %s\n" % urllib.unquote(self._loaderMethodstr))
elif self._loaderMethodstr.startswith('cdrom://'):
f.write("cdrom\n")
- elif self._loaderMethodstr.startswith('hd://'):
- pidx = string.find(self._loaderMethodstr, '//') + 2
- didx = string.find(self._loaderMethodstr[pidx:], '/')
- partition = string.split(self._loaderMethodstr[pidx:pidx+didx], ':')[0]
- dir = self._loaderMethodstr[pidx+didx+1:]
+ elif self._loaderMethodstr.startswith('hd:'):
+ (method, partition, dir) = string.split(self._loaderMethodstr, ':')
f.write("harddrive --partition=%s --dir=%s\n" % (partition, dir))
elif self._loaderMethodstr.startswith('nfs:') or self._loaderMethodstr.startswith('nfsiso:'):
(method, server, dir) = string.split(self._loaderMethodstr, ':')
diff --git a/anaconda.spec b/anaconda.spec
index 65fab3cd7..10f2e7acd 100644
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -2,7 +2,7 @@
Summary: Graphical system installer
Name: anaconda
-Version: 11.4.0.50
+Version: 11.4.0.52
Release: 1
License: GPLv2+
Group: Applications/System
@@ -204,6 +204,30 @@ desktop-file-install --vendor="" --dir=%{buildroot}%{_datadir}/applications %{bu
/sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
%changelog
+* Thu Mar 13 2008 Chris Lumens <clumens@redhat.com> - 11.4.0.52-1
+- Don't unmount NFS source so NFSISO will work. (clumens)
+- Fix the format of the method=hd: parameter. (clumens)
+- Fix creating new users in kickstart. (clumens)
+- "gtk-edit" isn't valid in text mode. (clumens)
+- Ignore LUKS headers on partitions containing RAID signatures.
+ (#437051) (dlehman)
+- The xconfig command with no X running doesn't make sense. (clumens)
+
+* Wed Mar 12 2008 Jeremy Katz <katzj@redhat.com> - 11.4.0.51-1
+- yum.remove removes installed packages, not to be installed
+ packages (#436226) (katzj)
+- Make the /tmp/updates vs RHupdates code at least a little readable. (pjones)
+- Allow vfat update images. (pjones)
+- Fix syntax error (pjones)
+- Add a progress bar for when we're downloading headers (#186789). (clumens)
+- mount will set up the loopback device if we let it. (clumens)
+- Fix mounting problems with NFSISO images. (clumens)
+- Simplify the logic for the upgrade arch check (katzj)
+- Add a fallback method for determining the architecture of installed
+ system during an upgrade (#430115) (msivak)
+- Avoid a traceback (#436826) (katzj)
+- Make sure host lookups work for manual net config (#435574). (dcantrell)
+
* Tue Mar 11 2008 Jeremy Katz <katzj@redhat.com> - 11.4.0.50-1
- Focus root password entry box (#436885). (dcantrell)
- Make sure default is SHA-512 for libuser.conf. (dcantrell)
diff --git a/image.py b/image.py
index b108139b3..c2daa3625 100644
--- a/image.py
+++ b/image.py
@@ -129,8 +129,8 @@ def getMediaId(path):
# This mounts the directory containing the iso images, and places the
# mount point in isodir.
def mountDirectory(isodir, methodstr, messageWindow):
- if methodstr.startswith("hd://"):
- method = methodstr[5:]
+ if methodstr.startswith("hd:"):
+ method = methodstr[3:]
(device, fstype, path) = method.split(":", 3)
device = method[0:method.index(":")]
else:
diff --git a/installclass.py b/installclass.py
index 7388b9e47..e721baae7 100644
--- a/installclass.py
+++ b/installclass.py
@@ -389,6 +389,10 @@ class BaseInstallClass(object):
id.xsetup.xserver.hwstate.recalc_mode()
def setVideoCard(self, id, driver = None, videoRam = None):
+ if not id.videocard:
+ log.warning("Skipping video configuration because there's no videocard")
+ return
+
primary = id.videocard.primaryCard()
# rhpxl no longer gives us a list of drivers, so always just trust
diff --git a/instdata.py b/instdata.py
index e1175f2fe..bf5300a04 100644
--- a/instdata.py
+++ b/instdata.py
@@ -100,8 +100,8 @@ class InstallData:
stat.S_ISBLK(os.stat("/dev/live")[stat.ST_MODE]):
target = os.readlink("/dev/live")
self.partitions.protected = [target]
- elif self.anaconda._loaderMethodstr.startswith("hd://"):
- method = self.anaconda._loaderMethodstr[5:]
+ elif self.anaconda._loaderMethodstr.startswith("hd:"):
+ method = self.anaconda._loaderMethodstr[3:]
device = method.split(":", 3)[0]
self.partitions.protected = [device]
@@ -199,8 +199,6 @@ class InstallData:
self.rootPassword["lock"],
algo=self.getPassAlgo())
- self.users.reset()
-
if self.anaconda.isKickstart:
for svc in self.ksdata.services.disabled:
iutil.execWithRedirect("/sbin/chkconfig",
diff --git a/iw/GroupSelector.py b/iw/GroupSelector.py
index e057345fb..1fc8bb9f6 100644
--- a/iw/GroupSelector.py
+++ b/iw/GroupSelector.py
@@ -71,7 +71,8 @@ def sanitizeString(s, translate = True):
# given a package object, spit out a string reasonable for the list widgets
def listEntryString(po):
desc = po.returnSimple('summary') or ''
- desc = "<b>%s</b> - %s" %(po, sanitizeString(desc))
+ pkgStr = "%s-%s-%s.%s" % (po.name, po.version, po.release, po.name)
+ desc = "<b>%s</b> - %s" %(pkgStr, sanitizeString(desc))
return desc
GLADE_FILE = "GroupSelector.glade"
diff --git a/loader2/hdinstall.c b/loader2/hdinstall.c
index 4a633aa3c..d8b12af99 100644
--- a/loader2/hdinstall.c
+++ b/loader2/hdinstall.c
@@ -202,8 +202,9 @@ static char * setupIsoImages(char * device, char * dirName, char * location) {
flags &= ~LOADER_FLAGS_STAGE2;
goto err;
} else {
- rc = asprintf(&url, "hd://%s:%s:/%s", device, *type,
- dirName ? dirName : ".");
+ rc = asprintf(&url, "hd:%.*s:%s:/%s",
+ (int) (strrchr(device, '/') - device),
+ device, *type, dirName ? dirName : ".");
return url;
}
}
@@ -228,8 +229,9 @@ static char * setupIsoImages(char * device, char * dirName, char * location) {
} else {
queryIsoMediaCheck(path);
free(path);
- rc = asprintf(&url, "hd://%s:%s:/%s", device, *type,
- dirName ? dirName : ".");
+ rc = asprintf(&url, "hd:%.*s:%s:/%s",
+ (int) (strrchr(device, '/') - device),
+ device, *type, dirName ? dirName : ".");
return url;
}
}
diff --git a/loader2/nfsinstall.c b/loader2/nfsinstall.c
index bf549ebb4..35f8c335f 100644
--- a/loader2/nfsinstall.c
+++ b/loader2/nfsinstall.c
@@ -199,13 +199,13 @@ char * mountNfsImage(struct installMethod * method,
if (!rc) {
logMessage(INFO, "can access %s", buf);
rc = mountStage2("/tmp/stage2.img", stage2dir);
- umount("/mnt/source");
free(buf);
if (rc && rc == -1) {
foundinvalid = 1;
logMessage(WARNING, "not the right one");
+ umount("/mnt/source");
} else {
stage = NFS_STAGE_DONE;
rc = asprintf(&url, "nfs:%s:%s", host, directory);
@@ -243,11 +243,11 @@ char * mountNfsImage(struct installMethod * method,
rc = mountStage2("/tmp/stage2.img", stage2dir);
free(buf);
free(stage2dir);
- umountLoopback("/mnt/source", "/dev/loop1");
- umount("/mnt/isodir");
if (rc && rc == -1) {
foundinvalid = 1;
+ umountLoopback("/mnt/source", "/dev/loop1");
+ umount("/mnt/isodir");
} else {
stage = NFS_STAGE_DONE;
rc = asprintf(&url, "nfsiso:%s:%s", host, directory);
diff --git a/loader2/urlinstall.c b/loader2/urlinstall.c
index 1bb951c59..17c89d2f3 100644
--- a/loader2/urlinstall.c
+++ b/loader2/urlinstall.c
@@ -76,9 +76,9 @@ static int loadSingleUrlImage(struct iurlinfo * ui, char *path,
else if (fd < 0) {
if (!silentErrors) {
newtWinMessage(_("Error"), _("OK"),
- _("Unable to retrieve %s://%s."),
+ _("Unable to retrieve %s://%s/%s."),
(ui->protocol == URL_METHOD_FTP ? "ftp" : "http"),
- path);
+ ui->address, path);
}
if (ehdrs) free (ehdrs);
diff --git a/loader2/urls.c b/loader2/urls.c
index 19b834bbc..9f1e639eb 100644
--- a/loader2/urls.c
+++ b/loader2/urls.c
@@ -161,7 +161,7 @@ char *convertUIToURL(struct iurlinfo *ui) {
/* extraHeaders only applicable for http and used for pulling ks from http */
/* see ftp.c:httpGetFileDesc() for details */
/* set to NULL if not needed */
-int urlinstStartTransfer(struct iurlinfo * ui, char *hostAndPath,
+int urlinstStartTransfer(struct iurlinfo * ui, char *path,
char *extraHeaders) {
int fd, port;
int family = -1;
@@ -170,9 +170,9 @@ int urlinstStartTransfer(struct iurlinfo * ui, char *hostAndPath,
char *hostname, *portstr, *filestr;
struct hostent *host;
- logMessage(INFO, "transferring %s://%s to a fd",
+ logMessage(INFO, "transferring %s://%s%s to a fd",
ui->protocol == URL_METHOD_FTP ? "ftp" : "http",
- hostAndPath);
+ ui->address, path);
splitHostname(ui->address, &hostname, &portstr);
if (portstr == NULL)
@@ -194,11 +194,6 @@ int urlinstStartTransfer(struct iurlinfo * ui, char *hostAndPath,
family = host->h_addrtype;
}
- if ((filestr = strchr(hostAndPath, '/')) == NULL) {
- logMessage(ERROR, "Passed an invalid path: %s", hostAndPath);
- return -1;
- }
-
if (ui->protocol == URL_METHOD_FTP) {
ui->ftpPort = ftpOpen(hostname, family,
ui->login ? ui->login : "anonymous",
@@ -224,7 +219,7 @@ int urlinstStartTransfer(struct iurlinfo * ui, char *hostAndPath,
}
if (!FL_CMDLINE(flags))
- winStatus(70, 3, _("Retrieving"), "%s %s...", _("Retrieving"), hostAndPath);
+ winStatus(70, 3, _("Retrieving"), "%s %s...", _("Retrieving"), path);
if (hostname) free(hostname);
return fd;
diff --git a/loader2/urls.h b/loader2/urls.h
index e1141e57e..046ee7220 100644
--- a/loader2/urls.h
+++ b/loader2/urls.h
@@ -40,7 +40,7 @@ char *convertUIToURL(struct iurlinfo *ui);
int setupRemote(struct iurlinfo * ui);
int urlMainSetupPanel(struct iurlinfo * ui, char * doSecondarySetup);
int urlSecondarySetupPanel(struct iurlinfo * ui);
-int urlinstStartTransfer(struct iurlinfo * ui, char *hostAndPath, char *extraHeaders);
+int urlinstStartTransfer(struct iurlinfo * ui, char *path, char *extraHeaders);
int urlinstFinishTransfer(struct iurlinfo * ui, int fd);
#endif
diff --git a/partitions.py b/partitions.py
index 493beee62..78cbf9f08 100644
--- a/partitions.py
+++ b/partitions.py
@@ -244,6 +244,11 @@ class Partitions:
continue
device = partedUtils.get_partition_name(part)
+ fs = partedUtils.sniffFilesystemType("/dev/%s" % (device,))
+ if fs and fs.endswith("raid"):
+ part = disk.next_partition(part)
+ continue
+
if cryptodev.isLuks("/dev/%s" % device):
self.getCryptoDev(device)
diff --git a/po/bal.po b/po/bal.po
index 3fdedca39..154f162ec 100644
--- a/po/bal.po
+++ b/po/bal.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: anaconda.balochi\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-03-02 12:12-0500\n"
-"PO-Revision-Date: 2008-03-07 20:30+0330\n"
+"PO-Revision-Date: 2008-03-13 22:52+0330\n"
"Last-Translator: Mostafa Daneshvar <mostafa@daneshvar.org.uk>\n"
"Language-Team: Balochi <fedora-trans-bal@redhat.com>\n"
"MIME-Version: 1.0\n"
@@ -97,7 +97,7 @@ msgstr "هچ دستگاه ویدیوی پیداگ نبوت؛ بی سر مشغو
#: ../anaconda:468 ../anaconda:977
msgid "Unable to instantiate a X hardware state object."
-msgstr "تتونیت تا یک x هاردور حالت شی نصب کنت"
+msgstr "نتونیت تا یک x هاردور حالت شی نصب کنت"
#: ../anaconda:523
msgid "Starting graphical installation..."
@@ -105,15 +105,15 @@ msgstr "گرافیکی نصب شروع بیگنت..."
#: ../anaconda:851
msgid "Install class forcing text mode installation"
-msgstr "حالت متنی وصب بوگا کلاس فورسینگ وصل بکن"
+msgstr "حالت متنی وصل بوگا کلاس فورسینگ وصل بکن"
#: ../anaconda:891
msgid "Graphical installation not available... Starting text mode."
-msgstr "وصل بوگ گرافیگی موجود نهنت... متنی حالت شروع بیگنت/"
+msgstr "وصل بوگ گرافیگی موجود نهنت... متنی حالت شروع بیگنت."
#: ../anaconda:899
msgid "DISPLAY variable not set. Starting text mode!"
-msgstr "متغیران پیش دارگی تنظیم نهتن. حالت متنی شروع بیگنت"
+msgstr "متغیران پیش دارگی تنظیم نهتن. حالت متنی شروع بیگنت!"
#: ../autopart.py:893
#, python-format
@@ -122,7 +122,7 @@ msgid ""
"\n"
"%s"
msgstr ""
-"خطا په اندازه گرگ پارتیشن %s.\n"
+" resizing partition %s.\n"
"\n"
"%s"
@@ -170,23 +170,23 @@ msgstr "پارتیشن بووت %s یک پارتیشن VFAT kikj. چه ای پا
msgid ""
"The boot partition must entirely be in the first 4GB of the disk. "
"OpenFirmware won't be able to boot this installation."
-msgstr ""
+msgstr "پارتیشن بوت باسیتی ته 4 گیگ اول دیسک بیت. OpenFirmware نه تونیت ای نصبآ بوت کنت."
#: ../autopart.py:1076
#, python-format
msgid "Boot partition %s may not meet booting constraints for your architecture."
-msgstr ""
+msgstr "پارتیشن بوت %s ممکننت فشاران په معماری شما مناسب مه بیت."
#: ../autopart.py:1102
#, python-format
msgid ""
"Adding this partition would not leave enough disk space for already "
"allocated logical volumes in %s."
-msgstr ""
+msgstr "هور گنگ ای پارتیشن کافی فضا په پیشگین جلدان منطقی تعریف بوتگین نه هلیت %s."
#: ../autopart.py:1299
msgid "Requested Partition Does Not Exist"
-msgstr ""
+msgstr "لوٹگتین پارتیشن موجود نهنت"
#: ../autopart.py:1300
#, python-format
@@ -195,10 +195,13 @@ msgid ""
"\n"
"Press 'OK' to exit the installer."
msgstr ""
+"نه تونیت پارتیشنا %s په %s کار بریت.\n"
+"\n"
+"هوبن آ بجنیت تا چه نصب کنوک در بیت."
#: ../autopart.py:1325
msgid "Requested Raid Device Does Not Exist"
-msgstr ""
+msgstr "لوٹگتین ابراز اورش موجود نهنت."
#: ../autopart.py:1326
#, python-format
@@ -207,10 +210,13 @@ msgid ""
"\n"
"Press 'OK' to exit the installer."
msgstr ""
+"نه تونیت ابزار اورش %s په %s کار بریت.\n"
+"\n"
+"هوبن آ بجنیت تا چه نصب کنوک در بیت"
#: ../autopart.py:1355
msgid "Requested Volume Group Does Not Exist"
-msgstr ""
+msgstr "لوٹگتین گروه جلد موجود نهنت."
#: ../autopart.py:1356
#, python-format
@@ -219,10 +225,13 @@ msgid ""
"\n"
"Press 'OK' to exit the installer."
msgstr ""
+"نه تونیت گروه جلد %s په %s کار بریت.\n"
+"\n"
+"هوبن آ بجنیت تا چه نصب کنوک در بیت."
#: ../autopart.py:1393
msgid "Requested Logical Volume Does Not Exist"
-msgstr ""
+msgstr "لوٹگتین جلد منطقی موجود نهنت."
#: ../autopart.py:1394
#, python-format
@@ -231,10 +240,13 @@ msgid ""
"\n"
"Press 'OK' to exit the installer."
msgstr ""
+"نه تونیت جلد منطقی آ %s په %s کار بریت.\n"
+"\n"
+"هوبن آ بجنیت تا چه نصب کنوک در بیت."
#: ../autopart.py:1529 ../autopart.py:1576
msgid "Automatic Partitioning Errors"
-msgstr ""
+msgstr "خطایاں اتوماتیکین پارتیشن گنگ"
#: ../autopart.py:1530
#, python-format
@@ -245,10 +257,12 @@ msgid ""
"\n"
"Press 'OK' to exit the installer."
msgstr ""
+"جهلیگین خطا گون شمی پارتیشن گنگ پیش آتک:\n\n%s\n\n"
+"هوبنت آ بجنیت تا چه نصب کنوک در بیت."
#: ../autopart.py:1540
msgid "Warnings During Automatic Partitioning"
-msgstr ""
+msgstr "هوژاریانی وهد پارتیشن کنگ اتوماتیکی"
#: ../autopart.py:1541
#, python-format
@@ -256,7 +270,7 @@ msgid ""
"Following warnings occurred during automatic partitioning:\n"
"\n"
"%s"
-msgstr ""
+msgstr "جهلیگین هوژاریانی وهد اتوماتیکی پارتیشن کنگ پیش آتکنت: \n \n%s"
#: ../autopart.py:1555 ../autopart.py:1572
msgid ""
diff --git a/po/nb.po b/po/nb.po
index acbab78d3..3088d12f2 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,29 +1,29 @@
-# Kjartan Maraas <kmaraas@gnome.org>, 2007.
+# Kjartan Maraas <kmaraas@gnome.org>, 1998-2007.
#
#
msgid ""
msgstr ""
-"Project-Id-Version: anaconda FC7\n"
+"Project-Id-Version: anaconda FC9\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-02 12:12-0500\n"
-"PO-Revision-Date: 2007-10-29 01:05+0100\n"
-"Last-Translator: Espen A. Stefansen <espenas@gmail.com>\n"
+"POT-Creation-Date: 2008-01-31 12:10+0100\n"
+"PO-Revision-Date: 2008-03-13 12:54+0100\n"
+"Last-Translator: Kjartan Maraas <kmaraas@broadpark.no>\n"
"Language-Team: Norwegian/Bokmaal <i18n-nb@lister.ping.uio.no>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: ../anaconda:289
-#, fuzzy, c-format
+#, c-format
msgid "Error processing %%ksappend lines: %s"
-msgstr "Feil under åpning av kickstart-fil %s: %s"
+msgstr "Feil under prosessering av %%ksappend-linjer: %s"
#: ../anaconda:292
#, c-format
msgid "Unknown error processing %%ksappend lines: %s"
-msgstr ""
+msgstr "Ukjent feil under prosessering av %%ksappend linjer: %s"
-#: ../anaconda:306 ../cmdline.py:78 ../gui.py:1174 ../text.py:508
+#: ../anaconda:306 ../cmdline.py:78 ../gui.py:1129 ../text.py:459
#, c-format, python-format
msgid ""
"The following error was found while parsing your kickstart configuration:\n"
@@ -38,47 +38,47 @@ msgstr ""
msgid "Press <enter> for a shell"
msgstr "Trykk <linjeskift> for et skall"
-#: ../anaconda:438 ../gui.py:235 ../rescue.py:271 ../rescue.py:339
-#: ../rescue.py:366 ../rescue.py:376 ../rescue.py:452 ../rescue.py:458
-#: ../text.py:536 ../text.py:698 ../textw/constants_text.py:42
+#: ../anaconda:438 ../gui.py:236 ../rescue.py:265 ../rescue.py:333
+#: ../rescue.py:360 ../rescue.py:370 ../rescue.py:449 ../rescue.py:455
+#: ../text.py:487 ../text.py:649 ../textw/constants_text.py:42
#: ../textw/network_text.py:44 ../textw/network_text.py:54
#: ../textw/network_text.py:76 ../textw/network_text.py:82
-#: ../textw/network_text.py:230 ../textw/network_text.py:815
-#: ../textw/network_text.py:823 ../loader2/cdinstall.c:145
-#: ../loader2/cdinstall.c:146 ../loader2/cdinstall.c:196
-#: ../loader2/cdinstall.c:199 ../loader2/cdinstall.c:326
-#: ../loader2/cdinstall.c:331 ../loader2/cdinstall.c:335
-#: ../loader2/cdinstall.c:401 ../loader2/dirbrowser.c:145
+#: ../textw/network_text.py:230 ../textw/network_text.py:816
+#: ../textw/network_text.py:824 ../loader2/cdinstall.c:145
+#: ../loader2/cdinstall.c:146 ../loader2/cdinstall.c:197
+#: ../loader2/cdinstall.c:200 ../loader2/cdinstall.c:328
+#: ../loader2/cdinstall.c:333 ../loader2/cdinstall.c:337
+#: ../loader2/cdinstall.c:403 ../loader2/dirbrowser.c:145
#: ../loader2/driverdisk.c:98 ../loader2/driverdisk.c:235
#: ../loader2/driverdisk.c:266 ../loader2/driverdisk.c:299
#: ../loader2/driverdisk.c:337 ../loader2/driverdisk.c:351
#: ../loader2/driverdisk.c:365 ../loader2/driverdisk.c:375
#: ../loader2/driverdisk.c:535 ../loader2/driverdisk.c:572
#: ../loader2/driverselect.c:75 ../loader2/driverselect.c:199
-#: ../loader2/hdinstall.c:133 ../loader2/hdinstall.c:186
-#: ../loader2/hdinstall.c:344 ../loader2/hdinstall.c:394
-#: ../loader2/hdinstall.c:426 ../loader2/hdinstall.c:496
-#: ../loader2/hdinstall.c:539 ../loader2/hdinstall.c:552 ../loader2/kbd.c:138
+#: ../loader2/hdinstall.c:129 ../loader2/hdinstall.c:180
+#: ../loader2/hdinstall.c:340 ../loader2/hdinstall.c:390
+#: ../loader2/hdinstall.c:425 ../loader2/hdinstall.c:495
+#: ../loader2/hdinstall.c:538 ../loader2/hdinstall.c:551 ../loader2/kbd.c:138
#: ../loader2/kickstart.c:132 ../loader2/kickstart.c:142
#: ../loader2/kickstart.c:185 ../loader2/kickstart.c:284
#: ../loader2/kickstart.c:372 ../loader2/kickstart.c:529 ../loader2/lang.c:115
#: ../loader2/lang.c:376 ../loader2/loader.c:344 ../loader2/loader.c:379
-#: ../loader2/loader.c:414 ../loader2/loader.c:431 ../loader2/loader.c:444
-#: ../loader2/loader.c:479 ../loader2/loader.c:992 ../loader2/loader.c:1154
+#: ../loader2/loader.c:414 ../loader2/loader.c:431 ../loader2/loader.c:446
+#: ../loader2/loader.c:481 ../loader2/loader.c:971 ../loader2/loader.c:1133
#: ../loader2/mediacheck.c:62 ../loader2/mediacheck.c:100
-#: ../loader2/method.c:156 ../loader2/method.c:377 ../loader2/method.c:451
+#: ../loader2/method.c:156 ../loader2/method.c:374 ../loader2/method.c:448
#: ../loader2/modules.c:336 ../loader2/modules.c:348 ../loader2/net.c:281
#: ../loader2/net.c:324 ../loader2/net.c:754 ../loader2/net.c:1098
-#: ../loader2/net.c:1653 ../loader2/net.c:1676 ../loader2/net.c:1869
-#: ../loader2/nfsinstall.c:67 ../loader2/nfsinstall.c:139
-#: ../loader2/nfsinstall.c:197 ../loader2/nfsinstall.c:256
-#: ../loader2/nfsinstall.c:264 ../loader2/nfsinstall.c:302
+#: ../loader2/net.c:1648 ../loader2/net.c:1671 ../loader2/net.c:1864
+#: ../loader2/nfsinstall.c:67 ../loader2/nfsinstall.c:135
+#: ../loader2/nfsinstall.c:195 ../loader2/nfsinstall.c:254
+#: ../loader2/nfsinstall.c:262 ../loader2/nfsinstall.c:300
#: ../loader2/telnetd.c:93 ../loader2/urlinstall.c:81
-#: ../loader2/urlinstall.c:104 ../loader2/urlinstall.c:154
-#: ../loader2/urlinstall.c:167 ../loader2/urlinstall.c:426
-#: ../loader2/urlinstall.c:435 ../loader2/urlinstall.c:444
-#: ../loader2/urls.c:294 ../loader2/urls.c:328 ../loader2/urls.c:339
-#: ../loader2/urls.c:411
+#: ../loader2/urlinstall.c:104 ../loader2/urlinstall.c:155
+#: ../loader2/urlinstall.c:168 ../loader2/urlinstall.c:427
+#: ../loader2/urlinstall.c:436 ../loader2/urlinstall.c:445
+#: ../loader2/urls.c:297 ../loader2/urls.c:331 ../loader2/urls.c:342
+#: ../loader2/urls.c:414
msgid "OK"
msgstr "OK"
@@ -94,7 +94,7 @@ msgstr ""
msgid "No video hardware found, assuming headless"
msgstr "Ingen skjermkort funnet. Antar at du kjører uten skjerm"
-#: ../anaconda:468 ../anaconda:977
+#: ../anaconda:468 ../anaconda:975
msgid "Unable to instantiate a X hardware state object."
msgstr "Kan ikke lage et maskinvare tilstandsobjekt for X."
@@ -102,15 +102,15 @@ msgstr "Kan ikke lage et maskinvare tilstandsobjekt for X."
msgid "Starting graphical installation..."
msgstr "Starter grafisk installasjon..."
-#: ../anaconda:851
+#: ../anaconda:849
msgid "Install class forcing text mode installation"
msgstr "Installasjonsklassen krever installasjon i tekstmodus"
-#: ../anaconda:891
+#: ../anaconda:889
msgid "Graphical installation not available... Starting text mode."
msgstr "Grafisk installasjon er ikke tilgjengelig... Starter i tekstmodus."
-#: ../anaconda:899
+#: ../anaconda:897
msgid "DISPLAY variable not set. Starting text mode!"
msgstr "DISPLAY-variabelen er ikke satt. Starter tekstmodus!"
@@ -121,35 +121,26 @@ msgid ""
"\n"
"%s"
msgstr ""
+"Feil under endring av størrelse på partisjon %s.\n"
+"\n"
+"%s"
#: ../autopart.py:896
#, python-format
msgid "Start of partition %s was moved when resizing"
-msgstr ""
+msgstr "Starten på partisjon %s ble flyttet ved endring av størrelse"
#: ../autopart.py:988
-#, fuzzy
msgid "Could not allocate cylinder-based partitions as primary partitions.\n"
-msgstr ""
-"Kunne ikke allokere sylinder-baserte partisjoner som primære partisjoner.\n"
-"\n"
-"%s"
+msgstr "Kunne ikke allokere sylinder-baserte partisjoner som primære partisjoner.\n"
#: ../autopart.py:993
-#, fuzzy
msgid "Could not allocate partitions as primary partitions.\n"
-msgstr ""
-"Kunne ikke allokere partisjoner som primære partisjoner.\n"
-"\n"
-"%s"
+msgstr "Kunne ikke allokere partisjoner som primære partisjoner.\n"
#: ../autopart.py:998
-#, fuzzy
msgid "Could not allocate cylinder-based partitions.\n"
-msgstr ""
-"Kunne ikke allokere sylinder-baserte partisjoner.\n"
-"\n"
-"%s"
+msgstr "Kunne ikke allokere sylinder-baserte partisjoner.\n"
#: ../autopart.py:1063
#, python-format
@@ -187,7 +178,7 @@ msgid ""
"The boot partition must entirely be in the first 4GB of the disk. "
"OpenFirmware won't be able to boot this installation."
msgstr ""
-"Hele oppstartspartisjonen må være blant de første 4GB på harddisken. "
+"Hele oppstartspartisjonen må ligge innenfor de første 4GB på harddisken. "
"OpenFirmware vil ikke kunne starte denne installasjonen."
#: ../autopart.py:1076
@@ -360,7 +351,7 @@ msgstr "Fatal feil"
#: ../autopart.py:1589
msgid "Your system will now be rebooted."
-msgstr "Systemet vil nå startes på nytt."
+msgstr "Systemet vil nå startes på nytt."
#: ../autopart.py:1706
msgid ""
@@ -410,40 +401,39 @@ msgid "Installing %s\n"
msgstr "Installerer %s\n"
#: ../bootloader.py:44 ../bootloader.py:216 ../image.py:87
-#: ../partedUtils.py:353 ../partedUtils.py:383 ../partedUtils.py:1091
-#: ../partedUtils.py:1244 ../upgrade.py:403 ../yuminstall.py:1387
-#: ../yuminstall.py:1414 ../iw/autopart_type.py:178 ../iw/blpasswidget.py:149
-#: ../iw/task_gui.py:53 ../iw/upgrade_swap_gui.py:192
-#: ../iw/upgrade_swap_gui.py:200 ../iw/upgrade_swap_gui.py:207
-#: ../textw/bootloader_text.py:127 ../textw/bootloader_text.py:452
-#: ../textw/partition_text.py:249 ../textw/upgrade_text.py:178
+#: ../partedUtils.py:353 ../partedUtils.py:383 ../partedUtils.py:1028
+#: ../partedUtils.py:1181 ../upgrade.py:392 ../yuminstall.py:1350
+#: ../yuminstall.py:1377 ../iw/autopart_type.py:97 ../iw/blpasswidget.py:149
+#: ../iw/bootloader_advanced_gui.py:44 ../iw/task_gui.py:98
+#: ../iw/upgrade_swap_gui.py:192 ../iw/upgrade_swap_gui.py:200
+#: ../iw/upgrade_swap_gui.py:207 ../textw/bootloader_text.py:127
+#: ../textw/bootloader_text.py:452 ../textw/partition_text.py:249
+#: ../textw/upgrade_text.py:178
msgid "Warning"
msgstr "Advarsel"
#: ../bootloader.py:45
-#, fuzzy
msgid ""
"Your filesystems have already been activated. You cannot go back past this "
"point.\n"
"\n"
"Would you like to continue with the installation?"
msgstr ""
-"Partisjoneringsalternativene du har valgt er allerede aktivert. Du vil ikke "
-"kunne gå tilbake til skjermen for redigering av disker. Vil du fortsette "
-"installasjonsprosessen?"
+"Filsystemene dine er allerede aktivert. Du vil ikke kunne gå tilbake til tidligere skjermer.\n"
+"\n"
+"Vil du fortsette installasjonsprosessen?"
#: ../bootloader.py:49 ../exception.py:348 ../exception.py:364
-#: ../fsset.py:1675 ../fsset.py:1929 ../fsset.py:2660 ../fsset.py:2667
-#: ../gui.py:1179 ../gui.py:1313 ../image.py:96 ../livecd.py:375
-#: ../upgrade.py:84 ../upgrade.py:104 ../yuminstall.py:644
-#: ../yuminstall.py:719 ../yuminstall.py:725 ../yuminstall.py:893
-#: ../yuminstall.py:941 ../yuminstall.py:1173 ../yuminstall.py:1210
+#: ../fsset.py:1653 ../fsset.py:1907 ../fsset.py:2644 ../fsset.py:2651
+#: ../gui.py:1134 ../gui.py:1268 ../image.py:96 ../livecd.py:367
+#: ../upgrade.py:84 ../upgrade.py:104 ../yuminstall.py:700
+#: ../yuminstall.py:706 ../yuminstall.py:1173
msgid "_Exit installer"
msgstr "A_vslutt installering"
-#: ../bootloader.py:49 ../fsset.py:1930 ../image.py:97 ../image.py:247
-#: ../kickstart.py:978 ../kickstart.py:1016 ../partedUtils.py:1247
-#: ../upgrade.py:84 ../upgrade.py:104 ../yuminstall.py:898
+#: ../bootloader.py:49 ../fsset.py:1908 ../image.py:97 ../image.py:247
+#: ../kickstart.py:979 ../kickstart.py:1017 ../partedUtils.py:1184
+#: ../upgrade.py:84 ../upgrade.py:104 ../yuminstall.py:865
#: ../iw/partition_gui.py:1037
msgid "_Continue"
msgstr "_Fortsett"
@@ -481,46 +471,33 @@ msgid "Parted exceptions can't be handled in command line mode!"
msgstr "Unntak fra parted kan ikke håndteres i kommandolinjemodus!"
#: ../constants.py:75
-#, fuzzy
+#, python-format
msgid ""
"An unhandled exception has occurred. This is most likely a bug. Please "
-"save a copy of the detailed exception and file a bug report"
+"save a copy of the detailed exception and file a bug report against anaconda "
+"at %s"
msgstr ""
"Et uhåndtert unntak har oppstått. Dette er sannsynligvis en feil. Kopier "
"hele teksten fra feilmeldingen og send så inn en detaljert feilrapport for "
"anaconda på %s"
-#: ../constants.py:81
-msgid " with the provider of this software."
-msgstr ""
-
-#: ../constants.py:85
-#, fuzzy, python-format
-msgid " against anaconda at %s"
-msgstr "Leser anaconda-oppdateringer..."
-
#: ../exception.py:344 ../exception.py:360
msgid "Dump Written"
msgstr "Dump skrevet"
#: ../exception.py:345
-#, fuzzy
msgid ""
"Your system's state has been successfully written to the disk. The installer "
"will now exit."
-msgstr ""
-"Systemets tilstand ble skrevet til disketten. Installasjonsprogrammet vil nå "
-"avslutte."
+msgstr "Systemets tilstand ble skrevet til disk. Installasjonsprogrammet vil nå avslutte."
#: ../exception.py:351 ../exception.py:367
msgid "Dump Not Written"
msgstr "Dump ikke skrevet"
#: ../exception.py:352
-#, fuzzy
msgid "There was a problem writing the system state to the disk."
-msgstr ""
-"Det oppsto et problem under skriving av systemets tilstand til disketten."
+msgstr "Det oppsto et problem under skriving av systemets tilstand til disk."
#: ../exception.py:361
msgid ""
@@ -535,59 +512,56 @@ msgid "There was a problem writing the system state to the remote host."
msgstr ""
"Det oppsto et problem med skriving av tilstand for systemet til ekstern vert."
-#: ../fsset.py:533
-#, fuzzy
+#: ../fsset.py:534
msgid "Checking"
-msgstr "Kontrollerer \"%s\"..."
+msgstr "Sjekker"
-#: ../fsset.py:534
-#, fuzzy, python-format
+#: ../fsset.py:535
+#, python-format
msgid "Checking filesystem on %s..."
-msgstr "Leter etter dårlige blokker på /dev/%s..."
+msgstr "Sjekker filsystem på %s..."
-#: ../fsset.py:544 ../fsset.py:977
-#, fuzzy
+#: ../fsset.py:545 ../fsset.py:957
msgid "Resizing"
-msgstr "Henter"
+msgstr "Endrer størrelse"
-#: ../fsset.py:545 ../fsset.py:978
-#, fuzzy, python-format
+#: ../fsset.py:546 ../fsset.py:958
+#, python-format
msgid "Resizing filesystem on %s..."
-msgstr "Formaterer %s-filsystem..."
-
-#: ../fsset.py:687 ../fsset.py:1645 ../fsset.py:1676 ../fsset.py:1752
-#: ../fsset.py:1820 ../fsset.py:1870 ../fsset.py:1952 ../fsset.py:1965
-#: ../image.py:264 ../livecd.py:368 ../partIntfHelpers.py:412 ../text.py:444
-#: ../yuminstall.py:347 ../yuminstall.py:402 ../yuminstall.py:538
-#: ../yuminstall.py:640 ../yuminstall.py:904 ../yuminstall.py:945
-#: ../yuminstall.py:1178 ../yuminstall.py:1203 ../iw/autopart_type.py:93
-#: ../iw/autopart_type.py:168 ../iw/autopart_type.py:312
-#: ../iw/netconfig_dialog.py:264 ../iw/osbootwidget.py:210
-#: ../iw/osbootwidget.py:219 ../iw/raid_dialog_gui.py:669
-#: ../iw/raid_dialog_gui.py:708 ../iw/task_gui.py:43 ../iw/task_gui.py:226
+msgstr "Endrer størrelse for filsystem på %s..."
+
+#: ../fsset.py:688 ../fsset.py:1623 ../fsset.py:1654 ../fsset.py:1730
+#: ../fsset.py:1798 ../fsset.py:1848 ../fsset.py:1930 ../fsset.py:1943
+#: ../image.py:264 ../livecd.py:360 ../partIntfHelpers.py:412
+#: ../yuminstall.py:346 ../yuminstall.py:401 ../yuminstall.py:537
+#: ../yuminstall.py:871 ../yuminstall.py:908 ../yuminstall.py:1143
+#: ../yuminstall.py:1166 ../iw/autopart_type.py:87 ../iw/autopart_type.py:231
+#: ../iw/netconfig_dialog.py:264 ../iw/osbootwidget.py:222
+#: ../iw/osbootwidget.py:231 ../iw/raid_dialog_gui.py:658
+#: ../iw/raid_dialog_gui.py:697 ../iw/task_gui.py:88 ../iw/task_gui.py:268
#: ../textw/grpselect_text.py:123 ../textw/partition_text.py:1650
#: ../textw/partition_text.py:1656 ../textw/partition_text.py:1678
#: ../textw/upgrade_text.py:166 ../textw/upgrade_text.py:173
-#: ../loader2/cdinstall.c:146 ../loader2/cdinstall.c:401
+#: ../loader2/cdinstall.c:146 ../loader2/cdinstall.c:403
#: ../loader2/driverdisk.c:98 ../loader2/driverdisk.c:299
#: ../loader2/driverdisk.c:337 ../loader2/driverdisk.c:365
#: ../loader2/driverdisk.c:375 ../loader2/driverdisk.c:439
-#: ../loader2/hdinstall.c:133 ../loader2/hdinstall.c:186
-#: ../loader2/hdinstall.c:394 ../loader2/hdinstall.c:496
-#: ../loader2/hdinstall.c:539 ../loader2/hdinstall.c:552
+#: ../loader2/hdinstall.c:129 ../loader2/hdinstall.c:180
+#: ../loader2/hdinstall.c:390 ../loader2/hdinstall.c:495
+#: ../loader2/hdinstall.c:538 ../loader2/hdinstall.c:551
#: ../loader2/kickstart.c:284 ../loader2/lang.c:115 ../loader2/loader.c:344
-#: ../loader2/loader.c:444 ../loader2/loader.c:992 ../loader2/mediacheck.c:62
-#: ../loader2/mediacheck.c:100 ../loader2/method.c:156 ../loader2/method.c:377
-#: ../loader2/method.c:451 ../loader2/nfsinstall.c:139
-#: ../loader2/nfsinstall.c:197 ../loader2/nfsinstall.c:256
-#: ../loader2/nfsinstall.c:264 ../loader2/telnetd.c:93
+#: ../loader2/loader.c:446 ../loader2/loader.c:971 ../loader2/mediacheck.c:62
+#: ../loader2/mediacheck.c:100 ../loader2/method.c:156 ../loader2/method.c:374
+#: ../loader2/method.c:448 ../loader2/nfsinstall.c:135
+#: ../loader2/nfsinstall.c:195 ../loader2/nfsinstall.c:254
+#: ../loader2/nfsinstall.c:262 ../loader2/telnetd.c:93
#: ../loader2/urlinstall.c:81 ../loader2/urlinstall.c:104
-#: ../loader2/urlinstall.c:154 ../loader2/urlinstall.c:167
-#: ../loader2/urls.c:328
+#: ../loader2/urlinstall.c:155 ../loader2/urlinstall.c:168
+#: ../loader2/urls.c:331
msgid "Error"
msgstr "Feil"
-#: ../fsset.py:688
+#: ../fsset.py:689
#, python-format
msgid ""
"An error occurred migrating %s to ext3. It is possible to continue without "
@@ -600,27 +574,27 @@ msgstr ""
"\n"
"Ønsker du å fortsette uten å migrere %s?"
-#: ../fsset.py:1502
+#: ../fsset.py:1480
msgid "RAID Device"
msgstr "RAID-enhet"
-#: ../fsset.py:1506 ../fsset.py:1512
+#: ../fsset.py:1484 ../fsset.py:1490
msgid "Apple Bootstrap"
msgstr "Apple bootstrap"
-#: ../fsset.py:1517 ../partitions.py:1130
+#: ../fsset.py:1495 ../partitions.py:1030
msgid "PPC PReP Boot"
msgstr "PPC PReP oppstart"
-#: ../fsset.py:1520
+#: ../fsset.py:1498
msgid "First sector of boot partition"
msgstr "Første sektor på oppstartspartisjonen"
-#: ../fsset.py:1521
+#: ../fsset.py:1499
msgid "Master Boot Record (MBR)"
msgstr "Master Boot Record (MBR)"
-#: ../fsset.py:1646
+#: ../fsset.py:1624
#, python-format
msgid ""
"An error occurred trying to initialize swap on device %s. This problem is "
@@ -633,13 +607,13 @@ msgstr ""
"\n"
"Trykk <Linjeskift> for å avslutte installasjonen."
-#: ../fsset.py:1675 ../packages.py:304 ../rescue.py:305 ../rescue.py:307
-#: ../textw/upgrade_text.py:124 ../loader2/cdinstall.c:196
-#: ../loader2/cdinstall.c:199 ../loader2/method.c:424
+#: ../fsset.py:1653 ../packages.py:298 ../rescue.py:299 ../rescue.py:301
+#: ../textw/upgrade_text.py:124 ../loader2/cdinstall.c:197
+#: ../loader2/cdinstall.c:200 ../loader2/method.c:421
msgid "Skip"
msgstr "Hopp over"
-#: ../fsset.py:1696
+#: ../fsset.py:1674
#, python-format
msgid ""
"The swap device:\n"
@@ -658,11 +632,11 @@ msgstr ""
"formattere den på nytt som en Linux swap-enhet med versjon 1. Hvis du ikke "
"gjør dette bil installasjonsprogrammet overse den under installasjonen."
-#: ../fsset.py:1703
+#: ../fsset.py:1681
msgid "Reformat"
msgstr "Formater på nytt"
-#: ../fsset.py:1707
+#: ../fsset.py:1685
#, python-format
msgid ""
"The swap device:\n"
@@ -681,7 +655,7 @@ msgstr ""
"noe som betyr at ditt system er i hvilemodus. For å utføre en oppgradering, "
"vennligst slå av systemet, enn å sette det i hvilemodus."
-#: ../fsset.py:1715
+#: ../fsset.py:1693
#, python-format
msgid ""
"The swap device:\n"
@@ -699,9 +673,9 @@ msgstr ""
"i din /etc/fstab-fil brukes i øyeblikket som en partisjon for "
"programvaresuspendering, noe som betyr at ditt system er i hvilemodus. Hvis "
"du utfører en ny installasjon, sjekk at installasjonsprogrammet er satt opp "
-"til å formatere alle swap-partisjonene."
+"til å formatere alle swap-partisjonene."
-#: ../fsset.py:1725
+#: ../fsset.py:1703
msgid ""
"\n"
"\n"
@@ -714,12 +688,12 @@ msgstr ""
"partisjonen under oppgraderingen. Velg \"Formater\" for å reformatere "
"partisjonen som en swap-partisjon."
-#: ../fsset.py:1730 ../iw/partition_gui.py:373
+#: ../fsset.py:1708 ../iw/partition_gui.py:373
msgid "Format"
msgstr "Formater"
-#: ../fsset.py:1736
-#, fuzzy, python-format
+#: ../fsset.py:1714
+#, python-format
msgid ""
"Error enabling swap device %s: %s\n"
"\n"
@@ -727,14 +701,14 @@ msgid ""
"\n"
"Press OK to exit the installer."
msgstr ""
-"Feil under montering av enhet %s som %s: %s\n"
+"Feil under aktivering av swap-enhet %s: %s\n"
"\n"
"Enhetene i /etc/fstab burde spesifiseres med etikett, ikke med enhetsnavn.\n"
"\n"
"Trykk OK for å avslutte installasjonsprogrammet."
-#: ../fsset.py:1741
-#, fuzzy, python-format
+#: ../fsset.py:1719
+#, python-format
msgid ""
"Error enabling swap device %s: %s\n"
"\n"
@@ -745,12 +719,11 @@ msgid ""
msgstr ""
"Feil under aktivering av swap-enhet %s: %s\n"
"\n"
-"/etc/fstab-filen på din oppgraderte partisjon inneholder ikke en gyldig "
-"referanse til en swap-enhet.\n"
+"/etc/fstab-filen på partisjonen som skal oppgraderes inneholder ikke en gyldig referanse til en swap-enhet.\n"
"\n"
-"Trykk OK for å avslutte installasjonsprogrammet."
+"Trykk OK for å avslutte installasjonsprogrammet"
-#: ../fsset.py:1747
+#: ../fsset.py:1725
#, python-format
msgid ""
"Error enabling swap device %s: %s\n"
@@ -765,7 +738,7 @@ msgstr ""
"\n"
"Trykk OK for å avslutte installasjonsprogrammet."
-#: ../fsset.py:1821
+#: ../fsset.py:1799
#, python-format
msgid ""
"An error occurred trying to format %s. This problem is serious, and the "
@@ -778,7 +751,7 @@ msgstr ""
"\n"
"Trykk <Linjeskift> for å avslutte installasjonsprogrammet."
-#: ../fsset.py:1871
+#: ../fsset.py:1849
#, python-format
msgid ""
"An error occurred trying to migrate %s. This problem is serious, and the "
@@ -791,11 +764,11 @@ msgstr ""
"\n"
"Trykk <Linjeskift> for å avslutte installasjonsprogrammet."
-#: ../fsset.py:1897 ../fsset.py:1906
+#: ../fsset.py:1875 ../fsset.py:1884
msgid "Invalid mount point"
msgstr "Ugyldig monteringspunkt"
-#: ../fsset.py:1898
+#: ../fsset.py:1876
#, python-format
msgid ""
"An error occurred when trying to create %s. Some element of this path is "
@@ -809,7 +782,7 @@ msgstr ""
"\n"
"Trykk <Linjeskift> for å avslutte installasjonsprogrammet."
-#: ../fsset.py:1907
+#: ../fsset.py:1885
#, python-format
msgid ""
"An error occurred when trying to create %s: %s. This is a fatal error and "
@@ -822,11 +795,11 @@ msgstr ""
"\n"
"Trykk <Linjeskift> for å avslutte installasjonsprogrammet."
-#: ../fsset.py:1921
+#: ../fsset.py:1899
msgid "Unable to mount filesystem"
msgstr "Kan ikke montere filsystem"
-#: ../fsset.py:1922
+#: ../fsset.py:1900
#, python-format
msgid ""
"An error occurred mounting device %s as %s. You may continue installation, "
@@ -835,7 +808,7 @@ msgstr ""
"En feil oppsto under montering av enhet %s som %s. Du kan fortsette "
"installasjonen, men det kan ha oppstått problemer."
-#: ../fsset.py:1938
+#: ../fsset.py:1916
#, python-format
msgid ""
"Error mounting device %s as %s: %s\n"
@@ -850,7 +823,7 @@ msgstr ""
"\n"
"Trykk OK for å avslutte installasjonsprogrammet."
-#: ../fsset.py:1945
+#: ../fsset.py:1923
#, python-format
msgid ""
"Error mounting device %s as %s: %s\n"
@@ -865,7 +838,7 @@ msgstr ""
"\n"
"Trykk OK for å avslutte installasjonsprogrammet."
-#: ../fsset.py:1966
+#: ../fsset.py:1944
msgid ""
"Error finding / entry.\n"
"\n"
@@ -879,11 +852,11 @@ msgstr ""
"\n"
"Trykk OK for å avslutte installasjonsprogrammet."
-#: ../fsset.py:2652
+#: ../fsset.py:2636
msgid "Duplicate Labels"
msgstr "Dupliserte etiketter"
-#: ../fsset.py:2653
+#: ../fsset.py:2637
#, python-format
msgid ""
"Multiple devices on your system are labelled %s. Labels across devices must "
@@ -896,11 +869,11 @@ msgstr ""
"\n"
"Vennligst rett opp dette problemet og start installasjonen på nytt."
-#: ../fsset.py:2662
+#: ../fsset.py:2646
msgid "Invalid Label"
msgstr "Ugyldig etikett"
-#: ../fsset.py:2663
+#: ../fsset.py:2647
#, python-format
msgid ""
"An invalid label was found on device %s. Please fix this problem and "
@@ -909,24 +882,24 @@ msgstr ""
"En ugyldig etikett ble funnet på enhet %s. Vennligst rett opp dette "
"problemet og start installasjonen på nytt."
-#: ../fsset.py:2800
+#: ../fsset.py:2784
msgid "Formatting"
msgstr "Formaterer"
-#: ../fsset.py:2801
+#: ../fsset.py:2785
#, python-format
msgid "Formatting %s file system..."
msgstr "Formaterer %s-filsystem..."
-#: ../gui.py:107
+#: ../gui.py:108
msgid "An error occurred copying the screenshots over."
msgstr "En feil oppstod under kopiering av skjermdump."
-#: ../gui.py:118
+#: ../gui.py:119
msgid "Screenshots Copied"
msgstr "Skjermdump kopiert"
-#: ../gui.py:119
+#: ../gui.py:120
msgid ""
"The screenshots have been saved into the directory:\n"
"\n"
@@ -940,20 +913,20 @@ msgstr ""
"\n"
"Du har tilgang til disse når du starter på nytt og logger inn som root."
-#: ../gui.py:162
+#: ../gui.py:163
msgid "Saving Screenshot"
msgstr "Lagrer skjermdump"
-#: ../gui.py:163
+#: ../gui.py:164
#, python-format
msgid "A screenshot named '%s' has been saved."
msgstr "Et skjermdump med navn «%s» er lagret."
-#: ../gui.py:166
+#: ../gui.py:167
msgid "Error Saving Screenshot"
msgstr "Feil under lagring av skjermdump"
-#: ../gui.py:167
+#: ../gui.py:168
msgid ""
"An error occurred while saving the screenshot. If this occurred during "
"package installation, you may need to try several times for it to succeed."
@@ -962,98 +935,89 @@ msgstr ""
"installasjon av pakker, vil du kanskje måtte prøve flere ganger før det "
"virker."
-#: ../gui.py:232 ../text.py:533
+#: ../gui.py:233 ../text.py:484
msgid "Fix"
msgstr "Fiks"
-#: ../gui.py:233 ../rescue.py:228 ../text.py:534
+#: ../gui.py:234 ../rescue.py:222 ../text.py:485
#: ../textw/bootloader_text.py:72 ../textw/constants_text.py:54
#: ../loader2/driverdisk.c:479 ../loader2/driverdisk.c:489
-#: ../loader2/hdinstall.c:290
+#: ../loader2/hdinstall.c:286
msgid "Yes"
msgstr "Ja"
-#: ../gui.py:234 ../rescue.py:228 ../rescue.py:230 ../text.py:535
+#: ../gui.py:235 ../rescue.py:222 ../rescue.py:224 ../text.py:486
#: ../textw/bootloader_text.py:72 ../textw/constants_text.py:58
#: ../loader2/driverdisk.c:479 ../loader2/driverdisk.c:489
msgid "No"
msgstr "Nei"
-#: ../gui.py:236 ../text.py:537 ../text.py:668 ../loader2/net.c:96
+#: ../gui.py:237 ../text.py:488 ../text.py:619 ../loader2/net.c:96
#: ../loader2/net.c:342 ../loader2/net.c:593 ../loader2/net.c:699
#: ../loader2/net.c:824 ../loader2/net.c:832 ../loader2/net.c:1228
#: ../loader2/net.c:1234
msgid "Retry"
msgstr "Prøv igjen"
-#: ../gui.py:237 ../text.py:538
+#: ../gui.py:238 ../text.py:489
msgid "Ignore"
msgstr "Overse"
-#: ../gui.py:238 ../gui.py:843 ../partIntfHelpers.py:244
-#: ../partIntfHelpers.py:535 ../text.py:109 ../text.py:110 ../text.py:539
-#: ../textw/bootloader_text.py:202 ../textw/constants_text.py:46
-#: ../loader2/dirbrowser.c:145 ../loader2/driverdisk.c:236
-#: ../loader2/kickstart.c:372 ../loader2/loader.c:379 ../loader2/loader.c:479
+#: ../gui.py:239 ../gui.py:806 ../partIntfHelpers.py:244
+#: ../partIntfHelpers.py:535 ../text.py:109 ../text.py:110 ../text.py:490
+#: ../iw/bootloader_advanced_gui.py:50 ../textw/bootloader_text.py:202
+#: ../textw/constants_text.py:46 ../loader2/dirbrowser.c:145
+#: ../loader2/driverdisk.c:236 ../loader2/kickstart.c:372
+#: ../loader2/loader.c:379 ../loader2/loader.c:481
msgid "Cancel"
msgstr "Avbryt"
-#: ../gui.py:583 ../text.py:465
+#: ../gui.py:584 ../text.py:416
msgid "Installation Key"
msgstr "Installasjonsnøkkel"
-#: ../gui.py:657 ../gui.py:665
-#, fuzzy
+#: ../gui.py:656 ../gui.py:664
msgid "Error with passphrase"
msgstr "Feil med passord"
-#: ../gui.py:658
-#, fuzzy
+#: ../gui.py:657
msgid "The passphrases you entered were different. Please try again."
msgstr "Passordene du skrev inn var forskjellige. Vennligst forsøk igjen."
-#: ../gui.py:666
-#, fuzzy
+#: ../gui.py:665
msgid "The passphrase must be at least eight characters long."
-msgstr "Passordet må være minst seks tegn langt."
-
-#: ../gui.py:692 ../text.py:275
-#, python-format
-msgid ""
-"Device %s is encrypted. In order to access the device's contents during "
-"installation you must enter the device's passphrase below."
-msgstr ""
+msgstr "Passordet må være minst åtte tegn langt."
-#: ../gui.py:855 ../gui.py:856 ../gui.py:968 ../gui.py:969
+#: ../gui.py:818 ../gui.py:819 ../gui.py:931 ../gui.py:932
#: tmp/anaconda.glade.h:2
msgid "_Debug"
-msgstr "_Debug"
+msgstr "_Feilsøk"
-#: ../gui.py:1012 ../gui.py:1014 ../livecd.py:112
+#: ../gui.py:975 ../gui.py:977 ../livecd.py:111
msgid "Exit installer"
msgstr "Avslutt installering"
-#: ../gui.py:1014 ../text.py:253 ../text.py:261
+#: ../gui.py:977 ../text.py:253 ../text.py:261
msgid "Debug"
msgstr "Debug"
-#: ../gui.py:1016 ../text.py:257
+#: ../gui.py:979 ../text.py:257
msgid "Exception Occurred"
msgstr "Uventet hendelse oppstod"
-#: ../gui.py:1176 ../text.py:510
+#: ../gui.py:1131 ../text.py:461
msgid "Error Parsing Kickstart Config"
msgstr "Feil under lesing av kickstart-konfigurasjon"
-#: ../gui.py:1222
+#: ../gui.py:1177
msgid "default:LTR"
msgstr "default:LTR"
-#: ../gui.py:1302 ../text.py:663
+#: ../gui.py:1257 ../text.py:614
msgid "Error!"
msgstr "Feil!"
-#: ../gui.py:1303 ../text.py:664
+#: ../gui.py:1258 ../text.py:615
#, python-format
msgid ""
"An error occurred when attempting to load an installer interface component.\n"
@@ -1065,43 +1029,43 @@ msgstr ""
"\n"
"className = %s"
-#: ../gui.py:1308 ../image.py:162 ../image.py:188 ../packages.py:353
-#: ../packages.py:358
+#: ../gui.py:1263 ../image.py:162 ../image.py:188 ../packages.py:347
+#: ../packages.py:352
msgid "_Exit"
msgstr "A_vslutt"
-#: ../gui.py:1309 ../image.py:188 ../yuminstall.py:535 ../yuminstall.py:893
-#: ../yuminstall.py:941 ../yuminstall.py:1173
+#: ../gui.py:1264 ../image.py:188 ../yuminstall.py:534 ../yuminstall.py:858
+#: ../yuminstall.py:902 ../yuminstall.py:1136
msgid "_Retry"
msgstr "P_røv igjen"
-#: ../gui.py:1312 ../packages.py:168 ../packages.py:357
+#: ../gui.py:1267 ../packages.py:351
msgid "The installer will now exit..."
msgstr "Installasjonsprogrammet avsluttes nå..."
-#: ../gui.py:1315 ../packages.py:360
+#: ../gui.py:1270 ../packages.py:354
msgid "Your system will now be rebooted..."
msgstr "Maskinen vil nå startes på nytt..."
-#: ../gui.py:1316 ../image.py:247 ../packages.py:169 ../packages.py:361
-#: ../partedUtils.py:1246 ../yuminstall.py:1226
+#: ../gui.py:1271 ../image.py:247 ../packages.py:355 ../partedUtils.py:1183
+#: ../yuminstall.py:1189
msgid "_Reboot"
msgstr "Sta_rt på nytt"
-#: ../gui.py:1318
+#: ../gui.py:1273
msgid "Exiting"
msgstr "Avslutter"
-#: ../gui.py:1384
+#: ../gui.py:1339
#, python-format
msgid "%s Installer"
msgstr "%s installering"
-#: ../gui.py:1391
+#: ../gui.py:1346
msgid "Unable to load title bar"
msgstr "Kunne ikke laste tittellinjen"
-#: ../gui.py:1444
+#: ../gui.py:1399
msgid "Install Window"
msgstr "Installasjonsvindu"
@@ -1175,9 +1139,9 @@ msgstr ""
"Vennligst ha disse klar før du fortsetter med installasjonen. Hvis du må "
"avbryte installasjonen og avslutte, vennligst trykk på «Start på nytt»."
-#: ../image.py:247 ../livecd.py:374 ../packages.py:307 ../packages.py:358
-#: ../packages.py:361 ../yuminstall.py:644 ../yuminstall.py:725
-#: ../yuminstall.py:1210 ../yuminstall.py:1226
+#: ../image.py:247 ../livecd.py:366 ../packages.py:301 ../packages.py:352
+#: ../packages.py:355 ../yuminstall.py:706 ../yuminstall.py:1173
+#: ../yuminstall.py:1189
msgid "_Back"
msgstr "Til_bake"
@@ -1199,38 +1163,34 @@ msgid "Initializing iSCSI initiator"
msgstr "Initierer iSCSI-initiator"
#: ../kickstart.py:86
-#, fuzzy, python-format
+#, python-format
msgid ""
"There was an error running the kickstart script at line %s. You may examine "
"the output in %s. This is a fatal error and your install will be aborted. "
"Press the OK button to exit the installer."
-msgstr ""
-"Det oppsto en feil ved kjøring av skriptet. Du kan undersøke meldingen i %s. "
-"Dette er en alvorlig feil og installasjonen vil bli avbrutt.\n"
-"\n"
-"Trykk OK for å avslutte installasjonsprogrammet."
+msgstr "Det oppsto en feil ved kjøring av kickstart-skriptet på linje %s. Du kan undersøke meldingen i %s. Dette er en alvorlig feil og installasjonen vil bli avbrutt. Trykk OK for å avslutte installasjonsprogrammet."
#: ../kickstart.py:101 ../kickstart.py:103
msgid "Scriptlet Failure"
msgstr "Feil med skript"
-#: ../kickstart.py:921 ../kickstart.py:938
+#: ../kickstart.py:922 ../kickstart.py:939
msgid "Running..."
msgstr "Kjører..."
-#: ../kickstart.py:922
+#: ../kickstart.py:923
msgid "Running post-install scripts"
msgstr "Kjører skript for ferdigstilling av installasjon"
-#: ../kickstart.py:939
+#: ../kickstart.py:940
msgid "Running pre-install scripts"
msgstr "Kjører skript for å klargjøre installasjon"
-#: ../kickstart.py:970
+#: ../kickstart.py:971
msgid "Missing Package"
msgstr "Manglende pakke"
-#: ../kickstart.py:971
+#: ../kickstart.py:972
#, python-format
msgid ""
"You have specified that the package '%s' should be installed. This package "
@@ -1239,15 +1199,16 @@ msgstr ""
"Du har oppgitt en at pakken '%s' skal installeres. Denne pakken finnes ikke. "
"Ønsker du å fortsette installasjonen?"
-#: ../kickstart.py:977 ../kickstart.py:1015
+#: ../kickstart.py:978 ../kickstart.py:1016 ../yuminstall.py:858
+#: ../yuminstall.py:860
msgid "_Abort"
msgstr "_Avbryt"
-#: ../kickstart.py:1007
+#: ../kickstart.py:1008
msgid "Missing Group"
msgstr "Manglende gruppe"
-#: ../kickstart.py:1008
+#: ../kickstart.py:1009
#, python-format
msgid ""
"You have specified that the group '%s' should be installed. This group does "
@@ -1256,11 +1217,11 @@ msgstr ""
"Du har oppgitt at gruppen «%s» skal installeres. Denne gruppen eksisterer "
"ikke. Vil du fortsette eller avbryte installasjonen?"
-#: ../livecd.py:107
+#: ../livecd.py:106
msgid "Unable to find image"
msgstr "Fant ikke bilde"
-#: ../livecd.py:108
+#: ../livecd.py:107
#, python-format
msgid ""
"The given location isn't a valid %s live CD to use as an installation source."
@@ -1268,15 +1229,15 @@ msgstr ""
"Den angitte plassen er ikke en gyldig %s live-CD for å bruke som "
"installasjonskilde."
-#: ../livecd.py:167
+#: ../livecd.py:166
msgid "Copying live image to hard drive."
msgstr "Overfører installasjonsbildet til harddisken..."
-#: ../livecd.py:203
+#: ../livecd.py:195
msgid "Doing post-installation"
msgstr "Sluttfører installering"
-#: ../livecd.py:204
+#: ../livecd.py:196
msgid ""
"Performing post-installation filesystem changes. This may take several "
"minutes..."
@@ -1284,12 +1245,12 @@ msgstr ""
"Utfører endringer i filsystemet etter installasjon. Dette kan ta flere "
"minutter..."
-#: ../livecd.py:369
+#: ../livecd.py:361
#, python-format
msgid ""
"The root filesystem you created is not large enough for this live image "
"(%.2f MB required)."
-msgstr ""
+msgstr "Rotfilsystemet tu laget er ikke stort nok for dette bildet (%.2f MB kreves)."
#: ../network.py:57
msgid "Hostname must be 64 or less characters in length."
@@ -1324,28 +1285,23 @@ msgstr "«%s» er ikke en gyldig IPv6-adresse."
msgid "'%s' is an invalid IP address."
msgstr "«%s» er ikke en gyldig IP-adresse."
-#: ../packages.py:167
-#, fuzzy
-msgid "LVM operation failed"
-msgstr "Montering feilet"
-
-#: ../packages.py:278
+#: ../packages.py:272
msgid "Invalid Key"
msgstr "Ugyldig nøkkel"
-#: ../packages.py:279
+#: ../packages.py:273
msgid "The key you entered is invalid."
msgstr "Nøkkelen du oppgav er ikke gyldig."
-#: ../packages.py:307
+#: ../packages.py:301
msgid "_Skip"
msgstr "_Hopp over"
-#: ../packages.py:339 ../packages.py:362
+#: ../packages.py:333 ../packages.py:356
msgid "Warning! This is pre-release software!"
msgstr "Advarsel! Dette er en ikke ferdig utprøvet programvare!"
-#: ../packages.py:340
+#: ../packages.py:334
#, python-format
msgid ""
"Thank you for downloading this pre-release of %s.\n"
@@ -1372,7 +1328,7 @@ msgstr ""
"\n"
"og send inn en rapport under «%s».\n"
-#: ../packages.py:353
+#: ../packages.py:347
msgid "_Install anyway"
msgstr "_Installer likevel"
@@ -1420,16 +1376,16 @@ msgstr "_Overse stasjon"
msgid "_Re-initialize drive"
msgstr "_Re-initialiser enheten"
-#: ../partedUtils.py:979
+#: ../partedUtils.py:916
msgid "Initializing"
msgstr "Initierer"
-#: ../partedUtils.py:980
+#: ../partedUtils.py:917
#, python-format
msgid "Please wait while formatting drive %s...\n"
msgstr "Vennligst vent mens stasjon %s formateres...\n"
-#: ../partedUtils.py:1068
+#: ../partedUtils.py:1005
#, python-format
msgid ""
"The partition table on device %s was unreadable. To create new partitions it "
@@ -1449,7 +1405,7 @@ msgstr ""
"\n"
"Ønsker du å initiere denne stasjonen og slette ALLE DATA?"
-#: ../partedUtils.py:1082
+#: ../partedUtils.py:1019
#, python-format
msgid ""
"The partition table on device %s (%s) was unreadable. To create new "
@@ -1470,7 +1426,7 @@ msgstr ""
"\n"
"Ønsker du å initiere denne stasjonen og slette ALLE DATA?"
-#: ../partedUtils.py:1236
+#: ../partedUtils.py:1173
#, python-format
msgid ""
"The drive /dev/%s has more than 15 partitions on it. The SCSI subsystem in "
@@ -1483,11 +1439,11 @@ msgstr ""
"ha mulighet til å gjøre endringer i partisjoneringen av denne enheten eller "
"bruker noen partisjoner etter /dev/%s15 på %s."
-#: ../partedUtils.py:1327
+#: ../partedUtils.py:1264
msgid "No Drives Found"
msgstr "Ingen stasjoner funnet"
-#: ../partedUtils.py:1328
+#: ../partedUtils.py:1265
msgid ""
"An error has occurred - no valid devices were found on which to create new "
"file systems. Please check your hardware for the cause of this problem."
@@ -1595,7 +1551,7 @@ msgstr ""
"Du kan ikke slette denne partisjonen siden den er en utvidet partisjon som "
"inneholder %s"
-#: ../partIntfHelpers.py:189 ../iw/raid_dialog_gui.py:605
+#: ../partIntfHelpers.py:189 ../iw/raid_dialog_gui.py:594
msgid "This partition is holding the data for the hard drive install."
msgstr "Denne partisjonen inneholder data for harddisk-installasjonen."
@@ -1619,7 +1575,7 @@ msgstr "Du er i ferd med å slette alle partisjoner på enheten «/dev/%s»."
#: ../partIntfHelpers.py:244 ../partIntfHelpers.py:535
#: ../iw/lvm_dialog_gui.py:771 ../iw/lvm_dialog_gui.py:1120
-#: ../iw/osbootwidget.py:102 ../iw/partition_gui.py:1380
+#: ../iw/osbootwidget.py:110 ../iw/partition_gui.py:1380
msgid "_Delete"
msgstr "_Slett"
@@ -1687,7 +1643,6 @@ msgid "You need to select at least one hard drive to install %s."
msgstr "Du må velge minst en harddisk du vil installere %s på."
#: ../partIntfHelpers.py:416
-#, fuzzy
msgid ""
"You have chosen to use a pre-existing partition for this installation "
"without formatting it. We recommend that you format this partition to make "
@@ -1695,13 +1650,7 @@ msgid ""
"problems with this installation of Linux. However, if this partition "
"contains files that you need to keep, such as home directories, then "
"continue without formatting this partition."
-msgstr ""
-"Du har valgt å bruke en eksisterende partisjonen for denne installasjonen, "
-"men valgt ikke å formatere den. Det anbefales at du formatterer denne "
-"partisjonen for å unngå at filer fra en tidligere operativsysteminstallasjon "
-"skaper problemer for denne installasjonen. Hvis denne partisjonen inneholder "
-"filer du ønsker å beholde, slik som hjemmekateloger for brukere, bør du "
-"velge å fortsette uten å formattere denne partisjonen."
+msgstr "Du har valgt å bruke en eksisterende partisjonen for denne installasjonen uten å formatere den. Det anbefales at du formaterer denne partisjonen for å unngå at filer fra et tidligere installert operativsystem skaper problemer for denne installasjonen av Linux. Hvis denne partisjonen inneholder filer du ønsker å beholde, slik som hjemmekateloger for brukere, bør du velge å fortsette uten å formattere denne partisjonen."
#: ../partIntfHelpers.py:424
msgid "Format?"
@@ -1811,11 +1760,11 @@ msgstr ""
"Er du sikker på at du vil nullstille partisjonstabellen til opprinnelig "
"tilstand?"
-#: ../partitions.py:84
+#: ../partitions.py:83
msgid "Installation cannot continue."
msgstr "Installasjonen kan ikke fortsette."
-#: ../partitions.py:85
+#: ../partitions.py:84
msgid ""
"The partitioning options you have chosen have already been activated. You "
"can no longer return to the disk editing screen. Would you like to continue "
@@ -1825,60 +1774,25 @@ msgstr ""
"kunne gå tilbake til skjermen for redigering av disker. Vil du fortsette "
"installasjonsprosessen?"
-#: ../partitions.py:113
-#, fuzzy
+#: ../partitions.py:112
msgid "Writing partitioning to disk"
-msgstr "Mi_grer partisjon til:"
+msgstr "Skriver partisjoner til disk"
-#: ../partitions.py:114
+#: ../partitions.py:113
msgid ""
"The partitioning options you have selected will now be written to disk. Any "
"data on deleted or reformatted partitions will be lost"
-msgstr ""
+msgstr "Partisjoneringsvalgene du har gjort vil nå skrives til disk. Data på slettede eller reformaterte partisjoner vil gå tapt."
-#: ../partitions.py:119
-#, fuzzy
+#: ../partitions.py:118
msgid "Go _back"
-msgstr "Til_bake"
+msgstr "Gå til_bake"
-#: ../partitions.py:120
+#: ../partitions.py:119
msgid "_Write changes to disk"
-msgstr ""
-
-#: ../partitions.py:200 ../textw/constants_text.py:50
-#: ../loader2/cdinstall.c:335 ../loader2/driverdisk.c:236
-#: ../loader2/driverdisk.c:267 ../loader2/driverdisk.c:351
-#: ../loader2/driverselect.c:75 ../loader2/driverselect.c:173
-#: ../loader2/driverselect.c:199 ../loader2/hdinstall.c:290
-#: ../loader2/hdinstall.c:344 ../loader2/kbd.c:138 ../loader2/loader.c:415
-#: ../loader2/loader.c:431 ../loader2/loader.c:1154 ../loader2/loader.c:1176
-#: ../loader2/net.c:281 ../loader2/net.c:324 ../loader2/net.c:754
-#: ../loader2/net.c:1098 ../loader2/net.c:1869 ../loader2/nfsinstall.c:67
-#: ../loader2/urls.c:294 ../loader2/urls.c:411
-msgid "Back"
-msgstr "Tilbake"
-
-#: ../partitions.py:200 ../rescue.py:305 ../iw/partition_gui.py:572
-#: ../textw/network_text.py:60 ../loader2/cdinstall.c:117
-#: ../loader2/cdinstall.c:125 ../loader2/driverdisk.c:440
-msgid "Continue"
-msgstr "Fortsett"
-
-#: ../partitions.py:204
-#, fuzzy
-msgid "Confirm"
-msgstr "Bekreft:"
-
-#: ../partitions.py:205
-#, python-format
-msgid ""
-"Are you sure you want to skip entering a passphrase for device %s?\n"
-"\n"
-"If you skip this step the device's contents will not be available during "
-"installation."
-msgstr ""
+msgstr "S_kriver endringer til disk"
-#: ../partitions.py:1019
+#: ../partitions.py:919
#, python-format
msgid ""
"You have not defined a root partition (/), which is required for "
@@ -1887,7 +1801,7 @@ msgstr ""
"Du har ikke definert en rot-partisjon (/). Dette må gjøres før "
"installasjonen av %s kan fortsette."
-#: ../partitions.py:1024
+#: ../partitions.py:924
#, python-format
msgid ""
"Your root partition is less than 250 megabytes which is usually too small to "
@@ -1896,12 +1810,12 @@ msgstr ""
"Din rot-partisjon er mindre enn 250 megabyte og dette er vanligvis for lite "
"for å installere %s."
-#: ../partitions.py:1057 ../partitions.py:1077
+#: ../partitions.py:957 ../partitions.py:977
msgid ""
"You must create a /boot/efi partition of type FAT and a size of 50 megabytes."
msgstr "Du må lage en /boot/efi-partisjon av type FAT og med størrelse 50 MB."
-#: ../partitions.py:1070
+#: ../partitions.py:970
msgid ""
"Your boot partition isn't on one of the first four partitions and thus won't "
"be bootable."
@@ -1909,15 +1823,15 @@ msgstr ""
"Din oppstartspartisjon er ikke blant de fire første partisjonene og vil "
"derfor ikke være startbar."
-#: ../partitions.py:1097
+#: ../partitions.py:997
msgid "You must create an Apple Bootstrap partition."
msgstr "Du må opprette en Apple-oppstartspartisjon."
-#: ../partitions.py:1119
+#: ../partitions.py:1019
msgid "You must create a PPC PReP Boot partition."
msgstr "Du må opprette en PReP-oppstartspartisjon for PPC."
-#: ../partitions.py:1127 ../partitions.py:1138
+#: ../partitions.py:1027 ../partitions.py:1038
#, python-format
msgid ""
"Your %s partition is less than %s megabytes which is lower than recommended "
@@ -1926,14 +1840,14 @@ msgstr ""
"Din %s-partisjon er mindre enn %s megabyte og dette er lavere enn anbefalt "
"for en vanlig installasjon av %s."
-#: ../partitions.py:1172
+#: ../partitions.py:1072
msgid ""
"Installing on a USB device. This may or may not produce a working system."
msgstr ""
"Installerer på en USB-enhet. Det er ikke sikkert at dette gir et fungerende "
"system."
-#: ../partitions.py:1175
+#: ../partitions.py:1075
msgid ""
"Installing on a FireWire device. This may or may not produce a working "
"system."
@@ -1941,30 +1855,28 @@ msgstr ""
"Installerer på en FireWire-enhet. Det er ikke sikkert at dette gir et "
"fungerende system."
-#: ../partitions.py:1185
+#: ../partitions.py:1085
msgid "Bootable partitions can only be on RAID1 devices."
msgstr "Oppstartbare partisjoner kan kun plasseres på RAID1-enheter."
-#: ../partitions.py:1190
+#: ../partitions.py:1090
msgid "Bootable partitions cannot be on a logical volume."
msgstr "Oppstartbare partisjoner kan ikke ligge på et logisk volum."
-#: ../partitions.py:1196
-#, fuzzy
+#: ../partitions.py:1096
msgid "Bootable partitions cannot be on a RAID device."
-msgstr "Oppstartbare partisjoner kan kun plasseres på RAID1-enheter."
+msgstr "Oppstartbare partisjoner kan ikke plasseres på RAID-enheter."
-#: ../partitions.py:1203
-#, fuzzy, python-format
+#: ../partitions.py:1103
+#, python-format
msgid "Bootable partitions cannot be on an %s filesystem."
-msgstr "Oppstartbare partisjoner kan ikke ligge på et logisk volum."
+msgstr "Oppstartbare partisjoner kan ikke ligge på et filsystem av type %s."
-#: ../partitions.py:1207
-#, fuzzy
+#: ../partitions.py:1107
msgid "Bootable partitions cannot be on an encrypted block device"
-msgstr "Oppstartbare partisjoner kan ikke ligge på et logisk volum."
+msgstr "Oppstartbare partisjoner kan ikke ligge på en kryptert blokkenhet."
-#: ../partitions.py:1213
+#: ../partitions.py:1113
msgid ""
"You have not specified a swap partition. Although not strictly required in "
"all cases, it will significantly improve performance for most installations."
@@ -1973,7 +1885,7 @@ msgstr ""
"krav om dette i alle tilfeller, så vil det øke ytelsen for de fleste "
"installasjoner."
-#: ../partitions.py:1220
+#: ../partitions.py:1120
#, python-format
msgid ""
"You have specified more than 32 swap devices. The kernel for %s only "
@@ -1982,7 +1894,7 @@ msgstr ""
"Du har spesifisert mer en 32 swap-enheter. Kjernen for %s støtter kun 32 "
"swap-enheter."
-#: ../partitions.py:1231
+#: ../partitions.py:1131
#, python-format
msgid ""
"You have allocated less swap space (%dM) than available RAM (%dM) on your "
@@ -1991,22 +1903,22 @@ msgstr ""
"Du har allokert mindre swap-område (%dM) enn tilgjengelig RAM (%dM) i ditt "
"system. Dette kan ha negativ innvirkning på ytelsen."
-#: ../partitions.py:1526
+#: ../partitions.py:1426
msgid "the partition in use by the installer."
msgstr "partisjonen er i bruk av installasjonsprogrammet."
-#: ../partitions.py:1529
+#: ../partitions.py:1429
msgid "a partition which is a member of a RAID array."
msgstr "en partisjon som er medlem av et RAID-array."
-#: ../partitions.py:1532
+#: ../partitions.py:1432
msgid "a partition which is a member of a LVM Volume Group."
msgstr "en partisjon som er medlem av en LVM-volumgruppe."
#: ../partRequests.py:273
-#, fuzzy, python-format
+#, python-format
msgid "The mount point %s must be formatted during live CD installs."
-msgstr "Dette monteringspunktet må være på et linux-filsystem."
+msgstr "Monteringspunkt %s må være formatert under installasjon fra live-CD."
#: ../partRequests.py:278
#, python-format
@@ -2033,7 +1945,7 @@ msgid ""
"The mount point \"%s\" is already in use, please choose a different mount "
"point."
msgstr ""
-"Monteringspunktet «%s» er allerede i bruk. Velg et annet monteringspunkt."
+"Monteringspunktet «%s» er allerede i bruk. Velg et annet monteringspunkt."
#: ../partRequests.py:325
#, python-format
@@ -2092,40 +2004,40 @@ msgstr ""
"Størrelse på logisk volum må være større enn volumgruppens fysiske extent-"
"størrelse"
-#: ../rescue.py:157
+#: ../rescue.py:151
msgid "Starting Interface"
msgstr "Starter grensesnitt"
-#: ../rescue.py:158
+#: ../rescue.py:152
#, python-format
msgid "Attempting to start %s"
msgstr "Forsøker å starte %s"
-#: ../rescue.py:200
+#: ../rescue.py:194
msgid "When finished please exit from the shell and your system will reboot."
-msgstr "Når ferdig, avslutt skallet for å starte systemet på nytt."
+msgstr "Avslutt skallet når du er ferdig for å starte systemet på nytt."
-#: ../rescue.py:226
+#: ../rescue.py:220
msgid "Setup Networking"
msgstr "Oppsett av nettverk"
-#: ../rescue.py:227
+#: ../rescue.py:221
msgid "Do you want to start the network interfaces on this system?"
msgstr "Ønsker du å starte nettverksgrensesnittene på dette systemet?"
-#: ../rescue.py:267 ../text.py:694
+#: ../rescue.py:261 ../text.py:645
msgid "Cancelled"
msgstr "Avbrutt"
-#: ../rescue.py:268 ../text.py:695
+#: ../rescue.py:262 ../text.py:646
msgid "I can't go to the previous step from here. You will have to try again."
msgstr "Kan ikke gå tilbake til forrige steg herfra. Du må forsøke igjen."
-#: ../rescue.py:294 ../rescue.py:361 ../rescue.py:369 ../rescue.py:447
+#: ../rescue.py:288 ../rescue.py:355 ../rescue.py:363 ../rescue.py:444
msgid "Rescue"
msgstr "Redning"
-#: ../rescue.py:295
+#: ../rescue.py:289
#, python-format
msgid ""
"The rescue environment will now attempt to find your Linux installation and "
@@ -2147,23 +2059,29 @@ msgstr ""
"dette steget bli utelatt og du vil gå direkte til et kommandoskall.\n"
"\n"
-#: ../rescue.py:305 ../rescue.py:310
+#: ../rescue.py:299 ../iw/partition_gui.py:572 ../textw/network_text.py:60
+#: ../loader2/cdinstall.c:117 ../loader2/cdinstall.c:125
+#: ../loader2/driverdisk.c:440
+msgid "Continue"
+msgstr "Fortsett"
+
+#: ../rescue.py:299 ../rescue.py:304
msgid "Read-Only"
msgstr "Kun lesbart"
-#: ../rescue.py:336
+#: ../rescue.py:330
msgid "System to Rescue"
msgstr "System som skal reddes"
-#: ../rescue.py:337
+#: ../rescue.py:331
msgid "What partition holds the root partition of your installation?"
msgstr "Hvilken partisjon inneholder rotpartisjonen til din installasjon?"
-#: ../rescue.py:339 ../rescue.py:343 ../text.py:668 ../text.py:670
+#: ../rescue.py:333 ../rescue.py:337 ../text.py:619 ../text.py:621
msgid "Exit"
msgstr "Avslutt"
-#: ../rescue.py:362
+#: ../rescue.py:356
msgid ""
"Your system had dirty file systems which you chose not to mount. Press "
"return to get a shell from which you can fsck and mount your partitions. "
@@ -2174,7 +2092,7 @@ msgstr ""
"kjøre filsystemsjekk og montere dine partisjoner. Systemet vil starte på "
"nytt når du avslutter skallet."
-#: ../rescue.py:370
+#: ../rescue.py:364
#, python-format
msgid ""
"Your system has been mounted under %s.\n"
@@ -2188,14 +2106,14 @@ msgid ""
msgstr ""
"Ditt system ble montert under %s.\n"
"\n"
-"Trykk <Linjeskift> for å få et skall. Hvis du vil gjøre ditt system til rot-"
+"Trykk <Linjeskift> for å starte et skall. Hvis du vil gjøre ditt system til rot-"
"miljøet, kjør kommandoen:\n"
"\n"
"chroot %s\n"
"\n"
"Systemet vil starte på nytt automatisk når du avslutter skallet."
-#: ../rescue.py:448
+#: ../rescue.py:445
#, python-format
msgid ""
"An error occurred trying to mount some or all of your system. Some of it may "
@@ -2210,11 +2128,11 @@ msgstr ""
"Trykk <Linjeskift> for å få et skall. Systemet vil starte på nytt automatisk "
"når du avslutter skallet."
-#: ../rescue.py:454
+#: ../rescue.py:451
msgid "Rescue Mode"
msgstr "Redningsmodus"
-#: ../rescue.py:455
+#: ../rescue.py:452
msgid ""
"You don't have any Linux partitions. Press return to get a shell. The system "
"will reboot automatically when you exit from the shell."
@@ -2222,7 +2140,7 @@ msgstr ""
"Du har ingen Linux-partisjoner. Trykk <Enter> for å gå til et skall. "
"Systemet vil starte på nytt når du avslutter skallet."
-#: ../rescue.py:468
+#: ../rescue.py:465
#, python-format
msgid "Your system is mounted under the %s directory."
msgstr "Systemet er montert under katalogen %s."
@@ -2233,12 +2151,11 @@ msgstr "Lagre"
#: ../text.py:189
msgid "Save to Disk"
-msgstr ""
+msgstr "Lagre til disk"
#: ../text.py:190
-#, fuzzy
msgid "Save to Remote"
-msgstr "Lagre til _ekstern"
+msgstr "Lagre til ekstern"
#: ../text.py:204
msgid "Host"
@@ -2256,55 +2173,42 @@ msgstr "Brukernavn"
msgid "Password"
msgstr "Passord"
-#: ../text.py:282 tmp/lukspassphrase.glade.h:5
-msgid "Passphrase"
-msgstr ""
-
-#: ../text.py:290 tmp/lukspassphrase.glade.h:6
-msgid "This is a global passphrase"
-msgstr ""
-
-#: ../text.py:346
+#: ../text.py:307
msgid "Help not available"
msgstr "Hjelp ikke tilgjengelig"
-#: ../text.py:347
+#: ../text.py:308
msgid "No help is available for this step of the install."
msgstr "Ingen hjelp tilgjengelig for denne delen av installeringen."
-#: ../text.py:445
-#, fuzzy
-msgid "Repository editing is not available in text mode."
-msgstr "Grafisk installasjon er ikke tilgjengelig... Starter i tekstmodus."
-
-#: ../text.py:470
+#: ../text.py:421
#, python-format
msgid "Please enter your %(instkey)s"
msgstr "Vennligst oppgi ditt %(instkey)s"
-#: ../text.py:487 tmp/instkey.glade.h:6
+#: ../text.py:438 tmp/instkey.glade.h:6
#, no-c-format, python-format
msgid "Skip entering %(instkey)s"
msgstr "Hopp over å angi %(instkey)s"
-#: ../text.py:563 ../loader2/lang.c:63
-#, fuzzy, c-format, python-format
+#: ../text.py:514 ../loader2/lang.c:63
+#, c-format, python-format
msgid "Welcome to %s for %s"
-msgstr "Velkommen til %s"
+msgstr "Velkommen til %s for %s"
-#: ../text.py:565
+#: ../text.py:516
#, python-format
msgid "Welcome to %s"
msgstr "Velkommen til %s"
-#: ../text.py:568
+#: ../text.py:519
msgid ""
" <F1> for help | <Tab> between elements | <Space> selects | <F12> next screen"
msgstr ""
" <F1> for hjelp | <Tab> mellom elementer | <Mellomrom> velger | <F12> neste "
"skjerm"
-#: ../text.py:570
+#: ../text.py:521
msgid ""
" <Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next "
"screen"
@@ -2325,9 +2229,9 @@ msgid ""
msgstr ""
#: ../upgrade.py:81
-#, fuzzy, python-format
+#, python-format
msgid "Would you like to upgrade the installed system to the %s architecture?"
-msgstr "Hvordan ønsker du å forberede filsystemet på denne partisjonen?"
+msgstr "Vil du oppgradere installert system til %s-arkitektur?"
#: ../upgrade.py:98
msgid ""
@@ -2342,11 +2246,11 @@ msgstr ""
msgid "Would you like to continue with the upgrade?"
msgstr "Vil du fortsette med oppgradering?"
-#: ../upgrade.py:200 ../upgrade.py:208
+#: ../upgrade.py:193 ../upgrade.py:201
msgid "Dirty File Systems"
msgstr "Skitne filsystemer"
-#: ../upgrade.py:201
+#: ../upgrade.py:194
#, python-format
msgid ""
"The following file systems for your Linux system were not unmounted "
@@ -2359,7 +2263,7 @@ msgstr ""
"sjekk, og steng ned på riktig måte for å oppgradere.\n"
"%s"
-#: ../upgrade.py:209
+#: ../upgrade.py:202
#, python-format
msgid ""
"The following file systems for your Linux system were not unmounted "
@@ -2370,11 +2274,11 @@ msgstr ""
"montere dem likevel?\n"
"%s"
-#: ../upgrade.py:350 ../upgrade.py:356
+#: ../upgrade.py:339 ../upgrade.py:345
msgid "Mount failed"
msgstr "Montering feilet"
-#: ../upgrade.py:351
+#: ../upgrade.py:340
msgid ""
"One or more of the file systems listed in the /etc/fstab on your Linux "
"system cannot be mounted. Please fix this problem and try to upgrade again."
@@ -2383,7 +2287,7 @@ msgstr ""
"system kan ikke monteres. Rett opp dette problemet og forsøk å oppgradere "
"igjen."
-#: ../upgrade.py:357
+#: ../upgrade.py:346
msgid ""
"One or more of the file systems listed in the /etc/fstab of your Linux "
"system are inconsistent and cannot be mounted. Please fix this problem and "
@@ -2393,7 +2297,7 @@ msgstr ""
"system er inkonsistent kan ikke monteres. Rett opp dette problemet og forsøk "
"å oppgradere igjen."
-#: ../upgrade.py:374
+#: ../upgrade.py:363
msgid ""
"The following files are absolute symbolic links, which we do not support "
"during an upgrade. Please change them to relative symbolic links and restart "
@@ -2405,11 +2309,11 @@ msgstr ""
"oppgraderingen på nytt.\n"
"\n"
-#: ../upgrade.py:380
+#: ../upgrade.py:369
msgid "Absolute Symlinks"
msgstr "Absolutte symbolske lenker"
-#: ../upgrade.py:391
+#: ../upgrade.py:380
msgid ""
"The following are directories which should instead be symbolic links, which "
"will cause problems with the upgrade. Please return them to their original "
@@ -2421,11 +2325,11 @@ msgstr ""
"og starte oppgraderingen på nytt.\n"
"\n"
-#: ../upgrade.py:397
+#: ../upgrade.py:386
msgid "Invalid Directories"
msgstr "Ugyldige kataloger"
-#: ../upgrade.py:404
+#: ../upgrade.py:393
#, python-format
msgid "%s not found"
msgstr "%s ikke funnet"
@@ -2454,9 +2358,9 @@ msgid "Will try to connect again in 15 seconds..."
msgstr "Prøver å koble til igjen om 15 sekunder..."
#: ../vnc.py:197
-#, fuzzy, python-format
+#, python-format
msgid "Giving up attempting to connect after %d tries!\n"
-msgstr "Gir opp forsøk på å koble til etter 50 forsøk!\n"
+msgstr "Gir opp forsøk på å koble til etter %d forsøk!\n"
#: ../vnc.py:206
#, python-format
@@ -2489,7 +2393,6 @@ msgid ""
msgstr ""
#: ../vnc.py:254
-#, fuzzy
msgid ""
"\n"
"\n"
@@ -2501,7 +2404,7 @@ msgstr ""
"\n"
"\n"
"ADVARSEL!!! VNC-tjeneren kjører UTEN PASSORD!\n"
-"Du kan bruke vncpassword=<passord> some oppstartsflagg\n"
+"Du kan bruke self.password=<passord> some oppstartsflagg\n"
"hvis du ønsker å sikre tjeneren.\n"
"\n"
@@ -2511,16 +2414,15 @@ msgid ""
"\n"
"You chose to execute vnc with a password. \n"
"\n"
-msgstr ""
+msgstr "\n\nDu har valgt å kjøre vnc med et passord. \n\n"
#: ../vnc.py:260
-#, fuzzy
msgid ""
"\n"
"\n"
"Unknown Error. Aborting. \n"
"\n"
-msgstr "Ukjent feil"
+msgstr "\n\nUkjent feil. Avbryter.\n\n"
#: ../vnc.py:285 ../vnc.py:374
msgid "VNC Configuration"
@@ -2540,23 +2442,23 @@ msgstr ""
"overvåke din installasjon. Vennligst oppgi et passord som skal brukes for "
"installasjonen."
-#: ../vnc.py:298 ../vnc.py:389 ../textw/userauth_text.py:44
+#: ../vnc.py:298 ../vnc.py:389 ../textw/userauth_text.py:49
msgid "Password:"
msgstr "Passord:"
-#: ../vnc.py:299 ../vnc.py:390 ../textw/userauth_text.py:46
+#: ../vnc.py:299 ../vnc.py:390 ../textw/userauth_text.py:50
msgid "Password (confirm):"
msgstr "Passord (bekreft):"
-#: ../vnc.py:317 ../vnc.py:412 ../textw/userauth_text.py:67
+#: ../vnc.py:317 ../vnc.py:412 ../textw/userauth_text.py:71
msgid "Password Mismatch"
msgstr "Passordene er ikke like"
-#: ../vnc.py:318 ../vnc.py:413 ../textw/userauth_text.py:68
+#: ../vnc.py:318 ../vnc.py:413 ../textw/userauth_text.py:72
msgid "The passwords you entered were different. Please try again."
-msgstr "Passordene du skrev inn var forskjellige. Vennligst forsøk igjen."
+msgstr "Passordene du skrev inn var forskjellige. Vennligst forsøk igjen."
-#: ../vnc.py:323 ../vnc.py:418 ../textw/userauth_text.py:63
+#: ../vnc.py:323 ../vnc.py:418 ../textw/userauth_text.py:66
msgid "Password Length"
msgstr "Passordlengde"
@@ -2586,70 +2488,67 @@ msgstr "Bruker tekstmodus"
msgid "Start VNC"
msgstr "Start VNC"
-#: ../yuminstall.py:71
+#: ../yuminstall.py:70
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: ../yuminstall.py:74
+#: ../yuminstall.py:73
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: ../yuminstall.py:77
+#: ../yuminstall.py:76
#, python-format
msgid "%s Byte"
msgstr "%s byte"
-#: ../yuminstall.py:79
+#: ../yuminstall.py:78
#, python-format
msgid "%s Bytes"
msgstr "%s bytes"
-#: ../yuminstall.py:127
+#: ../yuminstall.py:126
msgid "Processing"
msgstr "Arbeider"
-#: ../yuminstall.py:128
+#: ../yuminstall.py:127
msgid "Preparing transaction from installation source..."
msgstr "Forbereder transaksjon fra installasjonskilden..."
-#: ../yuminstall.py:158
+#: ../yuminstall.py:157
#, python-format
msgid "<b>Installing %s</b> (%s)\n"
msgstr "<b>Installerer %s</b> (%s)\n"
-#: ../yuminstall.py:210
+#: ../yuminstall.py:209
#, python-format
msgid "%s of %s packages completed"
msgstr "%s av %s pakker er fullført"
-#: ../yuminstall.py:222
+#: ../yuminstall.py:221
msgid "Finishing upgrade"
msgstr "Fullfører oppgraderingen"
-#: ../yuminstall.py:223
+#: ../yuminstall.py:222
msgid "Finishing upgrade process. This may take a little while..."
msgstr "Fullfører oppgraderingsprosessen. Dette kan ta en stund..."
-#: ../yuminstall.py:327
+#: ../yuminstall.py:326
msgid "Copying File"
msgstr "Kopierer fil"
-#: ../yuminstall.py:328
+#: ../yuminstall.py:327
msgid "Transferring install image to hard drive..."
msgstr "Overfører installasjonsbildet til harddisken..."
-#: ../yuminstall.py:339
-#, fuzzy
+#: ../yuminstall.py:338
msgid ""
"An error occurred transferring the install image to your hard drive. This "
"is probably due to bad media."
-msgstr ""
-"En feil oppsto under overføring av installasjonsfilen til din harddisk. Du "
-"har sannsynligvis sluppet opp for diskplass."
+msgstr "En feil oppsto under overføring av installasjonsfilen til din harddisk. Det er sannsynlig at mediet er dårlig."
-#: ../yuminstall.py:343
+#: ../yuminstall.py:342
msgid ""
"An error occurred transferring the install image to your hard drive. You are "
"probably out of disk space."
@@ -2657,39 +2556,39 @@ msgstr ""
"En feil oppsto under overføring av installasjonsfilen til din harddisk. Du "
"har sannsynligvis sluppet opp for diskplass."
-#: ../yuminstall.py:381
+#: ../yuminstall.py:380
msgid "Change Disc"
msgstr "Bytt disk"
-#: ../yuminstall.py:382
+#: ../yuminstall.py:381
#, python-format
msgid "Please insert %s disc %d to continue."
msgstr "Sett inn %s CD %d for å fortsette."
-#: ../yuminstall.py:396
+#: ../yuminstall.py:395
msgid "Wrong Disc"
msgstr "Feil disk"
-#: ../yuminstall.py:397
+#: ../yuminstall.py:396
#, python-format
msgid "That's not the correct %s disc."
msgstr "Dette er ikke riktig disk for %s."
-#: ../yuminstall.py:403
+#: ../yuminstall.py:402
msgid "Unable to access the disc."
msgstr "Kan ikke aksessere disken."
-#: ../yuminstall.py:533 ../yuminstall.py:535
+#: ../yuminstall.py:532 ../yuminstall.py:534 ../yuminstall.py:902
+#: ../yuminstall.py:904 ../yuminstall.py:1136 ../yuminstall.py:1138
msgid "Re_boot"
msgstr "St_art på nytt"
-#: ../yuminstall.py:533
-#, fuzzy
+#: ../yuminstall.py:532
msgid "_Eject"
-msgstr "Løs ut disk"
+msgstr "_Løs ut"
-#: ../yuminstall.py:539
-#, fuzzy, python-format
+#: ../yuminstall.py:538
+#, python-format
msgid ""
"The file %s cannot be opened. This is due to a missing file, a corrupt "
"package or corrupt media. Please verify your installation source.\n"
@@ -2698,117 +2597,104 @@ msgid ""
"likely require reinstallation.\n"
"\n"
msgstr ""
-"Filen %s kan ikke åpnes. Dette grunnet at filen mangler eller at pakken er "
-"korrupt. Vennligst sjekk at installasjonstreet inneholder alle nødvendige "
-"pakker.\n"
+"Filen %s kan ikke åpnes. Årsaken er at filen mangler, pakken er korrupt eller mediet er dårlig. Vennligst sjekk kilden for installasjonen.\n"
"\n"
-"Hvis du avslutter, vil systemet ditt være i en inkonsistent tilstand som "
-"sannsynligvis vil kreve at det installeres på nytt.\n"
+"Hvis du avslutter, vil systemet ditt være i en inkonsistent tilstand som sannsynligvis vil kreve at det installeres på nytt.\n"
"\n"
-#: ../yuminstall.py:579
-#, fuzzy
+#: ../yuminstall.py:575
msgid "Retrying"
-msgstr "Henter"
+msgstr "Prøver på nytt"
-#: ../yuminstall.py:579
+#: ../yuminstall.py:575
msgid "Retrying package download..."
-msgstr ""
-
-#: ../yuminstall.py:641
-#, fuzzy, python-format
-msgid ""
-"There was an error running your transaction for the following reason: %s\n"
-msgstr ""
-"Det oppsto en feil under kjøring av transaksjonen med følgende årsak: %s"
+msgstr "Forsøker å laste ned pakke på nytt..."
-#: ../yuminstall.py:674 ../yuminstall.py:675
+#: ../yuminstall.py:655 ../yuminstall.py:656
msgid "file conflicts"
msgstr "filen er i konflikt"
-#: ../yuminstall.py:676
+#: ../yuminstall.py:657
msgid "older package(s)"
msgstr "eldre pakker"
-#: ../yuminstall.py:677
+#: ../yuminstall.py:658
msgid "insufficient disk space"
msgstr "ikke nok diskplass"
-#: ../yuminstall.py:678
+#: ../yuminstall.py:659
msgid "insufficient disk inodes"
msgstr "ikke nok inoder på disken"
-#: ../yuminstall.py:679
+#: ../yuminstall.py:660
msgid "package conflicts"
msgstr " konflikt mellom pakker"
-#: ../yuminstall.py:680
+#: ../yuminstall.py:661
msgid "package already installed"
msgstr "pakken er allerede installert"
-#: ../yuminstall.py:681
+#: ../yuminstall.py:662
msgid "required package"
msgstr "nødvendig pakke"
-#: ../yuminstall.py:682
+#: ../yuminstall.py:663
msgid "package for incorrect arch"
msgstr "pakke for ugyldig arkitektur"
-#: ../yuminstall.py:683
+#: ../yuminstall.py:664
msgid "package for incorrect os"
msgstr "pakke for feil OS"
-#: ../yuminstall.py:697
+#: ../yuminstall.py:678
msgid "You need more space on the following file systems:\n"
msgstr "Du trenger mer plass på følgende filsystemer:\n"
-#: ../yuminstall.py:710
-#, fuzzy, python-format
+#: ../yuminstall.py:691
+#, python-format
msgid ""
"There were file conflicts when checking the packages to be installed:\n"
"%s\n"
-msgstr "Hvilken type media inneholder pakkene som skal installeres?"
+msgstr ""
+"Filkonflikter ble funnet under sjekk av pakkene som skal installeres:\n"
+"%s\n"
-#: ../yuminstall.py:713
-#, fuzzy, python-format
+#: ../yuminstall.py:694
+#, python-format
msgid ""
"There was an error running your transaction for the following reason(s): %"
"s.\n"
-msgstr ""
-"Det oppsto en feil under kjøring av transaksjonen med følgende årsak: %s"
+msgstr "Det oppsto en feil under kjøring av transaksjonen av følgende årsak(er): %s\n"
-#: ../yuminstall.py:717
-#, fuzzy
+#: ../yuminstall.py:698
msgid "Error Running Transaction"
msgstr "Feil under kjøring av transaksjon"
-#: ../yuminstall.py:722
+#: ../yuminstall.py:703
msgid "Error running transaction"
msgstr "Feil under kjøring av transaksjon"
-#: ../yuminstall.py:879
+#: ../yuminstall.py:844
msgid "Retrieving installation information..."
msgstr "Henter informasjon om installasjonen..."
-#: ../yuminstall.py:881
+#: ../yuminstall.py:846
#, python-format
msgid "Retrieving installation information for %s..."
msgstr "Henter installasjonsinformasjon for %s..."
-#: ../yuminstall.py:905 ../yuminstall.py:1179
-#, fuzzy, python-format
+#: ../yuminstall.py:872 ../yuminstall.py:1144
+#, python-format
msgid ""
"Unable to read package metadata. This may be due to a missing repodata "
"directory. Please ensure that your install tree has been correctly "
-"generated.\n"
-"\n"
-"%s"
+"generated. %s"
msgstr ""
"Kan ikke lese metadata for pakken. Dette kan være forårsaket av en menglende "
"repodata-katalog. Vennligst sjekk at installasjonstreet er generert på en "
"korrekt måte. %s"
-#: ../yuminstall.py:946
+#: ../yuminstall.py:909
msgid ""
"Unable to read group information from repositories. This is a problem with "
"the generation of your install tree."
@@ -2816,11 +2702,11 @@ msgstr ""
"Kan ikke lese gruppeinformasjonen fra lageret. Det er et problem med "
"genereringen av ditt installasjonstre."
-#: ../yuminstall.py:979
+#: ../yuminstall.py:942
msgid "Uncategorized"
msgstr "Ikke kategorisert"
-#: ../yuminstall.py:1204
+#: ../yuminstall.py:1167
#, python-format
msgid ""
"Your selected packages require %d MB of free space for installation, but you "
@@ -2831,15 +2717,15 @@ msgstr ""
"ikke nok ledig plass. Du kan endre dine valg eller avslutte "
"installasjonsprogrammet."
-#: ../yuminstall.py:1223
+#: ../yuminstall.py:1186
msgid "Reboot?"
-msgstr "Start på nytt?"
+msgstr "Start på nytt?"
-#: ../yuminstall.py:1224
+#: ../yuminstall.py:1187
msgid "The system will be rebooted now."
msgstr "Systemet vil nå startes på nytt."
-#: ../yuminstall.py:1388
+#: ../yuminstall.py:1351
#, python-format
msgid ""
"You appear to be upgrading from a system which is too old to upgrade to this "
@@ -2849,50 +2735,47 @@ msgstr ""
"oppgradere til denne versjonen av %s. Er du sikker på at du ønsker å "
"fortsette oppgraderingen?"
-#: ../yuminstall.py:1415
-#, fuzzy, python-format
+#: ../yuminstall.py:1378
+#, python-format
msgid ""
"The arch of the release of %s you are upgrading to appears to be %s which "
"does not match your previously installed arch of %s. This is likely to not "
"succeed. Are you sure you wish to continue the upgrade process?"
-msgstr ""
-"Det ser ut som om systemet du oppgraderer fra er for gammelt til å "
-"oppgradere til denne versjonen av %s. Er du sikker på at du ønsker å "
-"fortsette oppgraderingen?"
+msgstr "Arkitekturen for utgaven av %s du oppgraderer til ser ut til å være %s og denne er ikke lik din tidligere arkitektur %s. Det er meget sannsynlig at dette ikke vil fungere. Er du sikker på at du ønsker å fortsette oppgraderingen?"
-#: ../yuminstall.py:1448
+#: ../yuminstall.py:1411
msgid "Install Starting"
msgstr "Starter installasjon"
-#: ../yuminstall.py:1449
+#: ../yuminstall.py:1412
msgid "Starting install process. This may take several minutes..."
msgstr "Starter installasjon. Dette kan ta flere minutter..."
-#: ../yuminstall.py:1468
+#: ../yuminstall.py:1431
msgid "Post Upgrade"
msgstr "Etter oppgradering"
-#: ../yuminstall.py:1469
+#: ../yuminstall.py:1432
msgid "Performing post upgrade configuration..."
msgstr "Utfører konfigurasjon etter oppgradering..."
-#: ../yuminstall.py:1471
+#: ../yuminstall.py:1434
msgid "Post Install"
msgstr "Etter-installasjon"
-#: ../yuminstall.py:1472
+#: ../yuminstall.py:1435
msgid "Performing post install configuration..."
msgstr "Utfører konfigurasjon etter installering..."
-#: ../yuminstall.py:1690
+#: ../yuminstall.py:1653
msgid "Installation Progress"
msgstr "Fremdrift for installasjonen"
-#: ../yuminstall.py:1725
+#: ../yuminstall.py:1688
msgid "Dependency Check"
msgstr "Sjekk av avhengigheter"
-#: ../yuminstall.py:1726
+#: ../yuminstall.py:1689
msgid "Checking dependencies in packages selected for installation..."
msgstr "Sjekker avhengigheter i pakker valgt for installasjon..."
@@ -2908,27 +2791,20 @@ msgstr "Worldwide port er ugyldig eller ble ikke oppgitt."
msgid "You have not specified a FCP LUN or the number is invalid."
msgstr "FC-LUN er ugyldig eller ble ikke oppgitt."
-#: ../iw/account_gui.py:48
-#, fuzzy
-msgid "Root _Password:"
-msgstr "Passord for root: "
-
-#: ../iw/account_gui.py:50
-#, fuzzy
-msgid "_Confirm:"
-msgstr "_Bekreft: "
+#: ../iw/account_gui.py:32
+msgid "<b>Caps Lock is on.</b>"
+msgstr "<b>Caps Lock er aktiv.</b>"
-#: ../iw/account_gui.py:74
-#, fuzzy
-msgid "Caps Lock is on."
-msgstr "<b>Caps Lock er på.</b>"
+#: ../iw/account_gui.py:39
+msgid "Set Root Password"
+msgstr "Sett passord for root"
-#: ../iw/account_gui.py:84 ../iw/account_gui.py:92 ../iw/account_gui.py:99
-#: ../iw/account_gui.py:119 ../textw/userauth_text.py:71
+#: ../iw/account_gui.py:54 ../iw/account_gui.py:62 ../iw/account_gui.py:69
+#: ../iw/account_gui.py:89 ../textw/userauth_text.py:76
msgid "Error with Password"
msgstr "Feil med passord"
-#: ../iw/account_gui.py:85
+#: ../iw/account_gui.py:55
msgid ""
"You must enter your root password and confirm it by typing it a second time "
"to continue."
@@ -2936,91 +2812,97 @@ msgstr ""
"Du må oppgi ditt root-passord og bekrefte det ved å skrive det inn en gang "
"til for å fortsette."
-#: ../iw/account_gui.py:93
+#: ../iw/account_gui.py:63
msgid "The passwords you entered were different. Please try again."
msgstr "Passordene du skrev inn var forskjellige. Vennligst forsøk igjen."
-#: ../iw/account_gui.py:100
+#: ../iw/account_gui.py:70
msgid "The root password must be at least six characters long."
msgstr "Root-passordet må være minst seks tegn langt."
-#: ../iw/account_gui.py:107 ../textw/userauth_text.py:78
-#, fuzzy
+#: ../iw/account_gui.py:77 ../textw/userauth_text.py:83
msgid "Weak Password"
-msgstr "Passord"
+msgstr "Svakt passord"
-#: ../iw/account_gui.py:108 ../textw/userauth_text.py:79
-#, fuzzy, python-format
+#: ../iw/account_gui.py:78 ../textw/userauth_text.py:84
+#, python-format
msgid ""
"Weak password provided: %s\n"
"\n"
"Would you like to continue with this password?"
-msgstr "Vil du fortsette med oppgradering?"
+msgstr ""
+"Svakt passord oppgitt: %s\n"
+"\n"
+"Vil du fortsette med dette passordet?"
-#: ../iw/account_gui.py:120 ../textw/userauth_text.py:72
+#: ../iw/account_gui.py:90 ../textw/userauth_text.py:77
msgid ""
"Requested password contains non-ASCII characters, which are not allowed."
msgstr "Oppgitt passord inneholder ugyldige tegn. Bruk kun ASCII-tegn."
-#: ../iw/autopart_type.py:94
+#: ../iw/account_gui.py:124
msgid ""
-"No partitions are available to resize. Only physical partitions with "
-"specific filesystems can be resized."
+"The root account is used for administering the system. Enter a password for "
+"the root user."
msgstr ""
+"Root-kontoen brukes for å adminsitrere systemet. Oppgi et passord for denne "
+"brukeren."
-#: ../iw/autopart_type.py:177
+#: ../iw/account_gui.py:139
+msgid "Root _Password: "
+msgstr "Passord for root: "
+
+#: ../iw/account_gui.py:142
+msgid "_Confirm: "
+msgstr "_Bekreft: "
+
+#: ../iw/autopart_type.py:96
msgid "Do you really want to boot from disk which is not used for instalation?"
-msgstr ""
+msgstr "Vil du virkelig starte opp fra en disk som ikke brukes ved installasjonen?"
-#: ../iw/autopart_type.py:258
+#: ../iw/autopart_type.py:177
msgid "Invalid Initiator Name"
msgstr "Ugyldig navn på initiator"
-#: ../iw/autopart_type.py:259
+#: ../iw/autopart_type.py:178
msgid "You must provide an initiator name."
msgstr "Du må oppgi et navn på initiatoren."
-#: ../iw/autopart_type.py:281
+#: ../iw/autopart_type.py:200
msgid "Error with Data"
msgstr "Feil med data"
-#: ../iw/autopart_type.py:401 ../textw/partition_text.py:1516
+#: ../iw/autopart_type.py:320 ../textw/partition_text.py:1516
msgid "Remove all partitions on selected drives and create default layout"
msgstr ""
"Fjern alle partisjoner på valgte stasjoner og opprett forvalgt utforming"
-#: ../iw/autopart_type.py:402 ../textw/partition_text.py:1517
+#: ../iw/autopart_type.py:321 ../textw/partition_text.py:1517
msgid "Remove Linux partitions on selected drives and create default layout"
msgstr ""
"Fjern Linux-partisjoner på valgte stasjoner og opprett forvalgt utforming"
-#: ../iw/autopart_type.py:403
-#, fuzzy
-msgid "Resize existing partition and create default layout in free space"
-msgstr ""
-"Fjern Linux-partisjoner på valgte stasjoner og opprett forvalgt utforming"
-
-#: ../iw/autopart_type.py:404 ../textw/partition_text.py:1518
+#: ../iw/autopart_type.py:322 ../textw/partition_text.py:1518
msgid "Use free space on selected drives and create default layout"
msgstr "Bruk ledig plass på valgte stasjoner og opprett forvalgt utforming"
-#: ../iw/autopart_type.py:405 ../textw/partition_text.py:1519
+#: ../iw/autopart_type.py:323 ../textw/partition_text.py:1519
msgid "Create custom layout"
msgstr "Opprett egendefinert utforming"
-#: ../iw/blpasswidget.py:45
-msgid "_Use a boot loader password"
-msgstr "Br_uk passord for oppstartslaster"
-
-#: ../iw/blpasswidget.py:46
-#, fuzzy
+#: ../iw/blpasswidget.py:41
msgid ""
-"A boot loader password prevents users from changing kernel options, "
-"increasing security."
+"A boot loader password prevents users from changing options passed to the "
+"kernel. For greater system security, it is recommended that you set a "
+"password."
msgstr ""
"Et passord for oppstartslasteren hindrer brukere i å gi tilfeldige flagg til "
"kjernen. For høyest mulig sikkerhet anbefaler vi å sette et passord."
+#: ../iw/blpasswidget.py:46
+msgid "_Use a boot loader password"
+msgstr "Br_uk passord for oppstartslaster"
+
#: ../iw/blpasswidget.py:77
msgid "Change _password"
msgstr "Endre _passord"
@@ -3065,22 +2947,88 @@ msgstr ""
"\n"
"Vil du fortsette med dette passordet?"
+#: ../iw/bootloader_advanced_gui.py:30
+msgid "Advanced Boot Loader Configuration"
+msgstr "Avansert konfigurasjon av oppstartslaster"
+
+#: ../iw/bootloader_advanced_gui.py:45 ../textw/bootloader_text.py:128
+msgid ""
+"If LBA32 is not supported by your system's BIOS, forcing its use can prevent "
+"your machine from booting.\n"
+"\n"
+"Would you like to continue and force LBA32 mode?"
+msgstr ""
+"Tvungen bruk av LBA32 for din oppstartslaster kan medføre at maskinen ikke "
+"kan startes hvis BIOS ikke støtter dette.\n"
+"\n"
+"Vil du fortsette med tvungen bruk av LBA32-modus?"
+
+#: ../iw/bootloader_advanced_gui.py:51
+msgid "Force LBA32"
+msgstr "Bruk LBA32"
+
+#: ../iw/bootloader_advanced_gui.py:72
+msgid "_Force LBA32 (not normally required)"
+msgstr "_Tvungen bruk av LBA32 (ikke vanligvis nødvendig)"
+
+#: ../iw/bootloader_advanced_gui.py:76
+msgid ""
+"If you wish to add default options to the boot command, enter them into the "
+"'General kernel parameters' field."
+msgstr ""
+"Hvis du ønsker å legge til forvalgte flagg til oppstartskommandoen skriver "
+"du dem inn i feltet «Generelle kjerneparametere»."
+
+#: ../iw/bootloader_advanced_gui.py:82
+msgid "_General kernel parameters"
+msgstr "_Generelle parametere for kjernen"
+
#: ../iw/bootloader_main_gui.py:34 ../textw/bootloader_text.py:46
#: ../textw/bootloader_text.py:111 ../textw/bootloader_text.py:168
#: ../textw/bootloader_text.py:286 ../textw/bootloader_text.py:395
msgid "Boot Loader Configuration"
msgstr "Konfigurasjon av oppstartslaster"
-#: ../iw/bootloader_main_gui.py:170 ../iw/bootloader_main_gui.py:175
-#: ../iw/bootloader_main_gui.py:212
-#, fuzzy, python-format
-msgid "_Install boot loader on /dev/%s."
-msgstr "Installerer oppstartslaster..."
+#: ../iw/bootloader_main_gui.py:121
+#, python-format
+msgid "The %s boot loader will be installed on /dev/%s."
+msgstr "Oppstartslasteren %s vil bli installert på /dev/%s."
-#: ../iw/bootloader_main_gui.py:218
-#, fuzzy
-msgid "_Change device"
-msgstr "Bytt disk"
+#: ../iw/bootloader_main_gui.py:127
+msgid "No boot loader will be installed."
+msgstr "Ingen oppstartslaster vil bli installert."
+
+#: ../iw/bootloader_main_gui.py:156
+msgid "Configure advanced boot loader _options"
+msgstr "Konfigurasjon av avanserte alternativer for _oppstartslaster"
+
+#: ../iw/bootlocwidget.py:45
+msgid "Install Boot Loader record on:"
+msgstr "Installer oppstartslaster på:"
+
+#: ../iw/bootlocwidget.py:78
+msgid "_Change Drive Order"
+msgstr "_Endre rekkefølge på stasjonene"
+
+#: ../iw/bootlocwidget.py:90
+msgid "Edit Drive Order"
+msgstr "Rediger rekkefølge på stasjonene"
+
+#: ../iw/bootlocwidget.py:95
+msgid ""
+"Arrange the drives to be in the same order as used by the BIOS. Changing the "
+"drive order may be useful if you have multiple SCSI adapters or both SCSI "
+"and IDE adapters and want to boot from the SCSI device.\n"
+"\n"
+"Changing the drive order will change where the installation program locates "
+"the Master Boot Record (MBR)."
+msgstr ""
+"Plasser stasjonene i samme rekkefølge som brukt av BIOS. Endring av "
+"rekkefølgen for stasjonene kan være nyttig hvis du har flere SCSI-kort eller "
+"både SCSI og IDE-kontrollere og ønsker å starte opp fra SCSI-enheten.\n"
+"\n"
+"Endring av rekkefølgen for stasjonene vil forandre på hvor "
+"installasjonsprogrammet leter etter Master Boot Record (MBR)."
#: ../iw/congrats_gui.py:31
msgid "Congratulations"
@@ -3105,6 +3053,18 @@ msgstr ""
"\n"
"%s%s"
+#: ../iw/driveorderwidget.py:50
+msgid "Drive"
+msgstr "Stasjon"
+
+#: ../iw/driveorderwidget.py:50 ../textw/partition_text.py:1422
+msgid "Size"
+msgstr "Størrelse"
+
+#: ../iw/driveorderwidget.py:50
+msgid "Model"
+msgstr "Modell"
+
#: ../iw/examine_gui.py:35
msgid "Upgrade Examine"
msgstr "Sjekk oppgradering"
@@ -3148,7 +3108,7 @@ msgstr "Ukjent Linux-system"
msgid "Language Selection"
msgstr "Valg av språk"
-#: ../iw/language_gui.py:76 ../textw/language_text.py:45 ../loader2/lang.c:374
+#: ../iw/language_gui.py:73 ../textw/language_text.py:45 ../loader2/lang.c:374
msgid "What language would you like to use during the installation process?"
msgstr "Hvilket språk ønsker du å bruke under installeringen?"
@@ -3188,7 +3148,7 @@ msgstr ""
"Denne endringen vil aktiveres med en gang."
#: ../iw/lvm_dialog_gui.py:142 ../iw/lvm_dialog_gui.py:202
-#: ../iw/network_gui.py:142 ../iw/network_gui.py:146 ../iw/network_gui.py:166
+#: ../iw/network_gui.py:150 ../iw/network_gui.py:154 ../iw/network_gui.py:174
msgid "C_ontinue"
msgstr "F_ortsett"
@@ -3258,24 +3218,24 @@ msgid "Edit Logical Volume"
msgstr "Rediger logisk volum"
#: ../iw/lvm_dialog_gui.py:393 ../iw/partition_dialog_gui.py:322
-#: ../iw/raid_dialog_gui.py:319
+#: ../iw/raid_dialog_gui.py:308
msgid "_Mount Point:"
msgstr "_Monteringspunkt:"
-#: ../iw/lvm_dialog_gui.py:401 ../iw/raid_dialog_gui.py:332
+#: ../iw/lvm_dialog_gui.py:401 ../iw/raid_dialog_gui.py:321
msgid "_File System Type:"
msgstr "_Filsystemtype:"
-#: ../iw/lvm_dialog_gui.py:411 ../iw/raid_dialog_gui.py:342
+#: ../iw/lvm_dialog_gui.py:411 ../iw/raid_dialog_gui.py:331
msgid "Original File System Type:"
msgstr "_Opprinnelig filsystemtype:"
-#: ../iw/lvm_dialog_gui.py:416 ../iw/raid_dialog_gui.py:347
+#: ../iw/lvm_dialog_gui.py:416 ../iw/raid_dialog_gui.py:336
msgid "Unknown"
msgstr "Ukjent"
#: ../iw/lvm_dialog_gui.py:422 ../iw/partition_dialog_gui.py:374
-#: ../iw/raid_dialog_gui.py:353
+#: ../iw/raid_dialog_gui.py:342
msgid "Original File System Label:"
msgstr "Opprinnelig etikett for filsystem:"
@@ -3346,7 +3306,7 @@ msgstr ""
#: ../iw/lvm_dialog_gui.py:651 ../iw/partition_dialog_gui.py:197
#: ../iw/partition_dialog_gui.py:209 ../iw/partition_dialog_gui.py:268
-#: ../iw/raid_dialog_gui.py:246 ../textw/partition_text.py:887
+#: ../iw/raid_dialog_gui.py:235 ../textw/partition_text.py:887
#: ../textw/partition_text.py:908 ../textw/partition_text.py:1081
#: ../textw/partition_text.py:1312
msgid "Error With Request"
@@ -3461,7 +3421,7 @@ msgstr "Ledig plass:"
#: ../iw/lvm_dialog_gui.py:1065
msgid "Total Space:"
-msgstr "Total størrelse:"
+msgstr "Total størrelse:"
#: ../iw/lvm_dialog_gui.py:1094
msgid "Logical Volume Name"
@@ -3477,19 +3437,18 @@ msgstr "Monteringspunkt"
msgid "Size (MB)"
msgstr "Størrelse (MB)"
-#: ../iw/lvm_dialog_gui.py:1114 ../iw/osbootwidget.py:94
+#: ../iw/lvm_dialog_gui.py:1114 ../iw/osbootwidget.py:102
msgid "_Add"
msgstr "_Legg til"
-#: ../iw/lvm_dialog_gui.py:1117 ../iw/network_gui.py:457
-#: ../iw/osbootwidget.py:98 ../iw/partition_gui.py:1379
+#: ../iw/lvm_dialog_gui.py:1117 ../iw/network_gui.py:465
+#: ../iw/osbootwidget.py:106 ../iw/partition_gui.py:1379
msgid "_Edit"
msgstr "R_ediger"
#: ../iw/lvm_dialog_gui.py:1132
-#, fuzzy
msgid "_Logical Volumes"
-msgstr "Logiske volumer"
+msgstr "_Logiske volumer"
#: ../iw/mouse_gui.py:29
msgid "Mouse Configuration"
@@ -3511,7 +3470,7 @@ msgstr "/dev/ttyS2 (COM3 i DOS)"
msgid "/dev/ttyS3 (COM4 under DOS)"
msgstr "/dev/ttyS3 (COM4 i DOS)"
-#: ../iw/mouse_gui.py:95 ../iw/osbootwidget.py:151
+#: ../iw/mouse_gui.py:95 ../iw/osbootwidget.py:163
msgid "_Device"
msgstr "_Enhet"
@@ -3537,14 +3496,14 @@ msgstr ""
"%s"
#: ../iw/netconfig_dialog.py:145 ../iw/netconfig_dialog.py:154
-#: ../iw/network_gui.py:141 ../iw/network_gui.py:145 ../iw/network_gui.py:149
-#: ../iw/network_gui.py:153 ../iw/network_gui.py:161 ../iw/network_gui.py:166
+#: ../iw/network_gui.py:149 ../iw/network_gui.py:153 ../iw/network_gui.py:157
+#: ../iw/network_gui.py:161 ../iw/network_gui.py:169 ../iw/network_gui.py:174
#: ../textw/network_text.py:52 ../textw/network_text.py:57
#: ../textw/network_text.py:63
msgid "Error With Data"
msgstr "Feil med data"
-#: ../iw/netconfig_dialog.py:153 ../iw/network_gui.py:154
+#: ../iw/netconfig_dialog.py:153 ../iw/network_gui.py:162
#: ../textw/network_text.py:53
#, python-format
msgid "A value is required for the field %s."
@@ -3574,7 +3533,7 @@ msgid "IPv4 Network Mask"
msgstr "IPv4-nettmaske"
#: ../iw/netconfig_dialog.py:232 ../iw/netconfig_dialog.py:235
-#: ../iw/network_gui.py:34 ../iw/network_gui.py:533
+#: ../iw/network_gui.py:34 ../iw/network_gui.py:541
msgid "Gateway"
msgstr "Gateway"
@@ -3590,11 +3549,11 @@ msgstr "Feil under konfigurasjon av nettverksenhet:"
msgid "Error configuring network device"
msgstr "Feil under konfigurasjon av nettverksenhet"
-#: ../iw/network_gui.py:34 ../iw/network_gui.py:535
+#: ../iw/network_gui.py:34 ../iw/network_gui.py:543
msgid "Primary DNS"
msgstr "Primær DNS"
-#: ../iw/network_gui.py:34 ../iw/network_gui.py:537
+#: ../iw/network_gui.py:34 ../iw/network_gui.py:545
msgid "Secondary DNS"
msgstr "Sekundær DNS"
@@ -3614,7 +3573,7 @@ msgstr "_Sekundær DNS"
msgid "Network Configuration"
msgstr "Nettverkskonfigurasjon"
-#: ../iw/network_gui.py:142
+#: ../iw/network_gui.py:150
msgid ""
"You have not specified a hostname. Depending on your network environment "
"this may cause problems later."
@@ -3622,7 +3581,7 @@ msgstr ""
"Du har ikke spesifisert et vertsnavn. Dette kan skape problemer senere "
"avhengig av ditt nettverksmiljø."
-#: ../iw/network_gui.py:146
+#: ../iw/network_gui.py:154
#, python-format
msgid ""
"You have not specified the field \"%s\". Depending on your network "
@@ -3631,7 +3590,7 @@ msgstr ""
"Du har ikke spesifisert felt «%s». Dette kan skape problemer senere avhengig "
"av ditt nettverksmiljø."
-#: ../iw/network_gui.py:150 ../textw/network_text.py:820
+#: ../iw/network_gui.py:158 ../textw/network_text.py:821
#, python-format
msgid ""
"The hostname \"%s\" is not valid for the following reason:\n"
@@ -3642,16 +3601,16 @@ msgstr ""
"\n"
"%s"
-#: ../iw/network_gui.py:157 ../textw/network_text.py:43
+#: ../iw/network_gui.py:165 ../textw/network_text.py:43
#, python-format
msgid "Error With %s Data"
msgstr "Feil med %s data"
-#: ../iw/network_gui.py:162 ../textw/network_text.py:64
+#: ../iw/network_gui.py:170 ../textw/network_text.py:64
msgid "The IPv4 information you have entered is invalid."
msgstr "IPv4-informasjonen du oppga er ugyldig."
-#: ../iw/network_gui.py:166
+#: ../iw/network_gui.py:174
msgid ""
"You have no active network devices. Your system will not be able to "
"communicate over a network by default without at least one device active."
@@ -3659,112 +3618,120 @@ msgstr ""
"Du har ingen aktive nettverksenheter. Systemet ditt vil ikke kunne "
"kommunisere over et nettverk uten minst en aktiv enhet."
-#: ../iw/network_gui.py:291 ../iw/network_gui.py:305
+#: ../iw/network_gui.py:299 ../iw/network_gui.py:313
msgid "Disabled"
msgstr "Deaktivert"
-#: ../iw/network_gui.py:398
+#: ../iw/network_gui.py:406
msgid "Active on Boot"
msgstr "Aktiv ved oppstart"
-#: ../iw/network_gui.py:400 ../iw/osbootwidget.py:65
+#: ../iw/network_gui.py:408 ../iw/osbootwidget.py:73
#: ../iw/partition_gui.py:367 ../textw/bootloader_text.py:196
#: ../textw/bootloader_text.py:262 ../textw/mouse_text.py:44
#: ../textw/partition_text.py:1422
msgid "Device"
msgstr "Enhet"
-#: ../iw/network_gui.py:402
+#: ../iw/network_gui.py:410
msgid "IPv4/Netmask"
msgstr "IPv4/nettmaske"
-#: ../iw/network_gui.py:404
+#: ../iw/network_gui.py:412
msgid "IPv6/Prefix"
msgstr "IPv6/prefiks"
-#: ../iw/network_gui.py:464
+#: ../iw/network_gui.py:472
msgid "Network Devices"
msgstr "Nettverksenheter"
-#: ../iw/network_gui.py:475
+#: ../iw/network_gui.py:483
msgid "Set the hostname:"
msgstr "Sett vertsnavnet:"
-#: ../iw/network_gui.py:480
+#: ../iw/network_gui.py:488
msgid "_automatically via DHCP"
msgstr "_automatisk via DHCP"
-#: ../iw/network_gui.py:487
+#: ../iw/network_gui.py:495
msgid "_manually"
msgstr "_manuelt"
-#: ../iw/network_gui.py:492
+#: ../iw/network_gui.py:500
msgid "(e.g., host.domain.com)"
msgstr "(eks. vert.domene.no)"
-#: ../iw/network_gui.py:498
+#: ../iw/network_gui.py:506
msgid "Hostname"
msgstr "Vertsnavn"
-#: ../iw/network_gui.py:542
+#: ../iw/network_gui.py:550
msgid "Miscellaneous Settings"
msgstr "Forskjellige innstillinger"
-#: ../iw/network_gui.py:630
+#: ../iw/network_gui.py:638
msgid "Edit Device "
msgstr "Rediger enhet "
-#: ../iw/network_gui.py:634
+#: ../iw/network_gui.py:642
msgid "Unknown Ethernet Device"
msgstr "Ukjent Ethernet-enhet"
-#: ../iw/network_gui.py:640
+#: ../iw/network_gui.py:648
msgid "unknown"
msgstr "ukjent"
-#: ../iw/network_gui.py:642
+#: ../iw/network_gui.py:650
msgid "Hardware address: "
msgstr "Maskinvareadresse: "
-#: ../iw/network_gui.py:778 ../textw/network_text.py:228 ../loader2/net.c:824
+#: ../iw/network_gui.py:786 ../textw/network_text.py:228 ../loader2/net.c:824
msgid "Missing Protocol"
msgstr "Mangler protokoll"
-#: ../iw/network_gui.py:779 ../textw/network_text.py:229
+#: ../iw/network_gui.py:787 ../textw/network_text.py:229
msgid "You must select at least IPv4 or IPv6 support."
-msgstr "Du må minimum velge IPv4 eller IPv6 støtte."
+msgstr "Du må velge støtte for enten IPv4 eller IPv6."
-#: ../iw/network_gui.py:802 ../iw/network_gui.py:843 ../iw/network_gui.py:849
+#: ../iw/network_gui.py:810 ../iw/network_gui.py:851 ../iw/network_gui.py:857
#: ../textw/network_text.py:74 ../loader2/net.c:96
msgid "Invalid Prefix"
msgstr "Ugyldig prefiks"
-#: ../iw/network_gui.py:803
+#: ../iw/network_gui.py:811
msgid "IPv4 prefix must be between 0 and 32."
msgstr "IPv4-prefiks må være mellom 0 og 32."
-#: ../iw/network_gui.py:844 ../iw/network_gui.py:850
+#: ../iw/network_gui.py:852 ../iw/network_gui.py:858
msgid "IPv6 prefix must be between 0 and 128."
msgstr "IPv6-prefiks må være mellom 1 og 128."
#: ../iw/osbootwidget.py:49
-#, fuzzy
-msgid "Boot loader operating system list"
-msgstr "Passordet for oppstartslasteren er for kort"
+msgid ""
+"You can configure the boot loader to boot other operating systems by "
+"selecting from the list. To add an operating systems that was not "
+"automatically detected, click 'Add.' To change the operating system booted "
+"by default, select 'Default' next to the desired operating system."
+msgstr ""
+"Du kan konfigurere oppstartslasteren til å starte andre operativsystemer, "
+"ved å velge fra listen. For å legge til flere operativsystemer som ikke "
+"detekteres automatisk, klikker du på «Legg til». For å endre hvilket "
+"operativsystem som settes som forvalgt, velger du «Forvalgt» for ønsket "
+"operativsystem."
-#: ../iw/osbootwidget.py:65 ../textw/bootloader_text.py:262
+#: ../iw/osbootwidget.py:73 ../textw/bootloader_text.py:262
msgid "Default"
msgstr "Forvalg"
-#: ../iw/osbootwidget.py:65 ../iw/partition_gui.py:368
+#: ../iw/osbootwidget.py:73 ../iw/partition_gui.py:368
msgid "Label"
msgstr "Etikett"
-#: ../iw/osbootwidget.py:128
+#: ../iw/osbootwidget.py:136
msgid "Image"
msgstr "Bilde"
-#: ../iw/osbootwidget.py:135
+#: ../iw/osbootwidget.py:143
msgid ""
"Enter a label for the boot loader menu to display. The device (or hard drive "
"and partition number) is the device from which it boots."
@@ -3772,43 +3739,43 @@ msgstr ""
"Oppgi en etikett som skal vises i menyen for oppstartslasteren. Enheten "
"(eller harddisken og partisjonsnummeret) er oppstartsenheten."
-#: ../iw/osbootwidget.py:143
+#: ../iw/osbootwidget.py:155
msgid "_Label"
msgstr "_Etikett"
-#: ../iw/osbootwidget.py:182
+#: ../iw/osbootwidget.py:194
msgid "Default Boot _Target"
msgstr "Forvalgt opps_tartsmål"
-#: ../iw/osbootwidget.py:211
+#: ../iw/osbootwidget.py:223
msgid "You must specify a label for the entry"
msgstr "Du må spesifisere en etikett for oppføringen"
-#: ../iw/osbootwidget.py:220
+#: ../iw/osbootwidget.py:232
msgid "Boot label contains illegal characters"
msgstr "Oppstartsetiketten inneholder ugyldige tegn"
-#: ../iw/osbootwidget.py:244
+#: ../iw/osbootwidget.py:256
msgid "Duplicate Label"
msgstr "Duplisert etikett"
-#: ../iw/osbootwidget.py:245
+#: ../iw/osbootwidget.py:257
msgid "This label is already in use for another boot entry."
msgstr "Denne etiketten er allerede i bruk for en annen oppstartsoppføring."
-#: ../iw/osbootwidget.py:258
+#: ../iw/osbootwidget.py:270
msgid "Duplicate Device"
msgstr "Duplisert enhet"
-#: ../iw/osbootwidget.py:259
+#: ../iw/osbootwidget.py:271
msgid "This device is already being used for another boot entry."
msgstr "Denne enheten er allerede i bruk for en annen oppstartsoppføring."
-#: ../iw/osbootwidget.py:323 ../textw/bootloader_text.py:345
+#: ../iw/osbootwidget.py:335 ../textw/bootloader_text.py:345
msgid "Cannot Delete"
msgstr "Kan ikke slette"
-#: ../iw/osbootwidget.py:324 ../textw/bootloader_text.py:346
+#: ../iw/osbootwidget.py:336 ../textw/bootloader_text.py:346
#, python-format
msgid ""
"This boot target cannot be deleted because it is for the %s system you are "
@@ -3855,10 +3822,9 @@ msgid "File System _Type:"
msgstr "Filsystem_type:"
#: ../iw/partition_dialog_gui.py:334 ../iw/partition_ui_helpers_gui.py:300
-#: ../iw/raid_dialog_gui.py:327
-#, fuzzy
+#: ../iw/raid_dialog_gui.py:316
msgid "_Encrypt"
-msgstr "Krypteringsnøkkel"
+msgstr "Krypt_er"
#: ../iw/partition_dialog_gui.py:350
msgid "Allowable _Drives:"
@@ -3971,7 +3937,7 @@ msgstr "_RAID-enheter"
msgid "None"
msgstr "Ingen"
-#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:290
+#: ../iw/partition_gui.py:816 ../loader2/hdinstall.c:286
msgid "Hard Drives"
msgstr "Harddisker"
@@ -4112,22 +4078,19 @@ msgstr "Skjul RAID-enhet/_gruppemedlemmer for LVM-volumgruppe"
#: ../textw/partition_text.py:271 ../textw/partition_text.py:273
#: ../textw/partition_text.py:298
msgid "<Not Applicable>"
-msgstr "<Ikke brukbar>"
+msgstr "<Ikke relevant>"
#: ../iw/partition_ui_helpers_gui.py:284
-#, fuzzy
msgid "_Format as:"
-msgstr "Formater som:"
+msgstr "_Formater som:"
#: ../iw/partition_ui_helpers_gui.py:307
-#, fuzzy
msgid "Mi_grate filesystem to:"
-msgstr "Migrer filsystemer"
+msgstr "Mi_grer filsystem til:"
-#: ../iw/partition_ui_helpers_gui.py:327 tmp/autopart.glade.h:9
-#, fuzzy
+#: ../iw/partition_ui_helpers_gui.py:327
msgid "_Resize"
-msgstr "_Fast størrelse"
+msgstr "End_re størrelse"
#: ../iw/partition_ui_helpers_gui.py:381
#, python-format
@@ -4154,7 +4117,7 @@ msgstr "Partisjoner _manuelt med Disk Druid"
msgid "Installing Packages"
msgstr "Installerer pakker"
-#: ../iw/raid_dialog_gui.py:286
+#: ../iw/raid_dialog_gui.py:275
msgid ""
"At least two unused software RAID partitions are needed to create a RAID "
"device.\n"
@@ -4168,41 +4131,41 @@ msgstr ""
"Opprett først minst to partisjoner av type «programvare-RAID» og velg så "
"alternativet «RAID» igjen."
-#: ../iw/raid_dialog_gui.py:300 ../iw/raid_dialog_gui.py:733
+#: ../iw/raid_dialog_gui.py:289 ../iw/raid_dialog_gui.py:722
#: ../textw/partition_text.py:943
msgid "Make RAID Device"
msgstr "Lag RAID-enhet"
-#: ../iw/raid_dialog_gui.py:303
+#: ../iw/raid_dialog_gui.py:292
#, python-format
msgid "Edit RAID Device: /dev/md%s"
msgstr "Rediger RAID-enhet: /dev/md%s"
-#: ../iw/raid_dialog_gui.py:305 ../textw/partition_text.py:941
+#: ../iw/raid_dialog_gui.py:294 ../textw/partition_text.py:941
msgid "Edit RAID Device"
msgstr "Rediger RAID-enhet"
-#: ../iw/raid_dialog_gui.py:361
+#: ../iw/raid_dialog_gui.py:350
msgid "RAID _Device:"
msgstr "RAI_D-enhet:"
-#: ../iw/raid_dialog_gui.py:379
+#: ../iw/raid_dialog_gui.py:368
msgid "RAID _Level:"
msgstr "RAID-_nivå:"
-#: ../iw/raid_dialog_gui.py:420
+#: ../iw/raid_dialog_gui.py:409
msgid "_RAID Members:"
msgstr "_RAID-medlemmer:"
-#: ../iw/raid_dialog_gui.py:437
+#: ../iw/raid_dialog_gui.py:426
msgid "Number of _spares:"
msgstr "Antall re_servedisker:"
-#: ../iw/raid_dialog_gui.py:447
+#: ../iw/raid_dialog_gui.py:436
msgid "_Format partition?"
msgstr "_Formater partisjon?"
-#: ../iw/raid_dialog_gui.py:534
+#: ../iw/raid_dialog_gui.py:523
msgid ""
"The source drive has no partitions to be cloned. You must first define "
"partitions of type 'software RAID' on this drive before it can be cloned."
@@ -4210,12 +4173,12 @@ msgstr ""
"Kildestasjonen har ingen partisjoner som skal klones. Du må definere "
"partisjoner av type «programvare-RAID» på denne stasjonen før den kan klones."
-#: ../iw/raid_dialog_gui.py:538 ../iw/raid_dialog_gui.py:544
-#: ../iw/raid_dialog_gui.py:556 ../iw/raid_dialog_gui.py:569
+#: ../iw/raid_dialog_gui.py:527 ../iw/raid_dialog_gui.py:533
+#: ../iw/raid_dialog_gui.py:545 ../iw/raid_dialog_gui.py:558
msgid "Source Drive Error"
msgstr "Feil med kildestasjon"
-#: ../iw/raid_dialog_gui.py:545
+#: ../iw/raid_dialog_gui.py:534
msgid ""
"The source drive you selected has partitions which are not of type 'software "
"RAID'.\n"
@@ -4227,7 +4190,7 @@ msgstr ""
"\n"
"Disse partisjonene vil måtte fjernes før denne stasjonen kan klones. "
-#: ../iw/raid_dialog_gui.py:557
+#: ../iw/raid_dialog_gui.py:546
#, python-format
msgid ""
"The source drive you selected has partitions which are not constrained to "
@@ -4242,7 +4205,7 @@ msgstr ""
"Disse partisjonene vil måtte fjernes eller begrenses til denne stasjonen før "
"den kan klones. "
-#: ../iw/raid_dialog_gui.py:570
+#: ../iw/raid_dialog_gui.py:559
msgid ""
"The source drive you selected has software RAID partition(s) which are "
"members of an active software RAID device.\n"
@@ -4254,21 +4217,21 @@ msgstr ""
"\n"
"Disse partisjonene vil måtte fjernes før stasjonen kan klones."
-#: ../iw/raid_dialog_gui.py:583 ../iw/raid_dialog_gui.py:589
-#: ../iw/raid_dialog_gui.py:608
+#: ../iw/raid_dialog_gui.py:572 ../iw/raid_dialog_gui.py:578
+#: ../iw/raid_dialog_gui.py:597
msgid "Target Drive Error"
msgstr "Feil på målstasjon"
-#: ../iw/raid_dialog_gui.py:584
+#: ../iw/raid_dialog_gui.py:573
msgid "Please select the target drives for the clone operation."
msgstr "Vennligst velg målstasjon for kloningen."
-#: ../iw/raid_dialog_gui.py:590
+#: ../iw/raid_dialog_gui.py:579
#, python-format
msgid "The source drive /dev/%s cannot be selected as a target drive as well."
msgstr "Kildestasjon /dev/%s kan ikke velges som målstasjon også."
-#: ../iw/raid_dialog_gui.py:609
+#: ../iw/raid_dialog_gui.py:598
#, python-format
msgid ""
"The target drive /dev/%s has a partition which cannot be removed for the "
@@ -4285,11 +4248,11 @@ msgstr ""
"\n"
"Denne partisjonen må fjernes før stasjonen kan være et mål."
-#: ../iw/raid_dialog_gui.py:670
+#: ../iw/raid_dialog_gui.py:659
msgid "Please select a source drive."
msgstr "Vennligst velg en kildestasjon."
-#: ../iw/raid_dialog_gui.py:690
+#: ../iw/raid_dialog_gui.py:679
#, python-format
msgid ""
"The drive /dev/%s will now be cloned to the following drives:\n"
@@ -4298,7 +4261,7 @@ msgstr ""
"Stasjonen /dev/%s vil nå bli klonet til følgende stasjoner:\n"
"\n"
-#: ../iw/raid_dialog_gui.py:695
+#: ../iw/raid_dialog_gui.py:684
msgid ""
"\n"
"\n"
@@ -4308,19 +4271,19 @@ msgstr ""
"\n"
"ADVARSEL! ALLE DATA PÅ MÅLSTASJONENE VIL BLI ØDELAGT."
-#: ../iw/raid_dialog_gui.py:698
+#: ../iw/raid_dialog_gui.py:687
msgid "Final Warning"
msgstr "Endelig advarsel"
-#: ../iw/raid_dialog_gui.py:700
+#: ../iw/raid_dialog_gui.py:689
msgid "Clone Drives"
msgstr "Kloning av disker"
-#: ../iw/raid_dialog_gui.py:709
+#: ../iw/raid_dialog_gui.py:698
msgid "There was an error clearing the target drives. Cloning failed."
msgstr "Det oppsto en feil under tømming av målstasjonene. Kloning feilet."
-#: ../iw/raid_dialog_gui.py:743
+#: ../iw/raid_dialog_gui.py:732
msgid ""
"Clone Drive Tool\n"
"\n"
@@ -4348,19 +4311,19 @@ msgstr ""
"\n"
"ALLE DATA på målstasjonen(e) vil bli ødelagt i denne prosessen."
-#: ../iw/raid_dialog_gui.py:763
+#: ../iw/raid_dialog_gui.py:752
msgid "Source Drive:"
msgstr "Kildestasjon:"
-#: ../iw/raid_dialog_gui.py:771
+#: ../iw/raid_dialog_gui.py:760
msgid "Target Drive(s):"
msgstr "Målstasjon(er):"
-#: ../iw/raid_dialog_gui.py:779
+#: ../iw/raid_dialog_gui.py:768
msgid "Drives"
msgstr "Stasjoner"
-#: ../iw/task_gui.py:44
+#: ../iw/task_gui.py:89
#, python-format
msgid ""
"Unable to read package metadata from repository. This may be due to a "
@@ -4375,7 +4338,7 @@ msgstr ""
"\n"
"%s"
-#: ../iw/task_gui.py:54
+#: ../iw/task_gui.py:99
#, python-format
msgid ""
"Unable to find a group file for %s. This will prevent manual selection of "
@@ -4384,39 +4347,31 @@ msgstr ""
"Kan ikke finne en gruppefil for %s. Dette vil medføre at manuelt valg av "
"pakker fra lageret ikke vil virke"
-#: ../iw/task_gui.py:80
-#, fuzzy
-msgid "Edit Repository"
-msgstr "Legg til lager"
-
-#: ../iw/task_gui.py:155
+#: ../iw/task_gui.py:187
msgid "Invalid Repository Name"
msgstr "Ugyldig navn på lager"
-#: ../iw/task_gui.py:156
+#: ../iw/task_gui.py:188
msgid "You must provide a repository name."
msgstr "Du må oppgi et navn på lageret."
-#: ../iw/task_gui.py:167
-#, fuzzy
-msgid "Invalid Proxy URL"
-msgstr "Ugyldig URL til lager"
-
-#: ../iw/task_gui.py:168
-#, fuzzy
-msgid "You must provide an HTTP, HTTPS, or FTP URL to a proxy."
-msgstr "Du må oppgi en HTTP eller FTP URL til et lager."
-
-#: ../iw/task_gui.py:187
+#: ../iw/task_gui.py:198
msgid "Invalid Repository URL"
msgstr "Ugyldig URL til lager"
-#: ../iw/task_gui.py:188
-#, fuzzy
+#: ../iw/task_gui.py:199
msgid "You must provide an HTTP, HTTPS, or FTP URL to a repository."
-msgstr "Du må oppgi en HTTP eller FTP URL til et lager."
+msgstr "Du må oppgi en HTTP, HTTPS eller FTP URL til et lager."
+
+#: ../iw/task_gui.py:211
+msgid "Invalid Proxy URL"
+msgstr "Ugyldig proxy-URL"
-#: ../iw/task_gui.py:227
+#: ../iw/task_gui.py:212
+msgid "You must provide an HTTP, HTTPS, or FTP URL to a proxy."
+msgstr "Du må oppgi en HTTP, HTTPS eller FTP URL til en proxy."
+
+#: ../iw/task_gui.py:269
#, python-format
msgid ""
"The repository %s has already been added. Please choose a different "
@@ -4687,18 +4642,6 @@ msgstr ""
msgid "Force use of LBA32 (not normally required)"
msgstr "Tvungen bruk av LBA32 (vanligvis ikke nødvendig)"
-#: ../textw/bootloader_text.py:128
-msgid ""
-"If LBA32 is not supported by your system's BIOS, forcing its use can prevent "
-"your machine from booting.\n"
-"\n"
-"Would you like to continue and force LBA32 mode?"
-msgstr ""
-"Tvungen bruk av LBA32 for din oppstartslaster kan medføre at maskinen ikke "
-"kan startes hvis BIOS ikke støtter dette.\n"
-"\n"
-"Vil du fortsette med tvungen bruk av LBA32-modus?"
-
#: ../textw/bootloader_text.py:169
msgid "Where do you want to install the boot loader?"
msgstr "Hvor vil du installere oppstartslasteren?"
@@ -4766,7 +4709,7 @@ msgstr "Bruk passord for GRUB"
msgid "Boot Loader Password:"
msgstr "Passord for oppstartslaster:"
-#: ../textw/bootloader_text.py:413 tmp/account.glade.h:1
+#: ../textw/bootloader_text.py:413
msgid "Confirm:"
msgstr "Bekreft:"
@@ -4828,6 +4771,18 @@ msgstr "Ferdig"
msgid "Reboot"
msgstr "Start på nytt"
+#: ../textw/constants_text.py:50 ../loader2/cdinstall.c:337
+#: ../loader2/driverdisk.c:236 ../loader2/driverdisk.c:267
+#: ../loader2/driverdisk.c:351 ../loader2/driverselect.c:75
+#: ../loader2/driverselect.c:173 ../loader2/driverselect.c:199
+#: ../loader2/hdinstall.c:286 ../loader2/hdinstall.c:340 ../loader2/kbd.c:138
+#: ../loader2/loader.c:415 ../loader2/loader.c:431 ../loader2/loader.c:1133
+#: ../loader2/loader.c:1155 ../loader2/net.c:281 ../loader2/net.c:324
+#: ../loader2/net.c:754 ../loader2/net.c:1098 ../loader2/net.c:1864
+#: ../loader2/nfsinstall.c:67 ../loader2/urls.c:297 ../loader2/urls.c:414
+msgid "Back"
+msgstr "Tilbake"
+
#: ../textw/grpselect_text.py:94
msgid "Please select the package groups you would like to install."
msgstr "Velg hvilke pakkegrupper du ønsker å installere."
@@ -5013,67 +4968,67 @@ msgstr ""
"som IKKE KONFIGURERT. For å konfigurerer en grensesnitt, marker det og velg "
"Rediger. Når du er ferdig, trykk på OK for å fortsette."
-#: ../textw/network_text.py:567
+#: ../textw/network_text.py:625
msgid "Active on boot"
msgstr "Aktiv ved oppstart"
-#: ../textw/network_text.py:569
+#: ../textw/network_text.py:627
msgid "Inactive on boot"
msgstr "Uvirksom ved oppstart"
-#: ../textw/network_text.py:572
+#: ../textw/network_text.py:630
msgid "DHCP"
msgstr "DHCP"
-#: ../textw/network_text.py:577
+#: ../textw/network_text.py:635
msgid "Auto IPv6"
msgstr "Auto IPv6"
-#: ../textw/network_text.py:579
+#: ../textw/network_text.py:637
msgid "DHCPv6"
msgstr "DHCPv6"
-#: ../textw/network_text.py:678 ../loader2/net.c:1059
+#: ../textw/network_text.py:669 ../loader2/net.c:1059
msgid "Gateway:"
msgstr "Gateway:"
-#: ../textw/network_text.py:687
+#: ../textw/network_text.py:678
msgid "Primary DNS:"
msgstr "Primær DNS:"
-#: ../textw/network_text.py:692
+#: ../textw/network_text.py:683
msgid "Secondary DNS:"
msgstr "Sekundær DNS:"
-#: ../textw/network_text.py:699
+#: ../textw/network_text.py:690
msgid "Miscellaneous Network Settings"
msgstr "Forskjellige innstillinger for nettverk"
-#: ../textw/network_text.py:716 ../textw/network_text.py:719
+#: ../textw/network_text.py:707 ../textw/network_text.py:710
msgid "gateway"
msgstr "gateway"
-#: ../textw/network_text.py:726 ../textw/network_text.py:729
+#: ../textw/network_text.py:717 ../textw/network_text.py:720
msgid "primary DNS"
msgstr "primær DNS"
-#: ../textw/network_text.py:738
+#: ../textw/network_text.py:729
msgid "secondary DNS"
msgstr "sekundær DNS"
-#: ../textw/network_text.py:762
+#: ../textw/network_text.py:763
msgid "automatically via DHCP"
msgstr "automatisk via DHCP"
-#: ../textw/network_text.py:765
+#: ../textw/network_text.py:766
msgid "manually"
msgstr "manuelt"
-#: ../textw/network_text.py:784
+#: ../textw/network_text.py:785
msgid "Hostname Configuration"
msgstr "Konfigurasjon av vertsnavn"
-#: ../textw/network_text.py:787
+#: ../textw/network_text.py:788
msgid ""
"If your system is part of a larger network where hostnames are assigned by "
"DHCP, select automatically via DHCP. Otherwise, select manually and enter a "
@@ -5085,11 +5040,11 @@ msgstr ""
"tildeling og oppgi et vertsnavn for ditt system. Hvis du ikke gjør dette, "
"vil systemet få navnet «localhost»."
-#: ../textw/network_text.py:813 ../textw/network_text.py:819
+#: ../textw/network_text.py:814 ../textw/network_text.py:820
msgid "Invalid Hostname"
msgstr "Ugyldig vertsnavn"
-#: ../textw/network_text.py:814
+#: ../textw/network_text.py:815
msgid "You have not specified a hostname."
msgstr "Du har ikke oppgitt et vertsnavn."
@@ -5319,10 +5274,6 @@ msgstr "partisjon"
msgid "logical volume"
msgstr "logisk volum"
-#: ../textw/partition_text.py:1422
-msgid "Size"
-msgstr "Størrelse"
-
#: ../textw/partition_text.py:1426
msgid "New"
msgstr "Ny"
@@ -5519,21 +5470,21 @@ msgstr ""
"Vennligst velg hvilken som skal oppgraderes, eller velg «Installer systemet "
"på nytt» for å installere helt på nytt."
-#: ../textw/userauth_text.py:27
+#: ../textw/userauth_text.py:34
msgid "Root Password"
msgstr "Root-passord"
-#: ../textw/userauth_text.py:30
-#, fuzzy
+#: ../textw/userauth_text.py:36
msgid ""
"Pick a root password. You must type it twice to ensure you know it and do "
-"not make a typing mistake. "
+"not make a typing mistake. Remember that the root password is a critical "
+"part of system security!"
msgstr ""
"Velg et root-passord. Du må skrive det inn to ganger for å være sikker på at "
"du vet hva det er og at du ikke gjorde en skrivefeil. Husk at root-passordet "
"er kritisk for systemsikkerheten!"
-#: ../textw/userauth_text.py:64
+#: ../textw/userauth_text.py:67
msgid "The root password must be at least 6 characters long."
msgstr "Root-passordet må være minst 6 tegn langt."
@@ -5664,7 +5615,7 @@ msgstr "Mediasjekk"
#: ../loader2/cdinstall.c:96 ../loader2/cdinstall.c:99
#: ../loader2/cdinstall.c:117 ../loader2/cdinstall.c:125
-#: ../loader2/method.c:424
+#: ../loader2/method.c:421
msgid "Test"
msgstr "Test"
@@ -5705,11 +5656,11 @@ msgstr ""
"%s CDen ble ikke funnet i noen av dine enheter. Sett inn %s CDen og trykk %s "
"for å forsøke på nytt"
-#: ../loader2/cdinstall.c:196
+#: ../loader2/cdinstall.c:197
msgid "Disc Found"
msgstr "Plate funnet"
-#: ../loader2/cdinstall.c:197
+#: ../loader2/cdinstall.c:198
#, c-format
msgid ""
"To begin testing the media before installation press %s.\n"
@@ -5720,7 +5671,7 @@ msgstr ""
"\n"
"Velg %s for å hoppe over denne testen og starte installasjonen."
-#: ../loader2/cdinstall.c:323
+#: ../loader2/cdinstall.c:325
#, c-format
msgid ""
"No %s disc was found which matches your boot media. Please insert the %s "
@@ -5729,7 +5680,7 @@ msgstr ""
"Fant ingen %s-CD som passer ditt oppstartsmedium. Sett inn %s-CDen og trykk %"
"s for å prøve på nytt"
-#: ../loader2/cdinstall.c:328
+#: ../loader2/cdinstall.c:330
#, c-format
msgid ""
"The %s disc was not found in any of your CDROM drives. Please insert the %s "
@@ -5738,15 +5689,15 @@ msgstr ""
"%s CDen ble ikke funnet i noen av dine CD-ROM-stasjoner. Sett inn %s CDen og "
"press %s for å forsøke på nytt"
-#: ../loader2/cdinstall.c:334
+#: ../loader2/cdinstall.c:336
msgid "Disc Not Found"
msgstr "Disk ikke funnet"
-#: ../loader2/cdinstall.c:402
+#: ../loader2/cdinstall.c:404
msgid "Cannot find kickstart file on CDROM."
msgstr "Kan ikke finne kickstart-fil på CD-ROM."
-#: ../loader2/copy.c:51 ../loader2/method.c:157 ../loader2/method.c:378
+#: ../loader2/copy.c:51 ../loader2/method.c:157 ../loader2/method.c:375
#, c-format
msgid "Failed to read directory %s: %s"
msgstr "Kunne ikke lese katalog %s: %s"
@@ -5847,12 +5798,12 @@ msgid "Do you wish to load any more driver disks?"
msgstr "Ønsker du å laste flere driverdisker?"
#: ../loader2/driverdisk.c:535 ../loader2/driverdisk.c:572
-#: ../loader2/hdinstall.c:426 ../loader2/kickstart.c:132
+#: ../loader2/hdinstall.c:425 ../loader2/kickstart.c:132
#: ../loader2/kickstart.c:142 ../loader2/kickstart.c:185
#: ../loader2/kickstart.c:529 ../loader2/modules.c:336
-#: ../loader2/modules.c:348 ../loader2/net.c:1653 ../loader2/net.c:1676
-#: ../loader2/nfsinstall.c:302 ../loader2/urlinstall.c:426
-#: ../loader2/urlinstall.c:435 ../loader2/urlinstall.c:444
+#: ../loader2/modules.c:348 ../loader2/net.c:1648 ../loader2/net.c:1671
+#: ../loader2/nfsinstall.c:300 ../loader2/urlinstall.c:427
+#: ../loader2/urlinstall.c:436 ../loader2/urlinstall.c:445
msgid "Kickstart Error"
msgstr "Kickstart-feil"
@@ -5917,18 +5868,18 @@ msgstr "Spesifiser alternative parametere for modul"
msgid "Select Device Driver to Load"
msgstr "Velg enhetsdriver som skal lastes"
-#: ../loader2/hdinstall.c:76 ../loader2/nfsinstall.c:167
-#: ../loader2/nfsinstall.c:218 ../loader2/urlinstall.c:262
+#: ../loader2/hdinstall.c:76 ../loader2/nfsinstall.c:164
+#: ../loader2/nfsinstall.c:216 ../loader2/urlinstall.c:263
msgid "Media Detected"
msgstr "Medie funnet"
-#: ../loader2/hdinstall.c:77 ../loader2/nfsinstall.c:168
-#: ../loader2/nfsinstall.c:219 ../loader2/urlinstall.c:263
+#: ../loader2/hdinstall.c:77 ../loader2/nfsinstall.c:165
+#: ../loader2/nfsinstall.c:217 ../loader2/urlinstall.c:264
msgid "Local installation media detected..."
msgstr "Lokalt installasjonsmedie funnet..."
-#: ../loader2/hdinstall.c:129 ../loader2/nfsinstall.c:249
-#: ../loader2/urlinstall.c:163
+#: ../loader2/hdinstall.c:125 ../loader2/nfsinstall.c:247
+#: ../loader2/urlinstall.c:164
#, c-format
msgid ""
"The %s installation tree in that directory does not seem to match your boot "
@@ -5937,7 +5888,7 @@ msgstr ""
"Installasjonstreet for %s i denne katalogen passer ikke med ditt "
"oppstartsmedium."
-#: ../loader2/hdinstall.c:187
+#: ../loader2/hdinstall.c:181
msgid ""
"An error occured reading the install from the ISO images. Please check your "
"ISO images and try again."
@@ -5945,7 +5896,7 @@ msgstr ""
"En feil oppstod ved lesing av installasjonen fra ISO-filene. Sjekk ISO-"
"filene og prøv på nytt."
-#: ../loader2/hdinstall.c:291
+#: ../loader2/hdinstall.c:287
msgid ""
"You don't seem to have any hard drives on your system! Would you like to "
"configure additional devices?"
@@ -5953,7 +5904,7 @@ msgstr ""
"Det ser ikke ut som om du har noen harddisker på systemet ditt! Ønsker du å "
"konfigurere flere enheter?"
-#: ../loader2/hdinstall.c:305
+#: ../loader2/hdinstall.c:301
#, c-format
msgid ""
"What partition and directory on that partition hold the CD (iso9660) images "
@@ -5964,29 +5915,29 @@ msgstr ""
"filene (iso9660) for %s? Hvis du ikke ser disken du bruker på denne listen, "
"trykk F2 for å konfigurere flere enheter."
-#: ../loader2/hdinstall.c:328
+#: ../loader2/hdinstall.c:324
msgid "Directory holding images:"
msgstr "Katalog som inneholder bilder:"
-#: ../loader2/hdinstall.c:356
+#: ../loader2/hdinstall.c:352
msgid "Select Partition"
msgstr "Velg partisjon"
-#: ../loader2/hdinstall.c:395
+#: ../loader2/hdinstall.c:391
#, c-format
msgid "Device %s does not appear to contain %s CDROM images."
msgstr "Enhet %s ser ikke ut til å inneholde CD-ROM bilder for %s."
-#: ../loader2/hdinstall.c:427
+#: ../loader2/hdinstall.c:426
#, c-format
msgid "Bad argument to HD kickstart method command %s: %s"
msgstr "Ugyldig argument til HD-kommando for kickstart %s: %s"
-#: ../loader2/hdinstall.c:497 ../loader2/hdinstall.c:553
+#: ../loader2/hdinstall.c:496 ../loader2/hdinstall.c:552
msgid "Cannot find kickstart file on hard drive."
msgstr "Kan ikke finne kickstart-fil på harddisken."
-#: ../loader2/hdinstall.c:540
+#: ../loader2/hdinstall.c:539
#, c-format
msgid "Cannot find hard drive for BIOS disk %s"
msgstr "Kan ikke finne harddisk for BIOS-disk %s"
@@ -6002,7 +5953,7 @@ msgstr "Hvilken type tastatur har du?"
#: ../loader2/kickstart.c:133
#, c-format
msgid "Error opening kickstart file %s: %s"
-msgstr "Feil under åpning av kickstart-fil %s: %s"
+msgstr "Feil under åpning av kickstart-fil %s: %s"
#: ../loader2/kickstart.c:143
#, c-format
@@ -6015,9 +5966,8 @@ msgid "Error in %s on line %d of kickstart file %s."
msgstr "Feil i %s på linje %d i kickstart-fil %s."
#: ../loader2/kickstart.c:285
-#, fuzzy
msgid "Cannot find ks.cfg on removable media."
-msgstr "Kan ikke finne ks.cfg på oppstartsdisketten."
+msgstr "Kan ikke finne ks.cfg på avtagbart medie."
#: ../loader2/kickstart.c:377
msgid ""
@@ -6037,9 +5987,9 @@ msgid "Bad argument to shutdown kickstart method command %s: %s"
msgstr "Ugyldig argument til kommando for nedstenging av kickstart %s: %s"
#: ../loader2/lang.c:64
-#, fuzzy, c-format
+#, c-format
msgid "Welcome to %s for %s - Rescue Mode"
-msgstr "Velkommen til %s - redningsmodus"
+msgstr "Velkommen til %s for %s - redningsmodus"
#: ../loader2/lang.c:65 ../loader2/loader.c:166
msgid ""
@@ -6064,9 +6014,9 @@ msgid "NFS directory"
msgstr "NFS-katalog"
#: ../loader2/loader.c:156
-#, fuzzy, c-format
+#, c-format
msgid "Welcome to %s%n for %s"
-msgstr "Velkommen til %s"
+msgstr "Velkommen til %s%n for %s"
#: ../loader2/loader.c:374 ../loader2/loader.c:410
msgid "Update Disk Source"
@@ -6081,13 +6031,10 @@ msgstr ""
"Hvilken vil du bruke?"
#: ../loader2/loader.c:411
-#, fuzzy
msgid ""
"There are multiple partitions on this device which could contain the update "
"disk image. Which would you like to use?"
-msgstr ""
-"Det er flere partisjoner på denne stasjonen som kan inneholde "
-"driverdisketten. Hvilken vil du bruke?"
+msgstr "Det er flere partisjoner på denne enheten som kan inneholde diskbildet for driveroppdateringer. Hvilken vil du bruke?"
#: ../loader2/loader.c:429
#, c-format
@@ -6098,66 +6045,62 @@ msgstr "Sett inn oppdateringsdisketten i /dev/%s og trykk «OK» for å fortsett
msgid "Updates Disk"
msgstr "Oppdateringsdiskett"
-#: ../loader2/loader.c:445
+#: ../loader2/loader.c:447
msgid "Failed to mount updates disk"
msgstr "Kunne ikke montere oppdateringsdisketten"
-#: ../loader2/loader.c:448
+#: ../loader2/loader.c:450
msgid "Updates"
msgstr "Oppdateringer"
-#: ../loader2/loader.c:448
+#: ../loader2/loader.c:450
msgid "Reading anaconda updates..."
msgstr "Leser anaconda-oppdateringer..."
-#: ../loader2/loader.c:484
-#, fuzzy
+#: ../loader2/loader.c:486
msgid ""
"Unable to download the updates image. Please modify the updates location "
"below or press Cancel to proceed without updates.."
-msgstr ""
-"Kan ikke laste ned kickstart-filen. Vennligst endre kickstart-parametrene "
-"under, eller velg \"Avbryt\" for å fortsette som en interaktiv installasjon."
+msgstr "Kan ikke laste ned oppdateringsbildet. Vennligst endre lokasjonen under, eller velg «Avbryt» for å fortsette uten oppdateringer."
-#: ../loader2/loader.c:493
-#, fuzzy
+#: ../loader2/loader.c:495
msgid "Error downloading updates image"
-msgstr "Feil under nedlasting av kickstart-fil"
+msgstr "Feil under nedlasting av oppdateringsbilde"
-#: ../loader2/loader.c:989
+#: ../loader2/loader.c:968
#, c-format
msgid "You do not have enough RAM to install %s on this machine."
msgstr "Du har ikke nok RAM til å installere %s på denne maskinen."
-#: ../loader2/loader.c:1146
+#: ../loader2/loader.c:1125
msgid "Rescue Method"
msgstr "Redningsmetode"
-#: ../loader2/loader.c:1147
+#: ../loader2/loader.c:1126
msgid "Installation Method"
msgstr "Installasjonsmetode"
-#: ../loader2/loader.c:1149
+#: ../loader2/loader.c:1128
msgid "What type of media contains the rescue image?"
msgstr "Hvilken type media inneholder redningsbildet?"
-#: ../loader2/loader.c:1151
+#: ../loader2/loader.c:1130
msgid "What type of media contains the packages to be installed?"
msgstr "Hvilken type media inneholder pakkene som skal installeres?"
-#: ../loader2/loader.c:1175
+#: ../loader2/loader.c:1154
msgid "No driver found"
msgstr "Ingen driver funnet"
-#: ../loader2/loader.c:1175
+#: ../loader2/loader.c:1154
msgid "Select driver"
msgstr "Velg driver"
-#: ../loader2/loader.c:1176
+#: ../loader2/loader.c:1155
msgid "Use a driver disk"
msgstr "Bruk en driverdisk"
-#: ../loader2/loader.c:1177
+#: ../loader2/loader.c:1156
msgid ""
"Unable to find any devices of the type needed for this installation type. "
"Would you like to manually select your driver or use a driver disk?"
@@ -6165,43 +6108,43 @@ msgstr ""
"Kan ikke finne noen enhter av typen som kreves for denne installasjonstypen. "
"Vil du velge din driver manuelt eller bruke en driverdiskett?"
-#: ../loader2/loader.c:1410
+#: ../loader2/loader.c:1377
msgid "The following devices have been found on your system."
msgstr "Følgende enheter ble funnet på ditt system."
-#: ../loader2/loader.c:1412
+#: ../loader2/loader.c:1379
msgid ""
"No device drivers have been loaded for your system. Would you like to load "
"any now?"
msgstr ""
"Ingen enhetsdrivere er lastet for ditt system. Ønsker du å gjøre dette nå?"
-#: ../loader2/loader.c:1416
+#: ../loader2/loader.c:1383
msgid "Devices"
msgstr "Enheter"
-#: ../loader2/loader.c:1417
+#: ../loader2/loader.c:1384
msgid "Done"
msgstr "Ferdig"
-#: ../loader2/loader.c:1418
+#: ../loader2/loader.c:1385
msgid "Add Device"
msgstr "Legg til enhet"
-#: ../loader2/loader.c:1576
+#: ../loader2/loader.c:1543
#, c-format
msgid "loader has already been run. Starting shell.\n"
msgstr "laster er allerede kjørt. Starter skall.\n"
-#: ../loader2/loader.c:1915
-#, fuzzy, c-format
+#: ../loader2/loader.c:1882
+#, c-format
msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
-msgstr "Kjører anaconda, feilrettingsmodus for %s - vennligst vent...\n"
+msgstr "Kjører anaconda %s, feilrettingsmodus for %s - vennligst vent...\n"
-#: ../loader2/loader.c:1917
-#, fuzzy, c-format
+#: ../loader2/loader.c:1884
+#, c-format
msgid "Running anaconda %s, the %s system installer - please wait...\n"
-msgstr "Kjører anaconda, installeringsprogrammet for %s...\n"
+msgstr "Kjører anaconda %s, installeringsprogrammet for %s - vennligst vent...\n"
#: ../loader2/mediacheck.c:62
#, c-format
@@ -6226,7 +6169,7 @@ msgstr ""
"Klarte ikke å lese CDens sjekksum fra primær volum-beskrivelse. Dette betyr "
"sannsynligvis at at CDen ble laget uten å legge inn sjekksum."
-#: ../loader2/method.c:421
+#: ../loader2/method.c:418
#, c-format
msgid ""
"Would you like to perform a checksum test of the ISO image:\n"
@@ -6237,7 +6180,7 @@ msgstr ""
"\n"
" %s?"
-#: ../loader2/method.c:424
+#: ../loader2/method.c:421
msgid "Checksum Test"
msgstr "Test av sjekksum"
@@ -6247,10 +6190,8 @@ msgid "Bad argument to device kickstart method command %s: %s"
msgstr "Ugyldig argument til enhetskommando for kickstart %s: %s"
#: ../loader2/modules.c:349
-#, fuzzy
msgid "A module name must be specified for the kickstart device command."
-msgstr ""
-"Både modultype og -navn må spesifiseres for kommandoen for kickstartenheten."
+msgstr "Navn på modul må oppgis for enhetskommandoen for kickstart."
#: ../loader2/net.c:57
#, c-format
@@ -6258,6 +6199,8 @@ msgid ""
"Please enter the URL containing %s on your\n"
"server.\n"
msgstr ""
+"Vennligst oppgi URL som inneholder %s på din\n"
+"tjener.\n"
#: ../loader2/net.c:97
msgid ""
@@ -6380,32 +6323,32 @@ msgstr "Manglende informasjon"
msgid ""
"You must enter both a valid IPv4 address and a network mask or CIDR prefix."
msgstr ""
-"Du må skrive inn en gyldig IPv4-adresse og en nettmaske eller et CIDR-"
+"Du må skrive inn en gyldig IPv4-adresse og en nettmaske eller et CIDR-"
"prefiks."
#: ../loader2/net.c:1235
msgid "You must enter both a valid IPv6 address and a CIDR prefix."
msgstr "Du må skrive inn både en gyldig IPv6-adresse og et CIDR-prefiks."
-#: ../loader2/net.c:1557
+#: ../loader2/net.c:1555
msgid "Determining host name and domain..."
msgstr "Undersøker vertsnavn og domene..."
-#: ../loader2/net.c:1654
+#: ../loader2/net.c:1649
#, c-format
msgid "Bad argument to kickstart network command %s: %s"
msgstr "Ugyldig argument til nettverks-kommando for kickstart %s: %s"
-#: ../loader2/net.c:1677
+#: ../loader2/net.c:1672
#, c-format
msgid "Bad bootproto %s specified in network command"
msgstr "Ugyldig bootproto %s spesifisert i nettverkskommandoen"
-#: ../loader2/net.c:1865
+#: ../loader2/net.c:1860
msgid "Networking Device"
msgstr "Nettverksenhet"
-#: ../loader2/net.c:1866
+#: ../loader2/net.c:1861
msgid ""
"You have multiple network devices on this system. Which would you like to "
"install through?"
@@ -6430,20 +6373,20 @@ msgstr "NFS"
msgid "NFS Setup"
msgstr "NFS-oppsett"
-#: ../loader2/nfsinstall.c:140
+#: ../loader2/nfsinstall.c:136
msgid "Hostname specified with no DNS configured"
msgstr "Vertsnavn oppgitt men DNS er ikke konfigurert"
-#: ../loader2/nfsinstall.c:198 ../loader2/nfsinstall.c:265
+#: ../loader2/nfsinstall.c:196 ../loader2/nfsinstall.c:263
msgid "That directory could not be mounted from the server."
msgstr "Den katalogen kunne ikke monteres fra tjeneren."
-#: ../loader2/nfsinstall.c:253
+#: ../loader2/nfsinstall.c:251
#, c-format
msgid "That directory does not seem to contain a %s installation tree."
msgstr "Den katalogen ser ikke ut til å inneholde et %s-installasjonstre."
-#: ../loader2/nfsinstall.c:303
+#: ../loader2/nfsinstall.c:301
#, c-format
msgid "Bad argument to NFS kickstart method command %s: %s"
msgstr "Ugyldig argument til NFS-kommando for kickstart %s: %s"
@@ -6465,53 +6408,50 @@ msgstr "Kjører anaconda via telnet..."
msgid "Unable to retrieve %s://%s/%s/%s."
msgstr "Kan ikke hente %s://%s/%s/%s."
-#: ../loader2/urlinstall.c:155
+#: ../loader2/urlinstall.c:156
msgid "Unable to retrieve the install image."
msgstr "Kunne ikke hente installasjonsbildet."
-#: ../loader2/urlinstall.c:427
+#: ../loader2/urlinstall.c:428
#, c-format
msgid "Bad argument to Url kickstart method command %s: %s"
msgstr "Ugyldig argument til kommando for URL-kickstartmetode %s: %s"
-#: ../loader2/urlinstall.c:436
+#: ../loader2/urlinstall.c:437
msgid "Must supply a --url argument to Url kickstart method."
msgstr "Må oppgi et --url argument til kickstartmetoden for URL."
-#: ../loader2/urlinstall.c:445
+#: ../loader2/urlinstall.c:446
#, c-format
msgid "Unknown Url method %s"
msgstr "Ukjent URL-metode %s"
-#: ../loader2/urls.c:237
+#: ../loader2/urls.c:239
msgid "Retrieving"
msgstr "Henter"
-#: ../loader2/urls.c:306
-#, fuzzy
+#: ../loader2/urls.c:309
msgid "Configure proxy"
-msgstr "Konfigurer TCP/IP"
+msgstr "Konfigurer proxy"
-#: ../loader2/urls.c:321
-#, fuzzy
+#: ../loader2/urls.c:324
msgid "URL Setup"
-msgstr "NFS-oppsett"
+msgstr "URL-oppsett"
-#: ../loader2/urls.c:329
-#, fuzzy
+#: ../loader2/urls.c:332
msgid "You must enter a URL."
-msgstr "Du må skrive inn en katalog."
+msgstr "Du må oppgi en URL."
-#: ../loader2/urls.c:339
+#: ../loader2/urls.c:342
msgid "Unknown Host"
msgstr "Ukjent vert"
-#: ../loader2/urls.c:340
+#: ../loader2/urls.c:343
#, c-format
msgid "%s is not a valid hostname."
msgstr "%s er ikke et gyldig vertsnavn."
-#: ../loader2/urls.c:386
+#: ../loader2/urls.c:389
msgid ""
"If you are using a HTTP proxy server enter the name of the HTTP proxy server "
"to use."
@@ -6519,18 +6459,17 @@ msgstr ""
"Hvis du bruker en HTTP-proxytjener, skriv inn navnet til HTTP-proxytjeneren "
"som skal brukes."
-#: ../loader2/urls.c:401
+#: ../loader2/urls.c:404
msgid "Proxy Name:"
-msgstr ""
+msgstr "Navn på proxy:"
-#: ../loader2/urls.c:406
+#: ../loader2/urls.c:409
msgid "Proxy Port:"
-msgstr ""
+msgstr "Port for proxy:"
-#: ../loader2/urls.c:422
-#, fuzzy
+#: ../loader2/urls.c:425
msgid "Further Setup"
-msgstr "Videre FTP-oppsett"
+msgstr "Videre oppsett"
#: ../loader2/windows.c:63
msgid "Loading SCSI driver"
@@ -6541,19 +6480,6 @@ msgstr "Laster SCSI-driver"
msgid "Loading %s driver..."
msgstr "Laster driver %s..."
-#: tmp/account.glade.h:2
-#, fuzzy
-msgid "Root Password:"
-msgstr "Root-passord"
-
-#: tmp/account.glade.h:3
-msgid ""
-"The root account is used for administering the system. Enter a password for "
-"the root user."
-msgstr ""
-"Root-kontoen brukes for å adminsitrere systemet. Oppgi et passord for denne "
-"brukeren."
-
#: tmp/adddrive.glade.h:1
msgid "Add _ZFCP LUN"
msgstr "Legg til _ZFCP-LUN"
@@ -6578,43 +6504,38 @@ msgstr "<b>_Navn på lager:</b>"
msgid "Add Repository"
msgstr "Legg til lager"
-#: tmp/addrepo.glade.h:3
-#, fuzzy
+#: tmp/addrepo.glade.h:4
+#, no-c-format
msgid ""
"Please provide the location where your additional software can be installed "
-"from."
+"from. Note that this must be a valid repository for %s."
msgstr ""
"Vennligst oppgi plassen hvor din ekstra programvare kan installere fra. Husk "
"at dette må være et gyldig lager for %s."
-#: tmp/addrepo.glade.h:4
+#: tmp/addrepo.glade.h:5
msgid "Proxy U_RL:"
-msgstr ""
+msgstr "Proxy-U_RL:"
-#: tmp/addrepo.glade.h:5
-#, fuzzy
+#: tmp/addrepo.glade.h:6
msgid "Proxy pass_word:"
-msgstr "Ingen passord"
+msgstr "Passord for pro_xy:"
-#: tmp/addrepo.glade.h:6
-#, fuzzy
+#: tmp/addrepo.glade.h:7
msgid "Proxy u_sername:"
-msgstr "Navn på FTP-område:"
+msgstr "Brukernavn for _proxy:"
-#: tmp/addrepo.glade.h:7
-#, fuzzy
+#: tmp/addrepo.glade.h:8
msgid "Repository _Mirror"
-msgstr "Legg til lager"
+msgstr "Speil for _lager"
-#: tmp/addrepo.glade.h:8
-#, fuzzy
+#: tmp/addrepo.glade.h:9
msgid "Repository _URL"
-msgstr "<b>_URL til lager:</b>"
+msgstr "URL til lager"
-#: tmp/addrepo.glade.h:9
-#, fuzzy
+#: tmp/addrepo.glade.h:10
msgid "_Proxy configuration"
-msgstr "Konfigurasjon av mus"
+msgstr "Konfigurasjon av _proxy"
#: tmp/anaconda.glade.h:1
msgid "Reboo_t"
@@ -6625,11 +6546,6 @@ msgid "_Next"
msgstr "_Neste"
#: tmp/autopart.glade.h:1
-#, fuzzy
-msgid "<b>Resize _target:</b>"
-msgstr "<b>_Navn på lager:</b>"
-
-#: tmp/autopart.glade.h:2
msgid ""
"Installation requires partitioning of your hard drive. By default, a "
"partitioning layout is chosen which is reasonable for most users. You can "
@@ -6639,99 +6555,45 @@ msgstr ""
"partisjoner er ok for de fleste brukere. Du kan velge å bruke denne eller å "
"lage din egen."
-#: tmp/autopart.glade.h:3
+#: tmp/autopart.glade.h:2
msgid "Re_view and modify partitioning layout"
msgstr "Se o_ver og endre utforming av partisjoner"
-#: tmp/autopart.glade.h:4
-#, fuzzy
+#: tmp/autopart.glade.h:3
msgid "What drive would you like to _boot this installation from?"
-msgstr "Hvilken enhet vil du starte opp denne installasjonen fra?"
+msgstr "Hvilken enhet _vil du starte opp denne installasjonen fra?"
-#: tmp/autopart.glade.h:5
-msgid "Which Partition to resize"
-msgstr ""
-
-#: tmp/autopart.glade.h:6
-#, fuzzy
-msgid ""
-"Which partition would you like to resize to make room for your installation?"
-msgstr "Hvilken partisjon inneholder rotpartisjonen til din installasjon?"
-
-#: tmp/autopart.glade.h:7
+#: tmp/autopart.glade.h:4
msgid "_Advanced storage configuration"
msgstr "_Avansert konfigurasjon av lagring"
-#: tmp/autopart.glade.h:8
-#, fuzzy
+#: tmp/autopart.glade.h:5
msgid "_Encrypt system"
-msgstr "Krypteringsnøkkel"
+msgstr "Krypt_er systemet"
-#: tmp/autopart.glade.h:10
+#: tmp/autopart.glade.h:6
msgid "_Select the drive(s) to use for this installation."
msgstr "_Velg stasjonen(e) vil du bruke for denne installasjonen."
-#: tmp/blwhere.glade.h:1
-#, fuzzy
-msgid "/boot"
-msgstr "Start på nytt"
-
-#: tmp/blwhere.glade.h:2
-#, fuzzy
-msgid "BIOS Drive Order"
-msgstr "Rediger rekkefølge på stasjonene"
-
-#: tmp/blwhere.glade.h:3
-#, fuzzy
-msgid "Boot loader device"
-msgstr "Oppstartslaster"
-
-#: tmp/blwhere.glade.h:4
-msgid "First BIOS drive:"
-msgstr ""
-
-#: tmp/blwhere.glade.h:5
-msgid "Fourth BIOS drive:"
-msgstr ""
-
-#: tmp/blwhere.glade.h:6
-msgid "MBR"
-msgstr ""
-
-#: tmp/blwhere.glade.h:7
-msgid "Second BIOS drive:"
-msgstr ""
-
-#: tmp/blwhere.glade.h:8
-msgid "Third BIOS drive:"
-msgstr ""
-
-#: tmp/blwhere.glade.h:9
-#, fuzzy
-msgid "Where would you like to install the boot loader for your system?"
-msgstr "Hvor vil du installere oppstartslasteren?"
-
#: tmp/detailed-dialog.glade.h:1
-#, fuzzy
msgid "Info"
-msgstr "Overse"
+msgstr "Informasjon"
#: tmp/detailed-dialog.glade.h:2
msgid "_Details"
-msgstr ""
+msgstr "_Detaljer"
#: tmp/exnSave.glade.h:2
msgid "Select a destination for the exception information."
-msgstr ""
+msgstr "Velg et mål for unntaksinformasjonen."
#: tmp/exnSave.glade.h:3
msgid "_Disk"
-msgstr ""
+msgstr "_Disk"
#: tmp/exnSave.glade.h:4
-#, fuzzy
msgid "_Remote"
-msgstr "Ekstern"
+msgstr "Ekste_rn"
#: tmp/instkey.glade.h:2
#, no-c-format
@@ -6779,20 +6641,19 @@ msgstr "Installer til harddisk"
msgid ""
"Choose a passphrase for this encrypted partition. You will be prompted for "
"the passphrase during system boot."
-msgstr ""
+msgstr "Velg et passord for denne krypterte partisjonen. Du vil bli spurt om dette passordet når systemet startes."
#: tmp/lukspassphrase.glade.h:2
-#, fuzzy
msgid "Confirm passphrase:"
-msgstr "Bekreft nullstilling"
+msgstr "Bekreft passord:"
#: tmp/lukspassphrase.glade.h:3
msgid "Enter passphrase for encrypted partition"
-msgstr ""
+msgstr "Oppgi passord for kryptert partisjon"
#: tmp/lukspassphrase.glade.h:4
msgid "Enter passphrase:"
-msgstr ""
+msgstr "Oppgi passord:"
#: tmp/netconfig.glade.h:2
msgid "<b>Gateway:</b>"
@@ -6889,9 +6750,8 @@ msgid "_Customize now"
msgstr "Tilpass _nå"
#: tmp/tasksel.glade.h:8
-#, fuzzy
msgid "_Modify repository"
-msgstr "_Legg til lager"
+msgstr "E_ndre lager"
#: tmp/zfcp-config.glade.h:1
msgid "<b>Device number:</b>"
@@ -7146,7 +7006,7 @@ msgstr "Zulu"
#~ msgid ""
#~ "You have specified an install method which isn't supported by anaconda."
#~ msgstr ""
-#~ "Du har oppgitt en installasjonsmetode som ikke er støttet av anaconda."
+#~ "Du har oppgitt en installasjonsmetode som ikke er støttet av anaconda."
#~ msgid "unknown install method: %s"
#~ msgstr "ukjent installasjonsmetode: %s"
@@ -7156,22 +7016,22 @@ msgstr "Zulu"
#~ "drives:%s\n"
#~ "Are you sure you want to do this?"
#~ msgstr ""
-#~ "Du har valgt å fjerne alle partisjoner (ALLE DATA) på følgende stasjoner:%"
+#~ "Du har valgt å fjerne alle partisjoner (ALLE DATA) på følgende stasjoner:%"
#~ "s\n"
#~ "\n"
-#~ "Er du sikker på at du vil gjøre dette?"
+#~ "Er du sikker på at du vil gjøre dette?"
#~ msgid ""
#~ "You have chosen to remove all Linux partitions (and ALL DATA on them) on "
#~ "the following drives:%s\n"
#~ "Are you sure you want to do this?"
#~ msgstr ""
-#~ "Du har valgt å fjerne alle Linux-partisjoner (og ALLE DATA på dem) på "
-#~ "følgende stasjoner:%s\n"
-#~ "Er du sikker på at du ønsker å gjøre dette?"
+#~ "Du har valgt å fjerne alle Linux-partisjoner (og ALLE DATA på dem) på "
+#~ "følgende stasjoner:%s\n"
+#~ "Er du sikker på at du ønsker å gjøre dette?"
#~ msgid "Checking for Bad Blocks"
-#~ msgstr "Leter etter dårlige blokker"
+#~ msgstr "Leter etter dårlige blokker"
#~ msgid ""
#~ "Bad blocks have been detected on device /dev/%s. We do not recommend you "
@@ -7179,10 +7039,10 @@ msgstr "Zulu"
#~ "\n"
#~ "Press <Enter> to exit the installer."
#~ msgstr ""
-#~ "Ugyldige blokker ble funnet på enhet /dev/%s. Vi anbefaler at du ikke "
+#~ "Ugyldige blokker ble funnet på enhet /dev/%s. Vi anbefaler at du ikke "
#~ "bruker denne enheten.\n"
#~ "\n"
-#~ "Trykk <Linjeskift> for å avslutte installasjonsprogrammet."
+#~ "Trykk <Linjeskift> for å avslutte installasjonsprogrammet."
#~ msgid ""
#~ "An error occurred searching for bad blocks on %s. This problem is "
@@ -7190,17 +7050,17 @@ msgstr "Zulu"
#~ "\n"
#~ "Press <Enter> to exit the installer."
#~ msgstr ""
-#~ "En feil oppstod under søk etter dårlige blokker på %s. Dette problemet er "
+#~ "En feil oppstod under søk etter dårlige blokker på %s. Dette problemet er "
#~ "alvorlig, og installasjonen kan ikke fortsette.\n"
#~ "\n"
-#~ "Trykk <Linjeskift> for å avslutte installasjonsprogrammet."
+#~ "Trykk <Linjeskift> for å avslutte installasjonsprogrammet."
#~ msgid ""
#~ "Please insert a floppy now. All contents of the disk will be erased, so "
#~ "please choose your diskette carefully."
#~ msgstr ""
-#~ "Vennligst sett inn en diskett. Alt innhold på disketten vil slettes, så "
-#~ "vær forsiktig når du velger diskett."
+#~ "Vennligst sett inn en diskett. Alt innhold på disketten vil slettes, så "
+#~ "vær forsiktig når du velger diskett."
#~ msgid ""
#~ "The file %s cannot be opened. This is due to a missing file or perhaps a "
@@ -7211,12 +7071,12 @@ msgstr "Zulu"
#~ "likely require reinstallation.\n"
#~ "\n"
#~ msgstr ""
-#~ "Filen %s kan ikke åpnes. Det kan være pga at filen mangler eller at "
+#~ "Filen %s kan ikke åpnes. Det kan være pga at filen mangler eller at "
#~ "pakken er korrupt. Sjekk at du har alle installasjonsmediene og at disse "
#~ "er i god stand.\n"
#~ "\n"
-#~ "Hvis du avslutter, vil systemet sannsynligvis måtte reinstalleres da det "
-#~ "ikke er i en konsistent tilstand nå.\n"
+#~ "Hvis du avslutter, vil systemet sannsynligvis måtte reinstalleres da det "
+#~ "ikke er i en konsistent tilstand nå.\n"
#~ "\n"
#~ msgid ""
@@ -7226,11 +7086,11 @@ msgstr "Zulu"
#~ "Please copy this image to the remote server's share path and click Retry. "
#~ "Click Exit to abort the installation."
#~ msgstr ""
-#~ "Installasjonen har prøvd å montere bildefilen #%s, men kan ikke finne det "
-#~ "på tjeneren.\n"
+#~ "Installasjonen har prøvd å montere bildefilen #%s, men kan ikke finne det "
+#~ "på tjeneren.\n"
#~ "\n"
-#~ "Vennligst kopier dette bildet til den utdelte katalogen på den eksterne "
-#~ "tjeneren og klikk på «Prøv på nytt». Klikk på «Avslutt» for å avbryte "
+#~ "Vennligst kopier dette bildet til den utdelte katalogen på den eksterne "
+#~ "tjeneren og klikk på «Prøv på nytt». Klikk på «Avslutt» for å avbryte "
#~ "installasjonen."
#~ msgid ""
@@ -7240,9 +7100,9 @@ msgstr "Zulu"
#~ "disk or use any partitions beyond /dev/%s15 in %s"
#~ msgstr ""
#~ "Enheten /dev/%s har flere enn 15 partisjoner. SCSI-subsystemet i Linux-"
-#~ "kjernen tillater ikke flere enn 15 partisjoner for øyeblikket. Du vil "
-#~ "ikke ha mulighet til å gjøre endringer i partisjoneringen av denne "
-#~ "enheten eller bruke noen partisjoner etter /dev/%s15 på %s."
+#~ "kjernen tillater ikke flere enn 15 partisjoner for øyeblikket. Du vil "
+#~ "ikke ha mulighet til å gjøre endringer i partisjoneringen av denne "
+#~ "enheten eller bruke noen partisjoner etter /dev/%s15 på %s."
#~ msgid "Low Memory"
#~ msgstr "Lite minne"
@@ -7252,9 +7112,9 @@ msgstr "Zulu"
#~ "space immediately. To do this we'll have to write your new partition "
#~ "table to the disk immediately. Is that OK?"
#~ msgstr ""
-#~ "Siden du ikke har mye minne på denne maskinen, må vi benytte et swap-"
-#~ "område med en gang. For å gjøre dette må vi skrive den nye "
-#~ "partisjonstabellen til disken nå. Er dette ok?"
+#~ "Siden du ikke har mye minne på denne maskinen, må vi benytte et swap-"
+#~ "område med en gang. For å gjøre dette må vi skrive den nye "
+#~ "partisjonstabellen til disken nå. Er dette ok?"
#~ msgid "Save to Remote Host"
#~ msgstr "Lagre til ekstern vert"
@@ -7263,7 +7123,7 @@ msgstr "Zulu"
#~ msgstr "Lagre krasjdump"
#~ msgid "Searching"
-#~ msgstr "Søker"
+#~ msgstr "Søker"
#~ msgid "Searching for %s installations..."
#~ msgstr "Leter etter installert %s..."
@@ -7280,11 +7140,11 @@ msgstr "Zulu"
#~ "likely require reinstallation.\n"
#~ "\n"
#~ msgstr ""
-#~ "Filen %s kan ikke åpnes. Det kan være pga en manglende fil eller at "
+#~ "Filen %s kan ikke åpnes. Det kan være pga en manglende fil eller at "
#~ "pakken er korrupt. Vennligst bekreft at ditt dataspeil inneholder alle "
-#~ "pakkene, og forsøk å bruke en annen en.\n"
+#~ "pakkene, og forsøk å bruke en annen en.\n"
#~ "\n"
-#~ "Hvis du avslutter, vil systemet være i en inkonsistent tilstand, som "
+#~ "Hvis du avslutter, vil systemet være i en inkonsistent tilstand, som "
#~ "sannsynligvis vil kreve en reinstallasjon.\n"
#~ "\n"
@@ -7296,9 +7156,9 @@ msgstr "Zulu"
#~ "\n"
#~ "Press <return> to reboot your system.\n"
#~ msgstr ""
-#~ "Du må oppgi et passord på minst 6 tegn for VNC.\n"
+#~ "Du må oppgi et passord på minst 6 tegn for VNC.\n"
#~ "\n"
-#~ "Trykk <linjeskift> for å starte systemet på nytt.\n"
+#~ "Trykk <linjeskift> for å starte systemet på nytt.\n"
#~ msgid "Unable to set vnc password - using no password!"
#~ msgstr "Kan ikke sette passord for vnc - starter uten passord!"
@@ -7307,69 +7167,16 @@ msgstr "Zulu"
#~ msgstr "Sjekk at passord for root er minst 6 tegn langt."
#~ msgid "Please connect to %s to begin the install..."
-#~ msgstr "Vennligst koble til %s for å starte installasjonen..."
+#~ msgstr "Vennligst koble til %s for å starte installasjonen..."
#~ msgid "Please connect to begin the install..."
-#~ msgstr "Vennligst koble til for å starte installasjonen..."
-
-#~ msgid "Set Root Password"
-#~ msgstr "Sett passord for root"
-
-#~ msgid "Advanced Boot Loader Configuration"
-#~ msgstr "Avansert konfigurasjon av oppstartslaster"
-
-#~ msgid "Force LBA32"
-#~ msgstr "Bruk LBA32"
-
-#~ msgid "_Force LBA32 (not normally required)"
-#~ msgstr "_Tvungen bruk av LBA32 (ikke vanligvis nødvendig)"
-
-#~ msgid ""
-#~ "If you wish to add default options to the boot command, enter them into "
-#~ "the 'General kernel parameters' field."
-#~ msgstr ""
-#~ "Hvis du ønsker å legge til forvalgte flagg til oppstartskommandoen "
-#~ "skriver du dem inn i feltet «Generelle kjerneparametere»."
-
-#~ msgid "_General kernel parameters"
-#~ msgstr "_Generelle parametere for kjernen"
-
-#~ msgid "The %s boot loader will be installed on /dev/%s."
-#~ msgstr "Oppstartslasteren %s vil bli installert på /dev/%s."
-
-#~ msgid "No boot loader will be installed."
-#~ msgstr "Ingen oppstartslaster vil bli installert."
-
-#~ msgid "Configure advanced boot loader _options"
-#~ msgstr "Konfigurasjon av avanserte alternativer for _oppstartslaster"
-
-#~ msgid "Install Boot Loader record on:"
-#~ msgstr "Installer oppstartslaster på:"
-
-#~ msgid "_Change Drive Order"
-#~ msgstr "_Endre rekkefølge på stasjonene"
-
-#~ msgid ""
-#~ "Arrange the drives to be in the same order as used by the BIOS. Changing "
-#~ "the drive order may be useful if you have multiple SCSI adapters or both "
-#~ "SCSI and IDE adapters and want to boot from the SCSI device.\n"
-#~ "\n"
-#~ "Changing the drive order will change where the installation program "
-#~ "locates the Master Boot Record (MBR)."
-#~ msgstr ""
-#~ "Plasser stasjonene i samme rekkefølge som brukt av BIOS. Endring av "
-#~ "rekkefølgen for stasjonene kan være nyttig hvis du har flere SCSI-kort "
-#~ "eller både SCSI og IDE-kontrollere og ønsker å starte opp fra SCSI-"
-#~ "enheten.\n"
-#~ "\n"
-#~ "Endring av rekkefølgen for stasjonene vil forandre på hvor "
-#~ "installasjonsprogrammet leter etter Master Boot Record (MBR)."
+#~ msgstr "Vennligst koble til for å starte installasjonen..."
#~ msgid "About to Install"
-#~ msgstr "Klar til å installere"
+#~ msgstr "Klar til å installere"
#~ msgid "Click next to begin installation of %s."
-#~ msgstr "Klikk neste for å starte installasjonen av %s."
+#~ msgstr "Klikk neste for å starte installasjonen av %s."
#~ msgid ""
#~ "A complete log of the installation can be found in the file '%s' after "
@@ -7378,54 +7185,36 @@ msgstr "Zulu"
#~ "A kickstart file containing the installation options selected can be "
#~ "found in the file '%s' after rebooting the system."
#~ msgstr ""
-#~ "En full logg av installeringen vil finnes i filen «%s» etter omstart av "
+#~ "En full logg av installeringen vil finnes i filen «%s» etter omstart av "
#~ "systemet.\n"
#~ "\n"
#~ "En kickstart-fil som inneholder de valgte installeringsopsjonene vil "
-#~ "finnes i «%s»."
+#~ "finnes i «%s»."
#~ msgid "About to Upgrade"
-#~ msgstr "Klar til å oppgradere"
+#~ msgstr "Klar til å oppgradere"
#~ msgid "Click next to begin upgrade of %s."
-#~ msgstr "Klikk neste for å starte oppgradering av %s."
+#~ msgstr "Klikk neste for å starte oppgradering av %s."
#~ msgid ""
#~ "A complete log of the upgrade can be found in the file '%s' after "
#~ "rebooting your system."
#~ msgstr ""
-#~ "En komplett logg av oppgraderingen kan finnes i filen «%s» etter omstart "
+#~ "En komplett logg av oppgraderingen kan finnes i filen «%s» etter omstart "
#~ "av systemet."
-#~ msgid "Drive"
-#~ msgstr "Stasjon"
-
-#~ msgid "Model"
-#~ msgstr "Modell"
-
#~ msgid "Netmask"
#~ msgstr "Nettmaske"
-#~ msgid ""
-#~ "You can configure the boot loader to boot other operating systems by "
-#~ "selecting from the list. To add an operating systems that was not "
-#~ "automatically detected, click 'Add.' To change the operating system "
-#~ "booted by default, select 'Default' next to the desired operating system."
-#~ msgstr ""
-#~ "Du kan konfigurere oppstartslasteren til å starte andre operativsystemer, "
-#~ "ved å velge fra listen. For å legge til flere operativsystemer som ikke "
-#~ "detekteres automatisk, klikker du på «Legg til». For å endre hvilket "
-#~ "operativsystem som settes som forvalgt, velger du «Forvalgt» for ønsket "
-#~ "operativsystem."
-
#~ msgid "Leave _unchanged (preserve data)"
-#~ msgstr "La den være _uendret (ta vare på data)"
+#~ msgstr "La den være _uendret (ta vare på data)"
#~ msgid "_Format partition as:"
#~ msgstr "_Formater partisjon som:"
#~ msgid "Check for _bad blocks?"
-#~ msgstr "Sjekk etter _dårlige blokker?"
+#~ msgstr "Sjekk etter _dårlige blokker?"
#~ msgid "Release notes are missing.\n"
#~ msgstr "Merknader for denne utgaven mangler.\n"
@@ -7465,15 +7254,15 @@ msgstr "Zulu"
#~ msgstr "%s, %s"
#~ msgid "Check for bad blocks"
-#~ msgstr "Sjekk etter dårlige blokker"
+#~ msgstr "Sjekk etter dårlige blokker"
#~ msgid ""
#~ "No hard drives have been found. You probably need to manually choose "
#~ "device drivers for the installation to succeed. Would you like to select "
#~ "drivers now?"
#~ msgstr ""
-#~ "Ingen harddisker ble funnet. Du må sannsynligvis velge en enhetsdriver "
-#~ "manuelt for å kunne fortsette installasjonen. Vil du velge drivere nå?"
+#~ "Ingen harddisker ble funnet. Du må sannsynligvis velge en enhetsdriver "
+#~ "manuelt for å kunne fortsette installasjonen. Vil du velge drivere nå?"
#~ msgid "FAILED"
#~ msgstr "FEILET"
@@ -7484,15 +7273,15 @@ msgstr "Zulu"
#~ "try again. If this test continues to fail you should not continue the "
#~ "install."
#~ msgstr ""
-#~ "Bildet som ble testet inneholder feil. Dette kan være pga. en korrupt "
-#~ "nedlasting eller en dårlig plate. Hvis mulig, rens CD'en og prøv igjen. "
-#~ "Hvis denne testen fortsatt feiler bør du ikke fortsette installasjonen."
+#~ "Bildet som ble testet inneholder feil. Dette kan være pga. en korrupt "
+#~ "nedlasting eller en dårlig plate. Hvis mulig, rens CD'en og prøv igjen. "
+#~ "Hvis denne testen fortsatt feiler bør du ikke fortsette installasjonen."
#~ msgid "PASSED"
#~ msgstr "OK"
#~ msgid "It is OK to install from this media."
-#~ msgstr "Det er ok å installere fra dette mediet."
+#~ msgstr "Det er ok å installere fra dette mediet."
#~ msgid "No checksum information available, unable to verify media."
#~ msgstr "Ingen sjekksum tilgjengelig, kunne ikke kontrollere medie."
@@ -7525,10 +7314,10 @@ msgstr "Zulu"
#~ " o the directory on that server containing\n"
#~ " %s for your architecture\n"
#~ msgstr ""
-#~ "Skriv inn følgende informasjon:\n"
+#~ "Skriv inn følgende informasjon:\n"
#~ "\n"
#~ " o navnet eller IP-adressen til din %s-tjener\n"
-#~ " o katalogen på den tjeneren som inneholder\n"
+#~ " o katalogen på den tjeneren som inneholder\n"
#~ " %s for din arkitektur\n"
#~ msgid "FTP"
@@ -7538,7 +7327,7 @@ msgstr "Zulu"
#~ msgstr "Web"
#~ msgid "Web site name:"
-#~ msgstr "Navn på WWW-område:"
+#~ msgstr "Navn på WWW-område:"
#~ msgid "Use non-anonymous ftp"
#~ msgstr "Bruk ikke-anonym ftp"
@@ -7550,14 +7339,14 @@ msgstr "Zulu"
#~ msgstr "HTTP-oppsett"
#~ msgid "You must enter a server name."
-#~ msgstr "Du må skrive inn et tjenernavn."
+#~ msgstr "Du må skrive inn et tjenernavn."
#~ msgid ""
#~ "If you are using non anonymous ftp, enter the account name and password "
#~ "you wish to use below."
#~ msgstr ""
#~ "Hvis du bruker ikke-anonym ftp, skriv inn kontonavnet og passordet du "
-#~ "ønsker å bruke nedenfor. Hvis du bruker en FTP-proxy, skriv inn navnet "
+#~ "ønsker å bruke nedenfor. Hvis du bruker en FTP-proxy, skriv inn navnet "
#~ "til FTP-proxytjeneren som skal brukes."
#~ msgid "Account name:"
diff --git a/po/pa.po b/po/pa.po
index 0f29bb4f1..fccb2cede 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -13,7 +13,7 @@ msgstr ""
"Project-Id-Version: pa\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-03-02 12:12-0500\n"
-"PO-Revision-Date: 2008-03-11 12:42+0530\n"
+"PO-Revision-Date: 2008-03-13 12:11+0530\n"
"Last-Translator: Jaswinder Singh <jsingh@redhat.com>\n"
"Language-Team: Punjabi <fedora-trans-pa@redhat.com>\n"
"MIME-Version: 1.0\n"
@@ -27,14 +27,14 @@ msgstr ""
"\n"
#: ../anaconda:289
-#, fuzzy, c-format
+#, c-format
msgid "Error processing %%ksappend lines: %s"
-msgstr "ਕਿੱਕਸਟਾਰਟ ਫਾਇਲ %s ਖੋਲ੍ਹਣ ਵਿੱਚ ਅਸਫਲ: %s"
+msgstr "%%ksappend ਸਤਰਾਂ ਖੋਲ੍ਹਣ ਵਿੱਚ ਅਸਫਲ: %s"
#: ../anaconda:292
#, c-format
msgid "Unknown error processing %%ksappend lines: %s"
-msgstr ""
+msgstr "%%ksappend ਸਤਰਾਂ ਵਰਤਣ ਦੌਰਾਨ ਅਣਪਛਾਤੀ ਗਲਤੀ ਆਈ ਹੈ: %s"
#: ../anaconda:306 ../cmdline.py:78 ../gui.py:1174 ../text.py:508
#, c-format, python-format
@@ -132,35 +132,26 @@ msgid ""
"\n"
"%s"
msgstr ""
+"ਭਾਗ %s ਮੁੜ-ਅਕਾਰ ਦੌਰਾਨ ਗਲਤੀ।\n"
+"\n"
+"%s"
#: ../autopart.py:896
#, python-format
msgid "Start of partition %s was moved when resizing"
-msgstr ""
+msgstr "ਮੁੜ-ਅਕਾਰ ਦੌਰਾਨ %s ਦੀ ਸ਼ੁਰੂਆਤ ਤਬਦੀਲੀ ਹੋ ਗਈ ਸੀ"
#: ../autopart.py:988
-#, fuzzy
msgid "Could not allocate cylinder-based partitions as primary partitions.\n"
-msgstr ""
-"ਸਿਲੰਡਰ ਤੇ ਅਧਾਰਿਤ ਭਾਗਾਂ ਨੂੰ ਮੁੱਢਲੇ ਭਾਗਾਂ ਦੇ ਤੌਰ ਤੇ ਨਹੀਂ ਵਰਤਿਆ ਜਾ ਸਕਦਾ ਹੈ।\n"
-"\n"
-"%s"
+msgstr "ਸਿਲੰਡਰ ਤੇ ਅਧਾਰਿਤ ਭਾਗਾਂ ਨੂੰ ਪਰਾਇਮਰੀ ਭਾਗਾਂ ਦੇ ਤੌਰ ਤੇ ਨਹੀਂ ਵਰਤਿਆ ਜਾ ਸਕਦਾ ਹੈ।\n"
#: ../autopart.py:993
-#, fuzzy
msgid "Could not allocate partitions as primary partitions.\n"
-msgstr ""
-"ਭਾਗਾਂ ਨੂੰ ਮੁੱਢਲੇ ਭਾਗਾਂ ਦੇ ਤੌਰ ਤੇ ਨਹੀਂ ਵਰਤਿਆ ਜਾ ਸਕਦਾ ਹੈ।\n"
-"\n"
-"%s"
+msgstr "ਭਾਗਾਂ ਨੂੰ ਪਰਾਇਮਰੀ ਭਾਗਾਂ ਦੇ ਤੌਰ ਤੇ ਨਹੀਂ ਵਰਤਿਆ ਜਾ ਸਕਦਾ ਹੈ।\n"
#: ../autopart.py:998
-#, fuzzy
msgid "Could not allocate cylinder-based partitions.\n"
-msgstr ""
-"ਸਿਲੰਡਰ ਅਧਾਰਿਤ ਭਾਗਾਂ ਨੂੰ ਨਹੀਂ ਵਰਤਿਆ ਜਾ ਸਕਦਾ ਹੈ\n"
-"\n"
-"%s"
+msgstr "ਸਿਲੰਡਰ ਅਧਾਰਿਤ ਭਾਗਾਂ ਨੂੰ ਨਹੀਂ ਵਰਤਿਆ ਜਾ ਸਕਦਾ ਹੈ\n"
#: ../autopart.py:1063
#, python-format
@@ -422,15 +413,15 @@ msgid "Warning"
msgstr "ਚੇਤਾਵਨੀ"
#: ../bootloader.py:45
-#, fuzzy
msgid ""
"Your filesystems have already been activated. You cannot go back past this "
"point.\n"
"\n"
"Would you like to continue with the installation?"
msgstr ""
-"ਵਿਭਾਗੀਕਰਨ ਚੋਣ, ਜੋ ਤੁਸੀਂ ਕੀਤੀ ਹੈ, ਪਹਿਲਾਂ ਹੀ ਸਰਗਰਮ ਹੋ ਚੁੱਕੀ ਹੈ। ਤੁਸੀਂ ਡਿਸਕ ਨੂੰ ਸੋਧ ਕਰਨ ਲਈ ਹੁਣ "
-"ਉਸ ਪਰਦੇ ਤੇ ਵਾਪਿਸ ਨਹੀਂ ਜਾ ਸਕਦੇ ਹੋ। ਕੀ ਤੁਸੀਂ ਇੰਸਟਾਲੇਸ਼ਨ ਕਾਰਵਾਈ ਨਾਲ ਜਾਰੀ ਰਹਿਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
+"ਤੁਹਾਡਾ ਫਾਇਲ ਸਿਸਟਮ ਸਰਗਰਮ ਹੋ ਗਿਆ ਹੈ। ਤੁਸੀਂ ਇਸ ਪਗ ਤੋਂ ਪਿੱਛੇ ਨਹੀਂ ਜਾ ਸਕਦੇ।\n"
+"\n"
+"ਕੀ ਤੁਸੀਂ ਇੰਸਟਾਲੇਸ਼ਨ ਜਾਰੀ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
#: ../bootloader.py:49 ../exception.py:348 ../exception.py:364
#: ../fsset.py:1675 ../fsset.py:1929 ../fsset.py:2660 ../fsset.py:2667
@@ -479,29 +470,25 @@ msgid "Parted exceptions can't be handled in command line mode!"
msgstr "ਭਾਗ ਅਪਵਾਦ ਨੂੰ ਕਮਾਂਡ ਲਾਈਨ ਢੰਗ ਵਿੱਚ ਕੰਟਰੋਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ!"
#: ../constants.py:75
-#, fuzzy
msgid ""
"An unhandled exception has occurred. This is most likely a bug. Please "
"save a copy of the detailed exception and file a bug report"
-msgstr ""
-"ਇੱਕ ਨਾ-ਕੰਟੋਰਲ ਕੀਤਾ ਅਪਵਾਦ ਆਇਆ ਹੈ। ਇਹ ਬੱਗ ਹੋ ਸਕਦਾ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਅਪਵਾਦ ਬਾਰੇ ਵੇਰਵੇ ਦੀ "
-"ਨਕਲ ਸੰਭਾਲੋ ਅਤੇ %s ਉੱਤੇ ਐਨਾਕਾਂਡਾ ਲਈ ਬੱਗ ਰਿਪੋਰਟ ਦਿਓ।"
+msgstr "ਇੱਕ ਨਾ-ਕੰਟੋਰਲ ਕੀਤਾ ਅਪਵਾਦ ਆਇਆ ਹੈ। ਇਹ ਇੱਕ ਬੱਗ ਹੋ ਸਕਦਾ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਅਪਵਾਦ ਬਾਰੇ ਵੇਰਵੇ ਦੀ ਨਕਲ ਸੰਭਾਲੋ ਅਤੇ ਬੱਗ ਰਿਪੋਰਟ ਦਿਓ।"
#: ../constants.py:81
msgid " with the provider of this software."
-msgstr ""
+msgstr " ਇਸ ਸਾਫਟਵੇਅਰ ਦੇ ਵਿਕਰੇਤਾ ਸਮੇਤ।"
#: ../constants.py:85
-#, fuzzy, python-format
+#, python-format
msgid " against anaconda at %s"
-msgstr "ਐਨਾਕਾਂਡਾ ਅੱਪਡੇਟ ਪੜ੍ਹ ਰਿਹਾ ਹੈ..."
+msgstr "%s ਉੱਪਰ ਐਨਾਕਾਂਡਾ ਵਾਸਤੇ"
#: ../exception.py:344 ../exception.py:360
msgid "Dump Written"
msgstr "ਡੰਪ ਲਿਖਿਆ ਗਿਆ"
#: ../exception.py:345
-#, fuzzy
msgid ""
"Your system's state has been successfully written to the disk. The installer "
"will now exit."
@@ -512,7 +499,6 @@ msgid "Dump Not Written"
msgstr "ਡੰਪ ਨਹੀਂ ਲਿਖਿਆ ਗਿਆ"
#: ../exception.py:352
-#, fuzzy
msgid "There was a problem writing the system state to the disk."
msgstr "ਫਲਾਪੀ ਉੱਤੇ ਸਿਸਟਮ ਹਾਲਤ ਲਿਖਣ ਦੌਰਾਨ ਇੱਕ ਗਲਤੀ ਆਈ ਹੈ।"
@@ -536,9 +522,8 @@ msgid "Checking filesystem on %s..."
msgstr "%s 'ਤੇ ਫਾਇਲ ਸਿਸਟਮ ਦੀ ਜਾਂਚ ਹੋ ਰਹੀ ਹੈ..."
#: ../fsset.py:544 ../fsset.py:977
-#, fuzzy
msgid "Resizing"
-msgstr "ਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
+msgstr "ਮੁੜ-ਅਕਾਰ ਦੇ ਰਿਹਾ ਹੈ"
#: ../fsset.py:545 ../fsset.py:978
#, python-format
@@ -985,24 +970,22 @@ msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਕੁੰਜੀ"
#: ../gui.py:657 ../gui.py:665
msgid "Error with passphrase"
-msgstr "ਗੁਪਤ-ਕੋਡ ਵਿੱਚ ਗਲਤੀ"
+msgstr "ਪਾਸਵਰਡ ਵਿੱਚ ਗਲਤੀ"
#: ../gui.py:658
-#, fuzzy
msgid "The passphrases you entered were different. Please try again."
-msgstr "ਗੁਪਤ-ਕੋਡ, ਜੋ ਤੁਸੀਂ ਭਰੇ ਹਨ, ਵੱਖਰੇ-ਵੱਖਰੇ ਹਨ। ਮੁਡ਼ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜੀ।"
+msgstr "ਪਾਸਵਰਡ, ਜੋ ਤੁਸੀਂ ਭਰੇ ਹਨ, ਵੱਖਰੇ-ਵੱਖਰੇ ਹਨ। ਮੁਡ਼ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜੀ।"
#: ../gui.py:666
-#, fuzzy
msgid "The passphrase must be at least eight characters long."
-msgstr "ਗੁਪਤ-ਕੋਡ ਘੱਟੋ-ਘੱਟ 6 ਅੱਖਰਾਂ ਦਾ ਹੋਣਾ ਜ਼ਰੂਰੀ ਹੈ।"
+msgstr "ਪਾਸਵਰਡ ਘੱਟੋ-ਘੱਟ 6 ਅੱਖਰਾਂ ਦਾ ਹੋਣਾ ਜ਼ਰੂਰੀ ਹੈ।"
#: ../gui.py:692 ../text.py:275
#, python-format
msgid ""
"Device %s is encrypted. In order to access the device's contents during "
"installation you must enter the device's passphrase below."
-msgstr ""
+msgstr "ਜੰਤਰ %s ਇੰਕ੍ਰਿਪਟ ਕੀਤਾ ਹੈ। ਇੰਸਟਾਲੇਸ਼ਨ ਦੌਰਾਨ ਜੰਤਰ ਦੇ ਸੰਖੇਪ ਵਰਤਣ ਲਈ ਤੁਹਾਨੂੰ ਹੇਠਾਂ ਜੰਤਰ ਦਾ ਗੁਪਤਕੋਡ ਦੇਣਾ ਪਵੇਗਾ।"
#: ../gui.py:855 ../gui.py:856 ../gui.py:968 ../gui.py:969
#: tmp/anaconda.glade.h:2
@@ -1176,16 +1159,12 @@ msgid "Initializing iSCSI initiator"
msgstr "iSCSI ਸ਼ੁਰੂਆਤੀ ਨੂੰ ਚਾਲੂ ਕਰ ਰਿਹਾ ਹੈ"
#: ../kickstart.py:86
-#, fuzzy, python-format
+#, python-format
msgid ""
"There was an error running the kickstart script at line %s. You may examine "
"the output in %s. This is a fatal error and your install will be aborted. "
"Press the OK button to exit the installer."
-msgstr ""
-"scriptlet ਚਲਾਉਣ ਦੌਰਾਨ ਗਲਤੀ ਆਈ ਹੈ। ਤੁਸੀਂ %s ਵਿੱਚ ਆਉਟਪੁੱਟ ਵੇਖ ਸਕਦੇ ਹੋ। ਇਹ ਇੱਕ ਗੰਭੀਰ ਗਲਤੀ ਹੈ "
-"ਅਤੇ ਤੁਹਾਡੀ ਇੰਸਟਾਲੇਸ਼ਨ ਨੂੰ ਇਥੇ ਹੀ ਛੱਡਣਾ ਪੈ ਰਿਹਾ ਹੈ।\n"
-"\n"
-"ਇੰਸਟਾਲਰ ਤੋਂ ਬਾਹਰ ਆਉਣ ਲਈ 'ਠੀਕ ਹੈ' ਦਬਾਓ।"
+msgstr "ਕਿੱਕਸਟਾਰਟ ਸਕਰਿਪਟ ਚਲਾਉਣ ਦੌਰਾਨ ਸਤਰ %s ਤੇ ਗਲਤੀ ਆਈ ਹੈ। ਤੁਸੀਂ %s ਵਿੱਚ ਆਉਟਪੁੱਟ ਵੇਖ ਸਕਦੇ ਹੋ। ਇਹ ਇੱਕ ਗੰਭੀਰ ਗਲਤੀ ਹੈ ਅਤੇ ਤੁਹਾਡੀ ਇੰਸਟਾਲੇਸ਼ਨ ਨੂੰ ਇਥੇ ਹੀ ਛੱਡਣਾ ਪਵੇਗਾ। ਇੰਸਟਾਲਰ ਤੋਂ ਬਾਹਰ ਆਉਣ ਲਈ 'ਠੀਕ ਹੈ' ਦਬਾਓ।"
#: ../kickstart.py:101 ../kickstart.py:103
msgid "Scriptlet Failure"
@@ -1261,7 +1240,7 @@ msgstr "ਪੋਸਟ-ਇੰਸਟਾਲੇਸ਼ਨ ਫਾਇਲ ਸਿਸਟਮ
msgid ""
"The root filesystem you created is not large enough for this live image "
"(%.2f MB required)."
-msgstr ""
+msgstr "ਰੂਟ ਫਾਇਲ-ਸਿਸਟਮ ਜੋ ਤੁਸੀਂ ਬਣਾਇਆ ਹੈ, ਇਸ ਲਾਈਨ ਇਮੇਜ਼ ਲਈ ਕਾਫੀ ਨਹੀਂ ਹੈ (%.2f MB ਦੀ ਲੋੜ ਹੈ)।"
#: ../network.py:57
msgid "Hostname must be 64 or less characters in length."
@@ -1648,7 +1627,6 @@ msgid "You need to select at least one hard drive to install %s."
msgstr "ਤੁਹਾਨੂੰ %s ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਘੱਟੋ-ਘੱਟ ਇੱਕ ਹਾਰਡ ਡਰਾਈਵ ਦੀ ਚੋਣ ਕਰਨੀ ਪਵੇਗੀ।"
#: ../partIntfHelpers.py:416
-#, fuzzy
msgid ""
"You have chosen to use a pre-existing partition for this installation "
"without formatting it. We recommend that you format this partition to make "
@@ -1658,9 +1636,7 @@ msgid ""
"continue without formatting this partition."
msgstr ""
"ਤੁਸੀਂ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਭਾਗਾਂ ਨੂੰ ਫਾਰਮੈਟ ਕੀਤੇ ਬਿਨਾਂ ਇੰਸਟਾਲੇਸ਼ਨ ਦੀ ਚੋਣ ਕੀਤੀ ਹੈ। ਅਸੀਂ ਇਸ ਦੀ "
-"ਸਿਫਾਰਸ ਕਰਦੇ ਹਾਂ। ਤੁਸੀਂ ਇਸ ਨੂੰ ਫਾਰਮੈਟ ਕਰੋ ਤਾਂ ਕਿ ਪਹਿਲਾਂ ਮੌਜੂਦਾ ਓਪਰੇਟਿੰਗ ਸਿਸਟਮ ਨਾਲ ਲੀਨਕਸ ਦੀ "
-"ਇੰਸਟਾਲੇਸ਼ਨ ਦੌਰਾਨ ਕੋਈ ਸਮੱਸਿਆ ਨਾ ਆਵੇ। ਪਰ ਜੇਕਰ ਤੁਸੀਂ ਇਸ ਭਾਗ ਤੇ ਕੁਝ ਫਾਇਲ ਜਾਂ ਡਾਇਰੈਕਟਰੀਆਂ ਜਿਵੇ ਕਿ "
-"ਮੁੱਖ ਡਾਇਰੈਕਟਰੀਆਂ ਤਾਂ ਬੇਸ਼ੱਕ ਇਸ ਭਾਗ ਨੂੰ ਫਾਰਮੈਟ ਕੀਤੇ ਬਿਨਾਂ ਹੀ ਜਾਰੀ ਰੱਖੋ।"
+"ਸਿਫਾਰਸ ਕਰਦੇ ਹਾਂ ਕਿ ਤੁਸੀਂ ਇਸ ਨੂੰ ਫਾਰਮੈਟ ਕਰੋ ਤਾਂ ਕਿ ਪਹਿਲਾਂ ਮੌਜੂਦਾ ਓਪਰੇਟਿੰਗ ਸਿਸਟਮ ਨਾਲ ਲੀਨਕਸ ਦੀ ਇੰਸਟਾਲੇਸ਼ਨ ਨੂੰ ਕੋਈ ਸਮੱਸਿਆ ਨਾ ਆਵੇ। ਪਰ ਜੇਕਰ ਤੁਸੀਂ ਇਸ ਭਾਗ ਤੇ ਕੁਝ ਫਾਇਲ ਜਿਵੇ ਕਿ ਘਰੇਲੂ (home) ਡਾਇਰੈਕਟਰੀਆਂ ਤਾਂ ਬੇਸ਼ੱਕ ਇਸ ਭਾਗ ਨੂੰ ਫਾਰਮੈਟ ਕੀਤੇ ਬਿਨਾਂ ਹੀ ਜਾਰੀ ਰੱਖੋ।"
#: ../partIntfHelpers.py:424
msgid "Format?"
@@ -1779,24 +1755,22 @@ msgstr ""
"ਉਸ ਪਰਦੇ ਤੇ ਵਾਪਿਸ ਨਹੀਂ ਜਾ ਸਕਦੇ ਹੋ। ਕੀ ਤੁਸੀਂ ਇੰਸਟਾਲੇਸ਼ਨ ਕਾਰਵਾਈ ਨਾਲ ਜਾਰੀ ਰਹਿਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
#: ../partitions.py:113
-#, fuzzy
msgid "Writing partitioning to disk"
-msgstr "ਭਾਗ ਮਾਈਗਰੇਟ(_G):"
+msgstr "ਡਿਸਕ ਉੱਪਰ ਭਾਗ ਲਿਖ ਰਿਹਾ ਹੈ"
#: ../partitions.py:114
msgid ""
"The partitioning options you have selected will now be written to disk. Any "
"data on deleted or reformatted partitions will be lost"
-msgstr ""
+msgstr "ਵਿਭਾਗੀਕਰਨ ਚੋਣਾਂ ਜੋ ਤੁਸੀਂ ਚੁਣੀਆਂ ਹਨ ਹੁਣ ਡਿਸਕ ਤੇ ਲਿਖੀਆਂ ਜਾਣਗੀਆਂ। ਹਟਾਈ ਜਾਣ ਮੁੜ-ਫਾਰਮੈਟ ਕੀਤੇ ਭਾਗ ਦਾ ਡਾਟਾ ਨਸ਼ਟ ਹੋ ਜਾਵੇਗਾ"
#: ../partitions.py:119
-#, fuzzy
msgid "Go _back"
-msgstr "ਪਿੱਛੇ(_B)"
+msgstr "ਪਿੱਛੇ ਜਾਓ(_b)"
#: ../partitions.py:120
msgid "_Write changes to disk"
-msgstr ""
+msgstr "ਤਬਦੀਲੀ ਨੂੰ ਡਿਸਕ ਤੇ ਲਿਖੋ(_W)"
#: ../partitions.py:200 ../textw/constants_text.py:50
#: ../loader2/cdinstall.c:335 ../loader2/driverdisk.c:236
@@ -1818,9 +1792,8 @@ msgid "Continue"
msgstr "ਜਾਰੀ ਰੱਖੋ"
#: ../partitions.py:204
-#, fuzzy
msgid "Confirm"
-msgstr "ਪੁਸ਼ਟੀ:"
+msgstr "ਪੁਸ਼ਟੀ"
#: ../partitions.py:205
#, python-format
@@ -1830,6 +1803,9 @@ msgid ""
"If you skip this step the device's contents will not be available during "
"installation."
msgstr ""
+"ਕੀ ਤੁਸੀਂ ਯਕੀਨਨ ਜੰਤਰ %s ਲਈ ਗੁਪਤਕੋਡ ਨਹੀਂ ਦੇਣ ਚਾਹੁੰਦੇ?\n"
+"\n"
+"ਜੇ ਤੁਸੀਂ ਇਹ ਪਗ ਛੱਡ ਦਿੱਤਾ ਤਾਂ ਜੰਤਰ ਦੇ ਸੰਖੇਪ ਇੰਸਟਾਲੇਸ਼ਨ ਦੌਰਾਨ ਉਪਲੱਬਧ ਨਹੀਂ ਹੋਣਗੇ।"
#: ../partitions.py:1019
#, python-format
@@ -1891,19 +1867,17 @@ msgid "Bootable partitions cannot be on a logical volume."
msgstr "ਬੂਟ-ਹੋਣ-ਯੋਗ ਭਾਗ ਲਾਜ਼ੀਕਲ ਵਾਲੀਅਮ ਤੇ ਮੌਜੂਦ ਨਹੀਂ ਹੋ ਸਕਦਾ ਹੈ।"
#: ../partitions.py:1196
-#, fuzzy
msgid "Bootable partitions cannot be on a RAID device."
-msgstr "ਬੂਟ-ਹੋਣ-ਯੋਗ ਭਾਗ ਕੇਵਲ ਰੇਡ1 (RAID1) ਜੰਤਰ ਤੇ ਹੀ ਮੌਜੂਦ ਹੋ ਸਕਦਾ ਹੈ।"
+msgstr "ਬੂਟ-ਹੋਣ-ਯੋਗ ਭਾਗ RAID ਜੰਤਰ ਤੇ ਨਹੀਂ ਹੋਣਾ ਚਾਹੀਦਾ।"
#: ../partitions.py:1203
-#, fuzzy, python-format
+#, python-format
msgid "Bootable partitions cannot be on an %s filesystem."
-msgstr "ਬੂਟ-ਹੋਣ-ਯੋਗ ਭਾਗ ਲਾਜ਼ੀਕਲ ਵਾਲੀਅਮ ਤੇ ਮੌਜੂਦ ਨਹੀਂ ਹੋ ਸਕਦਾ ਹੈ।"
+msgstr "ਬੂਟ-ਹੋਣ-ਯੋਗ ਭਾਗ %s ਫਾਇਲ ਸਿਸਟਮ ਤੇ ਨਹੀਂ ਹੋਣਾ ਚਾਹੀਦਾ।"
#: ../partitions.py:1207
-#, fuzzy
msgid "Bootable partitions cannot be on an encrypted block device"
-msgstr "ਬੂਟ-ਹੋਣ-ਯੋਗ ਭਾਗ ਲਾਜ਼ੀਕਲ ਵਾਲੀਅਮ ਤੇ ਮੌਜੂਦ ਨਹੀਂ ਹੋ ਸਕਦਾ ਹੈ।"
+msgstr "ਬੂਟ-ਹੋਣ-ਯੋਗ ਭਾਗ ਇਨਕ੍ਰਿਪਟਡ ਬਲਾਕ ਵਾਲੇ ਜੰਤਰ ਤੇ ਨਹੀਂ ਹੋ ਸਕਦਾ ਹੈ।"
#: ../partitions.py:1213
msgid ""
@@ -1942,9 +1916,9 @@ msgid "a partition which is a member of a LVM Volume Group."
msgstr "ਇੱਕ ਭਾਗ, ਜੋ ਕਿ LVM ਵਾਲੀਅਮ ਸਮੂਹ ਦਾ ਇੱਕ ਅੰਗ ਹੈ।"
#: ../partRequests.py:273
-#, fuzzy, python-format
+#, python-format
msgid "The mount point %s must be formatted during live CD installs."
-msgstr "ਇਹ ਮਾਊਂਟ ਸਥਿਤੀ ਲੀਨਕਸ ਫਾਇਲ ਸਿਸਟਮ ਤੇ ਹੀ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ।"
+msgstr "ਮਾਊਂਟ ਸਥਿਤੀ %s ਨੂੰ ਲਾਈਵ CD ਇੰਸਟਾਲੇਸ਼ਨ ਦੌਰਾਨ ਫਾਰਮਿਟ ਕਰਨਾ ਜਰੂਰੀ ਹੈ।"
#: ../partRequests.py:278
#, python-format
@@ -2162,12 +2136,11 @@ msgstr "ਸੰਭਾਲੋ"
#: ../text.py:189
msgid "Save to Disk"
-msgstr ""
+msgstr "ਡਿਸਕ ਤੇ ਸੰਭਾਲੋ"
#: ../text.py:190
-#, fuzzy
msgid "Save to Remote"
-msgstr "ਰਿਮੋਟ ਉੱਤੇ ਸੰਭਾਲੋ(_R)"
+msgstr "ਰਿਮੋਟ ਉੱਤੇ ਸੰਭਾਲੋ"
#: ../text.py:204
msgid "Host"
@@ -2183,15 +2156,15 @@ msgstr "ਉਪਭੋਗੀ ਨਾਂ"
#: ../text.py:210
msgid "Password"
-msgstr "ਗੁਪਤ-ਕੋਡ"
+msgstr "ਪਾਸਵਰਡ"
#: ../text.py:282 tmp/lukspassphrase.glade.h:5
msgid "Passphrase"
-msgstr ""
+msgstr "ਗੁਪਤਕੋਡ"
#: ../text.py:290 tmp/lukspassphrase.glade.h:6
msgid "This is a global passphrase"
-msgstr ""
+msgstr "ਇਹ ਗਲੋਬਲ ਗੁਪਤਕੋਡ ਹੈ"
#: ../text.py:346
msgid "Help not available"
@@ -2202,9 +2175,8 @@ msgid "No help is available for this step of the install."
msgstr "ਇੰਸਟਾਲ ਦੇ ਇਸ ਪਗ ਲਈ ਕੋਈ ਸਹਾਇਤਾ ਨਹੀਂ ਹੈ।"
#: ../text.py:445
-#, fuzzy
msgid "Repository editing is not available in text mode."
-msgstr "ਗਰਾਫੀਕਲ ਇੰਸਟਾਲੇਸ਼ਨ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ... ਪਾਠ ਢੰਗ ਆਰੰਭ ਹੋ ਰਿਹਾ ਹੈ।"
+msgstr "ਪਾਠ ਢੰਗ ਵਿੱਚ ਰਿਪੋਜ਼ਟਰੀ ਸੋਧ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ।"
#: ../text.py:470
#, python-format
@@ -2217,9 +2189,9 @@ msgid "Skip entering %(instkey)s"
msgstr "%(instkey)s ਦੇਣਾ ਛੱਡੋ"
#: ../text.py:563 ../loader2/lang.c:63
-#, fuzzy, c-format, python-format
+#, c-format, python-format
msgid "Welcome to %s for %s"
-msgstr "%s ਵਲੋਂ ਜੀ ਆਇਆਂ ਨੂੰ"
+msgstr "%s ਵਲੋਂ %s ਲਈ ਜੀ ਆਇਆਂ ਨੂੰ"
#: ../text.py:565
#, python-format
@@ -2247,11 +2219,13 @@ msgid ""
"is for %s architecture. \n"
"\n"
msgstr ""
+"ਤੁਸੀਂ %s ਢਾਂਚੇ ਲਈ ਅੱਪਗਰੇਡ ਕਰਨ ਬਾਰੇ ਚੁਣਿਆ ਹੈ, ਪਰ ਇੰਸਟਾਲ ਕੀਤਾ ਸਿਸਟਮ %s ਢਾਂਚੇ ਲਈ ਹੈ। \n"
+"\n"
#: ../upgrade.py:81
-#, fuzzy, python-format
+#, python-format
msgid "Would you like to upgrade the installed system to the %s architecture?"
-msgstr "ਇਸ ਭਾਗ ਤੇ ਤੁਸੀਂ ਫਾਇਲ-ਸਿਸਟਮ ਕਿਸ ਤਰਾਂ ਤਿਆਰ ਕਰਨਾ ਪਸੰਦ ਕਰੋਗੇ?"
+msgstr "ਕੀ ਤੁਸੀਂ ਇੰਸਟਾਲ ਕੀਤੇ ਸਿਸਟਮ ਨੂੰ %s ਢਾਂਚੇ ਤੇ ਅੱਪਗਰੇਡ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
#: ../upgrade.py:98
msgid ""
@@ -2375,9 +2349,9 @@ msgid "Will try to connect again in 15 seconds..."
msgstr "15 ਸਕਿੰਟਾਂ ਵਿੱਚ ਮੁਡ਼ ਜੁਡ਼ਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੇਗਾ..."
#: ../vnc.py:197
-#, fuzzy, python-format
+#, python-format
msgid "Giving up attempting to connect after %d tries!\n"
-msgstr "50 ਵਾਰ ਕੋਸ਼ਿਸ਼ ਕਰ ਬਾਅਦ ਜੁਡ਼ਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰ ਲਈ ਜਤਨ ਛੱਡਿਆ ਜਾ ਰਿਹਾ ਹੈ!\n"
+msgstr "%d ਵਾਰ ਜੁੜਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰਨ ਤੋਂ ਬਾਅਦ ਜਤਨ ਛੱਡਿਆ ਜਾ ਰਿਹਾ ਹੈ!\n"
#: ../vnc.py:206
#, python-format
@@ -2406,9 +2380,15 @@ msgid ""
"to the vncviewer is unsuccessful\n"
"\n"
msgstr ""
+"\n"
+"\n"
+"ਤੁਸੀਂ ਨੀਯਤ vncviewer ਨਾਲ ਜੁੜਨ ਲਈ ਚੁਣਿਆ ਹੈ। \n"
+"ਇਸ ਲਈ ਪਾਸਵਰਡ ਦੇਣਾ ਜਰੂਰੀ ਨਹੀਂ ਹੈ। ਜੇ ਤੁਸੀਂ \n"
+"ਪਾਸਵਰਡ ਦਿੱਤਾ, ਤਾਂ ਇਹ vncviewer ਨਾਲ ਜੁੜਨ ਤੋਂ ਫੇਲ ਹੋਣ ਦੀ ਸਥਿਤੀ\n"
+"ਵਿੱਚ ਵਰਤਿਆ ਜਾਵੇਗਾ\n"
+"\n"
#: ../vnc.py:254
-#, fuzzy
msgid ""
"\n"
"\n"
@@ -2419,9 +2399,9 @@ msgid ""
msgstr ""
"\n"
"\n"
-"ਚੇਤਵਾਨੀ!!! ਵੀਐਨਸੀ(VNC) ਸਰਵਰ *ਬਿਨਾਂ ਗੁਪਤ-ਕੋਡ* ਤੋਂ ਚੱਲ ਰਿਹਾ ਹੈ!\n"
-"ਤੁਸੀਂ vncpassword=<password> ਬੂਟ ਚੋਣ ਵਰਤ ਸਕਦੇ ਹੋ,\n"
-"ਜੇਕਰ ਤੁਸੀਂ ਸੁਰੱਖਿਅਤ ਸਰਵਰ ਵਰਤਣਾ ਚਾਹੋਗੇ।\n"
+"WARNING!!! VNC server running with NO PASSWORD!\n"
+"You can use the self.password=<password> boot option\n"
+"if you would like to secure the server.\n"
"\n"
#: ../vnc.py:258
@@ -2431,15 +2411,22 @@ msgid ""
"You chose to execute vnc with a password. \n"
"\n"
msgstr ""
+"\n"
+"\n"
+"ਤੁਸੀਂ ਇੱਕ ਪਾਸਵਰਡ ਨਾਲ vnc ਚਲਾਉਣ ਲਈ ਚੁਣਿਆ ਹੈ। \n"
+"\n"
#: ../vnc.py:260
-#, fuzzy
msgid ""
"\n"
"\n"
"Unknown Error. Aborting. \n"
"\n"
-msgstr "ਅਣਜਾਣੀ ਗਲਤੀ"
+msgstr ""
+"\n"
+"\n"
+"ਅਣਜਾਣੀ ਗਲਤੀ। ਅਧੂਰੀ ਛੱਡ ਰਿਹਾ ਹੈ। \n"
+"\n"
#: ../vnc.py:285 ../vnc.py:374
msgid "VNC Configuration"
@@ -2447,7 +2434,7 @@ msgstr "VNC ਸੰਰਚਨਾ"
#: ../vnc.py:288 ../vnc.py:378
msgid "No password"
-msgstr "ਕੋਈ ਗੁਪਤ-ਕੋਡ ਨਹੀਂ"
+msgstr "ਕੋਈ ਪਾਸਵਰਡ ਨਹੀਂ"
#: ../vnc.py:290 ../vnc.py:381
msgid ""
@@ -2455,32 +2442,32 @@ msgid ""
"your installation progress. Please enter a password to be used for the "
"installation"
msgstr ""
-"ਇੱਕ ਗੁਪਤ-ਕੋਡ ਨਾਲ ਤੁਹਾਡੀ ਇੰਸਟਾਲੇਸ਼ਨ ਕਾਰਵਾਈ ਨਾ-ਪ੍ਰਮਾਣਿਤ ਸੁਣਨ ਵਾਲਿਆਂ ਦੇ ਜੁੜਨ ਤੇ ਵੇਖਣ ਤੋਂ ਸੁਰੱਖਿਅਤ "
-"ਹੋ ਸਕਦੀ ਹੈ। ਇੰਸਟਾਲੇਸ਼ਨ ਲਈ ਗੁਪਤ-ਕੋਡ ਭਰੋ ਜੀ।"
+"ਇੱਕ ਪਾਸਵਰਡ ਨਾਲ ਤੁਹਾਡੀ ਇੰਸਟਾਲੇਸ਼ਨ ਕਾਰਵਾਈ ਨਾ-ਪ੍ਰਮਾਣਿਤ ਸੁਣਨ ਵਾਲਿਆਂ ਦੇ ਜੁੜਨ ਤੇ ਵੇਖਣ ਤੋਂ ਸੁਰੱਖਿਅਤ "
+"ਹੋ ਸਕਦੀ ਹੈ। ਇੰਸਟਾਲੇਸ਼ਨ ਲਈ ਪਾਸਵਰਡ ਭਰੋ ਜੀ।"
#: ../vnc.py:298 ../vnc.py:389 ../textw/userauth_text.py:44
msgid "Password:"
-msgstr "ਗੁਪਤ-ਕੋਡ:"
+msgstr "ਪਾਸਵਰਡ:"
#: ../vnc.py:299 ../vnc.py:390 ../textw/userauth_text.py:46
msgid "Password (confirm):"
-msgstr "ਗੁਪਤ-ਕੋਡ (ਪੁਸ਼ਟੀ):"
+msgstr "ਪਾਸਵਰਡ (ਪੁਸ਼ਟੀ):"
#: ../vnc.py:317 ../vnc.py:412 ../textw/userauth_text.py:67
msgid "Password Mismatch"
-msgstr "ਗੁਪਤ-ਕੋਡ ਮੇਲ ਨਹੀਂ ਖਾ ਰਿਹਾ"
+msgstr "ਪਾਸਵਰਡ ਮੇਲ ਨਹੀਂ ਖਾ ਰਿਹਾ"
#: ../vnc.py:318 ../vnc.py:413 ../textw/userauth_text.py:68
msgid "The passwords you entered were different. Please try again."
-msgstr "ਗੁਪਤ-ਕੋਡ, ਜੋ ਤੁਸੀਂ ਦਿੱਤੇ ਹਨ, ਵੱਖੋ-ਵੱਖਰੇ ਹਨ। ਮੁਡ਼-ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜੀ।"
+msgstr "ਪਾਸਵਰਡ, ਜੋ ਤੁਸੀਂ ਦਿੱਤੇ ਹਨ, ਵੱਖੋ-ਵੱਖਰੇ ਹਨ। ਮੁਡ਼-ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜੀ।"
#: ../vnc.py:323 ../vnc.py:418 ../textw/userauth_text.py:63
msgid "Password Length"
-msgstr "ਗੁਪਤ-ਕੋਡ ਲੰਬਾਈ"
+msgstr "ਪਾਸਵਰਡ ਲੰਬਾਈ"
#: ../vnc.py:324 ../vnc.py:419
msgid "The password must be at least six characters long."
-msgstr "ਗੁਪਤ-ਕੋਡ ਘੱਟੋ-ਘੱਟ 6 ਅੱਖਰਾਂ ਦਾ ਹੋਣਾ ਜ਼ਰੂਰੀ ਹੈ।"
+msgstr "ਪਾਸਵਰਡ ਘੱਟੋ-ਘੱਟ 6 ਅੱਖਰਾਂ ਦਾ ਹੋਣਾ ਜ਼ਰੂਰੀ ਹੈ।"
#: ../vnc.py:355
msgid "Unable to Start X"
@@ -2559,13 +2546,10 @@ msgid "Transferring install image to hard drive..."
msgstr "ਇੰਸਟਾਲ ਈਮੇਜ਼ ਹਾਰਡ-ਡਿਸਕ ਤੇ ਤਬਦੀਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
#: ../yuminstall.py:339
-#, fuzzy
msgid ""
"An error occurred transferring the install image to your hard drive. This "
"is probably due to bad media."
-msgstr ""
-"ਇੰਸਟਾਲ ਈਮੇਜ਼ ਨੂੰ ਤੁਹਾਡੀ ਹਾਰਡ ਡਿਸਕ ਤੇ ਤਬਦੀਲ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ ਆਈ ਹੈ। ਤੁਹਾਡੀ ਡਿਸਕ ਉੱਤੇ ਖਾਲੀ "
-"ਥਾਂ ਹੀ ਨਹੀਂ ਹੈ।"
+msgstr "ਇੰਸਟਾਲ ਈਮੇਜ਼ ਨੂੰ ਤੁਹਾਡੀ ਹਾਰਡ ਡਿਸਕ ਤੇ ਤਬਦੀਲ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ ਆਈ ਹੈ। ਇਸ ਦਾ ਕਾਰਨ ਤੁਹਾਡੇ ਮੀਡੀਆ ਤੇ ਖਰਾਬ ਸੈਕਟਰਾਂ ਕਰਕੇ ਹੈ।"
#: ../yuminstall.py:343
msgid ""
@@ -2599,15 +2583,14 @@ msgstr "ਡਿਸਕ ਨੂੰ ਵਰਤਣ ਵਿੱਚ ਅਸਫਲ।"
#: ../yuminstall.py:533 ../yuminstall.py:535
msgid "Re_boot"
-msgstr "ਮੁਡ਼ ਚਾਲੂ(_b)"
+msgstr "ਮੁਡ਼ ਚਾਲੂ(_B)"
#: ../yuminstall.py:533
-#, fuzzy
msgid "_Eject"
-msgstr "ਡਿਸਕ ਕੱਢੋ"
+msgstr "ਬਾਹਰ ਕੱਢੋ"
#: ../yuminstall.py:539
-#, fuzzy, python-format
+#, python-format
msgid ""
"The file %s cannot be opened. This is due to a missing file, a corrupt "
"package or corrupt media. Please verify your installation source.\n"
@@ -2616,26 +2599,25 @@ msgid ""
"likely require reinstallation.\n"
"\n"
msgstr ""
-"ਫਾਇਲ %s ਖੋਲੀ ਨਹੀਂ ਜਾ ਸਕਦੀ ਹੈ। ਇਸ ਦਾ ਕਾਰਨ ਸੰਭਵ ਤੌਰ ਤੇ ਫਾਇਲ ਦੀ ਗੈਰ-ਮੌਜੂਦਗੀ ਜਾਂ ਪੈਕੇਜ ਦਾ "
-"ਨਕਾਰਾ ਹੋਣਾ ਹੈ। ਆਪਣੇ ਇੰਸਟਾਲੇਸ਼ਨ ਲੜੀ ਦੀ ਜਾਂਚ ਕਰੋ ਕਿ ਇਹ ਸਭ ਲੋੜੀਦੇ ਪੈਕੇਜ ਰੱਖਦੀ ਹੈ।\n"
+"ਫਾਇਲ %s ਖੋਲੀ ਨਹੀਂ ਜਾ ਸਕਦੀ ਹੈ। ਇਸ ਦਾ ਕਾਰਨ ਫਾਇਲ ਦੀ ਗੈਰ-ਮੌਜੂਦਗੀ, ਪੈਕੇਜ ਦਾ "
+"ਨਕਾਰਾ ਜਾਂ ਨਕਾਰਾ ਮੀਡੀਆ ਹੋਣਾ ਹੈ। ਆਪਣੇ ਇੰਸਟਾਲੇਸ਼ਨ ਸਰੋਤ ਦੀ ਜਾਂਚ ਕਰੋ।\n"
"\n"
"ਜੇਕਰ ਤੁਸੀਂ ਬੰਦ ਕਰ ਦਿੱਤਾ ਤਾਂ ਇਹ ਹੋ ਸਕਦਾ ਹੈ ਕਿ ਸਿਸਟਮ ਇਸ ਹਾਲਤ ਵਿੱਚ ਰਹਿ ਜਾਵੇ ਕਿ ਜਿਸ ਲਈ ਮੁੜ-"
"ਇੰਸਟਾਲੇਸ਼ਨ ਕਰਨੀ ਪਵੇ।\n"
"\n"
#: ../yuminstall.py:579
-#, fuzzy
msgid "Retrying"
-msgstr "ਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
+msgstr "ਮੁੜ-ਪ੍ਰਾਪਤੀ ਹੋ ਰਹੀ ਹੈ"
#: ../yuminstall.py:579
msgid "Retrying package download..."
-msgstr ""
+msgstr "ਪੈਕਜ ਡਾਊਨਲੋਡ ਲਈ ਮੁੜ-ਕੋਸ਼ਿਸ਼ ਕਰ ਰਿਹਾ ਹੈ..."
#: ../yuminstall.py:641
-#, fuzzy, python-format
+#, python-format
msgid "There was an error running your transaction for the following reason: %s\n"
-msgstr "ਤੁਹਾਡੇ ਸੰਚਾਰ ਦੌਰਾਨ ਇੱਕ ਗਲਤੀ ਆਈ ਹੈ, ਕਾਰਨ ਅੱਗੇ ਦਿੱਤਾ ਹੈ: %s"
+msgstr "ਤੁਹਾਡੇ ਸੰਚਾਰ ਦੌਰਾਨ ਇੱਕ ਗਲਤੀ ਆਈ ਹੈ, ਕਾਰਨ ਅੱਗੇ ਦਿੱਤਾ ਹੈ: %s\n"
#: ../yuminstall.py:674 ../yuminstall.py:675
msgid "file conflicts"
@@ -2678,21 +2660,22 @@ msgid "You need more space on the following file systems:\n"
msgstr "ਤੁਹਾਨੂੰ ਹੇਠ ਦਿੱਤੇ ਫਾਇਲ ਸਿਸਟਮਾਂ ਉੱਤੇ ਹੋਰ ਥਾਂ ਲਈ ਹੈ:\n"
#: ../yuminstall.py:710
-#, fuzzy, python-format
+#, python-format
msgid ""
"There were file conflicts when checking the packages to be installed:\n"
"%s\n"
-msgstr "ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਪੈਕੇਜ ਕਿਸ ਕਿਸਮ ਦੇ ਮੀਡਿਆ ਉੱਤੇ ਹਨ?"
+msgstr ""
+"ਇੰਸਟਾਲ ਕਰਨ ਵਾਲੇ ਪੈਕੇਜਾਂ ਦੀ ਜਾਂਚ ਦੌਰਾਨ ਫਾਇਲ ਪ੍ਰਤੀਰੋਧ ਆਇਆ ਹੈ:\n"
+"%s\n"
#: ../yuminstall.py:713
-#, fuzzy, python-format
+#, python-format
msgid ""
"There was an error running your transaction for the following reason(s): %"
"s.\n"
-msgstr "ਤੁਹਾਡੇ ਸੰਚਾਰ ਦੌਰਾਨ ਇੱਕ ਗਲਤੀ ਆਈ ਹੈ, ਕਾਰਨ ਅੱਗੇ ਦਿੱਤਾ ਹੈ: %s"
+msgstr "ਤੁਹਾਡੇ ਸੰਚਾਰ ਦੌਰਾਨ ਇੱਕ ਗਲਤੀ ਆਈ ਹੈ, ਕਾਰਨ ਅੱਗੇ ਦਿੱਤਾ ਹੈ: %s\n"
#: ../yuminstall.py:717
-#, fuzzy
msgid "Error Running Transaction"
msgstr "ਸੰਚਾਰ ਚਲਾਉਣ ਦੌਰਾਨ ਗਲਤੀ"
@@ -2710,7 +2693,7 @@ msgid "Retrieving installation information for %s..."
msgstr "%s ਲਈ ਇੰਸਟਾਲੇਸ਼ਨ ਜਾਣਕਾਰੀ ਲਈ ਜਾ ਰਹੀ ਹੈ..."
#: ../yuminstall.py:905 ../yuminstall.py:1179
-#, fuzzy, python-format
+#, python-format
msgid ""
"Unable to read package metadata. This may be due to a missing repodata "
"directory. Please ensure that your install tree has been correctly "
@@ -2718,8 +2701,10 @@ msgid ""
"\n"
"%s"
msgstr ""
-"ਪੈਕੇਜ ਮੈਟਾ ਡਾਟਾ ਪੜ੍ਹਨ ਲਈ ਅਸਫ਼ਲ ਹੈ। ਇਸ ਦਾ ਕਾਰਨ ਹੋ ਸਕਦਾ ਹੈ ਕਿ repodata ਡਾਇਰੈਕਟਰੀ ਗੁੰਮ ਹੈ। "
-"ਇਹ ਜਾਂਚ ਲਵੋ ਕਿ ਤੁਹਾਡੀ ਇੰਸਟਾਲ ਟਰੀ ਠੀਕ ਤਰ੍ਹਾਂ ਤਿਆਰ ਕੀਤਾ ਗਿਆ ਹੈ। %s"
+"ਪੈਕੇਜ ਮੈਟਾਡਾਟਾ ਪੜ੍ਹਨ ਲਈ ਅਸਫ਼ਲ ਹੈ। ਇਸ ਦਾ ਕਾਰਨ ਹੋ ਸਕਦਾ ਹੈ ਕਿ repodata ਡਾਇਰੈਕਟਰੀ ਗੁੰਮ ਹੈ। "
+"ਇਹ ਜਾਂਚ ਲਵੋ ਕਿ ਤੁਹਾਡਾ ਇੰਸਟਾਲ ਟਰੀ ਠੀਕ ਤਰ੍ਹਾਂ ਤਿਆਰ ਕੀਤਾ ਗਿਆ ਹੈ।\n"
+"\n"
+"%s"
#: ../yuminstall.py:946
msgid ""
@@ -2761,14 +2746,12 @@ msgstr ""
"ਕੀ ਤੁਸੀਂ ਅੱਪਗਰੇਡ ਕਾਰਵਾਈ ਨੂੰ ਜਾਰੀ ਰੱਖਣਾ ਚਾਹੋਗੇ?"
#: ../yuminstall.py:1415
-#, fuzzy, python-format
+#, python-format
msgid ""
"The arch of the release of %s you are upgrading to appears to be %s which "
"does not match your previously installed arch of %s. This is likely to not "
"succeed. Are you sure you wish to continue the upgrade process?"
-msgstr ""
-"ਤੁਸੀਂ ਇੱਕ ਸਿਸਟਮ ਦਾ ਅੱਪਗਰੇਡ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ ਕਰ ਰਹੇ ਹੋ, ਜੋ ਕਿ %s ਦੇ ਇਸ ਵਰਜਨ ਲਈ ਬਹੁਤ ਪੁਰਾਣਾ ਹੈ। "
-"ਕੀ ਤੁਸੀਂ ਅੱਪਗਰੇਡ ਕਾਰਵਾਈ ਨੂੰ ਜਾਰੀ ਰੱਖਣਾ ਚਾਹੋਗੇ?"
+msgstr "%s ਜੋ ਤੁਸੀਂ ਅੱਪਗਰੇਡ ਕਰਦੇ ਹੋ, ਦਾ ਰੀਲੀਜ਼ ਦਾ ਢਾਂਚਾ %s ਜਾਪਦਾ ਹੈ ਜੋ ਤੁਹਾਡਾ %s ਦੇ ਪਿਛਲੇ ਇੰਸਟਾਲ ਢਾਂਚੇ ਨਾਲ ਮੇਲ ਨਹੀਂ ਖਾਂਦਾ। ਇਹ ਸਫਲ ਨਹੀਂ ਹੋਵੇਗਾ। ਕੀ ਤੁਸੀਂ ਅੱਪਗਰੇਡ ਕਾਰਵਾਈ ਨੂੰ ਜਾਰੀ ਰੱਖਣਾ ਚਾਹੋਗੇ?"
#: ../yuminstall.py:1448
msgid "Install Starting"
@@ -2819,67 +2802,66 @@ msgid "You have not specified a FCP LUN or the number is invalid."
msgstr "ਤੁਸੀਂ FCP LUN ਨਾਂ ਨਹੀਂ ਦਿੱਤਾ ਹੈ ਜਾਂ ਨੰਬਰ ਠੀਕ ਨਹੀਂ ਹੈ।"
#: ../iw/account_gui.py:48
-#, fuzzy
msgid "Root _Password:"
-msgstr "ਪ੍ਰਬੰਧਕ (root) ਗੁਪਤ-ਕੋਡ(_P): "
+msgstr "ਪ੍ਰਬੰਧਕ (root) ਪਾਸਵਰਡ(_P):"
#: ../iw/account_gui.py:50
-#, fuzzy
msgid "_Confirm:"
msgstr "ਪੁਸ਼ਟੀ(_C):"
#: ../iw/account_gui.py:74
-#, fuzzy
msgid "Caps Lock is on."
-msgstr "<b>ਕੈਪਸ-ਲਾਕ ਚਾਲੂ ਹੈ।</b>"
+msgstr "ਕੈਪਸ-ਲਾਕ ਚਾਲੂ ਹੈ।"
#: ../iw/account_gui.py:84 ../iw/account_gui.py:92 ../iw/account_gui.py:99
#: ../iw/account_gui.py:119 ../textw/userauth_text.py:71
msgid "Error with Password"
-msgstr "ਗੁਪਤ-ਕੋਡ ਵਿੱਚ ਗਲਤੀ"
+msgstr "ਪਾਸਵਰਡ ਵਿੱਚ ਗਲਤੀ"
#: ../iw/account_gui.py:85
msgid ""
"You must enter your root password and confirm it by typing it a second time "
"to continue."
msgstr ""
-"ਤੁਹਾਨੂੰ ਜਾਰੀ ਰਹਿਣ ਲਈ ਪ੍ਰਬੰਧਕ (root) ਲਈ ਗੁਪਤ-ਕੋਡ ਦੇਣਾ ਪਵੇਗਾ ਅਤੇ ਫਿਰ ਮੁਡ਼ ਲਿਖ ਕੇ ਇਸ ਦੀ ਪੁਸ਼ਟੀ "
+"ਤੁਹਾਨੂੰ ਜਾਰੀ ਰਹਿਣ ਲਈ ਪ੍ਰਬੰਧਕ (root) ਲਈ ਪਾਸਵਰਡ ਦੇਣਾ ਪਵੇਗਾ ਅਤੇ ਫਿਰ ਮੁਡ਼ ਲਿਖ ਕੇ ਇਸ ਦੀ ਪੁਸ਼ਟੀ "
"ਕਰਨੀ ਪਵੇਗੀ।"
#: ../iw/account_gui.py:93
msgid "The passwords you entered were different. Please try again."
-msgstr "ਗੁਪਤ-ਕੋਡ, ਜੋ ਤੁਸੀਂ ਭਰੇ ਹਨ, ਵੱਖਰੇ-ਵੱਖਰੇ ਹਨ। ਮੁਡ਼ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜੀ।"
+msgstr "ਪਾਸਵਰਡ, ਜੋ ਤੁਸੀਂ ਭਰੇ ਹਨ, ਵੱਖਰੇ-ਵੱਖਰੇ ਹਨ। ਮੁਡ਼ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜੀ।"
#: ../iw/account_gui.py:100
msgid "The root password must be at least six characters long."
-msgstr "ਪ੍ਰਬੰਧਕ (root) ਲਈ ਗੁਪਤ-ਕੋਡ ਘੱਟੋ-ਘੱਟ ਛੇ ਅੱਖਰਾਂ ਦਾ ਹੋਣਾ ਲਾਜ਼ਮੀ ਹੈ।"
+msgstr "ਪ੍ਰਬੰਧਕ (root) ਲਈ ਪਾਸਵਰਡ ਘੱਟੋ-ਘੱਟ ਛੇ ਅੱਖਰਾਂ ਦਾ ਹੋਣਾ ਲਾਜ਼ਮੀ ਹੈ।"
#: ../iw/account_gui.py:107 ../textw/userauth_text.py:78
-#, fuzzy
msgid "Weak Password"
-msgstr "ਗੁਪਤ-ਕੋਡ"
+msgstr "ਸੌਖਾ ਪਾਸਵਰਡ"
#: ../iw/account_gui.py:108 ../textw/userauth_text.py:79
-#, fuzzy, python-format
+#, python-format
msgid ""
"Weak password provided: %s\n"
"\n"
"Would you like to continue with this password?"
-msgstr "ਕੀ ਤੁਸੀਂ ਅੱਪਗਰੇਡ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
+msgstr ""
+"ਸੌਖਾ ਪਾਸਵਰਡ ਦਿੱਤਾ ਹੈ: %s\n"
+"\n"
+"ਕੀ ਤੁਸੀਂ ਇਹ ਪਾਸਵਰਡ ਰੱਖਣਾ ਚੀਹੁੰਦੇ ਹੋ?"
#: ../iw/account_gui.py:120 ../textw/userauth_text.py:72
msgid "Requested password contains non-ASCII characters, which are not allowed."
-msgstr "ਲੋਡ਼ੀਂਦੇ ਗੁਪਤ-ਕੋਡ ਵਿੱਚ ਨਾ-ASCII ਅੱਖਰ ਹਨ, ਜੋ ਕਿ ਨਹੀਂ ਵਰਤੇ ਜਾ ਸਕਦੇ ਹਨ।"
+msgstr "ਲੋਡ਼ੀਂਦੇ ਪਾਸਵਰਡ ਵਿੱਚ ਨਾ-ASCII ਅੱਖਰ ਹਨ, ਜੋ ਕਿ ਨਹੀਂ ਵਰਤੇ ਜਾ ਸਕਦੇ ਹਨ।"
#: ../iw/autopart_type.py:94
msgid ""
"No partitions are available to resize. Only physical partitions with "
"specific filesystems can be resized."
-msgstr ""
+msgstr "ਮੁੜ-ਅਕਾਰ ਦੇਣ ਲਈ ਕੋਈ ਭਾਗ ਨਹੀਂ ਹੈ। ਸਿਰਫ ਖਾਸ ਫਾਇਲ ਸਿਸਟਮ ਵਾਲੇ ਭੌਤਿਕ ਭਾਗਾਂ ਨੂੰ ਮੁੜ-ਅਕਾਰ ਦਿੰਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
#: ../iw/autopart_type.py:177
msgid "Do you really want to boot from disk which is not used for instalation?"
-msgstr ""
+msgstr "ਕੀ ਤੁਸੀਂ ਯਕੀਨਨ ਡਿਸਕ ਤੋਂ ਬੂਟ ਕਰਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ ਜੋ ਇੰਸਟਾਲੇਸ਼ਨ ਲਈ ਨਹੀਂ ਵਰਤੀ ਗਈ?"
#: ../iw/autopart_type.py:258
msgid "Invalid Initiator Name"
@@ -2902,9 +2884,8 @@ msgid "Remove Linux partitions on selected drives and create default layout"
msgstr "ਚੁਣੀਆਂ ਹੋਈਆਂ ਡਰਾਈਵਾਂ ਤੋਂ ਲੀਨਕਸ ਭਾਗ ਹਟਾ ਦਿਓ ਅਤੇ ਮੂਲ ਖਾਕਾ ਬਣਾਓ"
#: ../iw/autopart_type.py:403
-#, fuzzy
msgid "Resize existing partition and create default layout in free space"
-msgstr "ਚੁਣੀਆਂ ਹੋਈਆਂ ਡਰਾਈਵਾਂ ਤੋਂ ਲੀਨਕਸ ਭਾਗ ਹਟਾ ਦਿਓ ਅਤੇ ਮੂਲ ਖਾਕਾ ਬਣਾਓ"
+msgstr "ਮੌਜੂਦਾ ਭਾਗਾਂ ਨੂੰ ਮੁੜ-ਅਕਾਰ ਦਿਓ ਅਤੇ ਖਾਲੀ ਥਾਂ ਵਿੱਚ ਮੂਲ ਖਾਕਾ ਬਣਾਓ"
#: ../iw/autopart_type.py:404 ../textw/partition_text.py:1518
msgid "Use free space on selected drives and create default layout"
@@ -2916,36 +2897,33 @@ msgstr "ਪਸੰਦੀ ਦਾ ਖਾਕਾ ਬਣਾਓ"
#: ../iw/blpasswidget.py:45
msgid "_Use a boot loader password"
-msgstr "ਇੱਕ ਬੂਟ-ਲੋਡਰ ਗੁਪਤ-ਕੋਡ ਵਰਤੋਂ(_U)"
+msgstr "ਇੱਕ ਬੂਟ-ਲੋਡਰ ਪਾਸਵਰਡ ਵਰਤੋਂ(_U)"
#: ../iw/blpasswidget.py:46
-#, fuzzy
msgid ""
"A boot loader password prevents users from changing kernel options, "
"increasing security."
-msgstr ""
-"ਬੂਟ-ਲੋਡਰ ਗੁਪਤ-ਕੋਡ, ਉਪਭੋਗੀਆਂ ਨੂੰ ਕਰਨਲ ਲਈ ਭੇਜਣ ਵਾਲ਼ੀ ਚੋਣ ਵਿੱਚ ਤਬਦੀਲੀ ਕਰਨ ਤੋਂ ਰੋਕਦਾ ਹੈ। ਸਖਤ "
-"ਸੁਰੱਖਿਆ ਲਈ ਇਹ ਗੁਪਤ-ਕੋਡ ਨੂੰ ਵਰਤਣ ਦੀ ਸਿਫ਼ਾਰਸ਼ ਕੀਤੀ ਜਾਦੀ ਹੈ।"
+msgstr "ਬੂਟ-ਲੋਡਰ ਪਾਸਵਰਡ, ਉਪਭੋਗੀਆਂ ਨੂੰ ਕਰਨਲ ਚੋਣਾਂ ਵਿੱਚ ਤਬਦੀਲੀ ਕਰਨ ਤੋਂ ਰੋਕਦਾ ਹੈ, ਜਿਸ ਨਾਲ ਸੁਰੱਖਿਆ ਵਧਦੀ ਹੈ।"
#: ../iw/blpasswidget.py:77
msgid "Change _password"
-msgstr "ਗੁਪਤ-ਕੋਡ ਬਦਲੋ(_P)"
+msgstr "ਪਾਸਵਰਡ ਬਦਲੋ(_P)"
#: ../iw/blpasswidget.py:100
msgid "Enter Boot Loader Password"
-msgstr "ਬੂਟ ਲੋਡਰ ਗੁਪਤ-ਕੋਡ ਦਿਓ"
+msgstr "ਬੂਟ ਲੋਡਰ ਪਾਸਵਰਡ ਦਿਓ"
#: ../iw/blpasswidget.py:106
msgid ""
"Enter a boot loader password and then confirm it. (Note that your BIOS "
"keymap may be different than the actual keymap you are used to.)"
msgstr ""
-"ਬੂਟ ਲੋਡਰ ਗੁਪਤ-ਕੋਡ ਦਿਉ ਅਤੇ ਇਸ ਦੀ ਪੁਸ਼ਟੀ ਕਰੋ। (ਯਾਦ ਰੱਖੋ ਕਿ ਤੁਹਾਡਾ BIOS ਕੀ-ਮੈਪ, ਤੁਹਾਡੇ ਅਸਲੀ "
+"ਬੂਟ ਲੋਡਰ ਪਾਸਵਰਡ ਦਿਉ ਅਤੇ ਇਸ ਦੀ ਪੁਸ਼ਟੀ ਕਰੋ। (ਯਾਦ ਰੱਖੋ ਕਿ ਤੁਹਾਡਾ BIOS ਕੀ-ਮੈਪ, ਤੁਹਾਡੇ ਅਸਲੀ "
"ਕੀ-ਮੈਪ, ਜੋ ਕਿ ਤੁਸੀਂ ਵਰਤ ਰਹੇ ਹੋ, ਤੋਂ ਵੱਖਰਾ ਹੋ ਸਕਦਾ ਹੈ।)"
#: ../iw/blpasswidget.py:113
msgid "_Password:"
-msgstr "ਗੁਪਤ-ਕੋਡ(_P):"
+msgstr "ਪਾਸਵਰਡ(_P):"
#: ../iw/blpasswidget.py:119
msgid "Con_firm:"
@@ -2953,11 +2931,11 @@ msgstr "ਪੁਸ਼ਟੀ(_F):"
#: ../iw/blpasswidget.py:140
msgid "Passwords don't match"
-msgstr "ਗੁਪਤ-ਕੋਡ ਮੇਲ ਨਹੀਂ ਖਾ ਰਿਹਾ"
+msgstr "ਪਾਸਵਰਡ ਮੇਲ ਨਹੀਂ ਖਾ ਰਿਹਾ"
#: ../iw/blpasswidget.py:141 ../textw/bootloader_text.py:443
msgid "Passwords do not match"
-msgstr "ਗੁਪਤ-ਕੋਡ ਮੇਲ ਨਹੀਂ ਖਾ ਰਿਹਾ"
+msgstr "ਪਾਸਵਰਡ ਮੇਲ ਨਹੀਂ ਖਾ ਰਿਹਾ"
#: ../iw/blpasswidget.py:150 ../textw/bootloader_text.py:453
msgid ""
@@ -2966,10 +2944,10 @@ msgid ""
"\n"
"Would you like to continue with this password?"
msgstr ""
-"ਤੁਹਾਡਾ ਬੂਟ ਲੋਡਰ ਗੁਪਤ-ਕੋਡ ਛੇ ਅੱਖਰਾਂ ਤੋਂ ਘੱਟ ਹੈ। ਅਸੀਂ ਇਸ ਤੋਂ ਲੰਮੇ ਬੂਟ-ਲੋਡਰ ਗੁਪਤ-ਕੋਡ ਦੀ ਸਿਫ਼ਾਰਸ਼ ਕਰਦੇ "
+"ਤੁਹਾਡਾ ਬੂਟ ਲੋਡਰ ਪਾਸਵਰਡ ਛੇ ਅੱਖਰਾਂ ਤੋਂ ਘੱਟ ਹੈ। ਅਸੀਂ ਇਸ ਤੋਂ ਲੰਮੇ ਬੂਟ-ਲੋਡਰ ਪਾਸਵਰਡ ਦੀ ਸਿਫ਼ਾਰਸ਼ ਕਰਦੇ "
"ਹਾਂ।\n"
"\n"
-"ਕੀ ਤੁਸੀਂ ਇਸ ਗੁਪਤ-ਕੋਡ ਨਾਲ ਜਾਰੀ ਰਹਿਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
+"ਕੀ ਤੁਸੀਂ ਇਸ ਪਾਸਵਰਡ ਨਾਲ ਜਾਰੀ ਰਹਿਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
#: ../iw/bootloader_main_gui.py:34 ../textw/bootloader_text.py:46
#: ../textw/bootloader_text.py:111 ../textw/bootloader_text.py:168
@@ -2979,14 +2957,13 @@ msgstr "ਬੂਟ ਲੋਡਰ ਸੰਰਚਨਾ"
#: ../iw/bootloader_main_gui.py:170 ../iw/bootloader_main_gui.py:175
#: ../iw/bootloader_main_gui.py:212
-#, fuzzy, python-format
+#, python-format
msgid "_Install boot loader on /dev/%s."
-msgstr "ਬੂਟ-ਲੋਡਰ ਇੰਸਟਾਲ ਹੋ ਰਿਹਾ ਹੈ..."
+msgstr "/dev/%s ਉੱਪਰ ਬੂਟ ਲੋਡਰ ਇੰਸਟਾਲ ਕਰੋ(_I)"
#: ../iw/bootloader_main_gui.py:218
-#, fuzzy
msgid "_Change device"
-msgstr "ਡਿਸਕ ਬਦਲੋ"
+msgstr "ਜੰਤਰ ਬਦਲੋ(_C)"
#: ../iw/congrats_gui.py:31
msgid "Congratulations"
@@ -3386,9 +3363,8 @@ msgid "_Edit"
msgstr "ਸੋਧ(_E)"
#: ../iw/lvm_dialog_gui.py:1132
-#, fuzzy
msgid "_Logical Volumes"
-msgstr "ਲਾਜੀਕਲ ਵਾਲੀਅਮ"
+msgstr "ਲਾਜੀਕਲ ਵਾਲੀਅਮ(_L)"
#: ../iw/mouse_gui.py:29
msgid "Mouse Configuration"
@@ -3643,9 +3619,8 @@ msgid "IPv6 prefix must be between 0 and 128."
msgstr "IPv6 ਪ੍ਰੀ-ਫਿਕਸ 0 ਤੋਂ 128 ਵਿੱਚ ਹੀ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ।"
#: ../iw/osbootwidget.py:49
-#, fuzzy
msgid "Boot loader operating system list"
-msgstr "ਬੂਟ ਲੋਡਰ ਗੁਪਤ-ਕੋਡ ਬਹੁਤ ਛੋਟਾ ਹੈ"
+msgstr "ਬੂਟ ਲੋਡਰ ਉਪਰੇਟਿੰਗ ਸਿਸਟਮ ਸੂਚੀ"
#: ../iw/osbootwidget.py:65 ../textw/bootloader_text.py:262
msgid "Default"
@@ -3751,9 +3726,8 @@ msgstr "ਫਾਇਲ ਸਿਸਟਮ ਕਿਸਮ(_T):"
#: ../iw/partition_dialog_gui.py:334 ../iw/partition_ui_helpers_gui.py:300
#: ../iw/raid_dialog_gui.py:327
-#, fuzzy
msgid "_Encrypt"
-msgstr "ਇੰਕ੍ਰਿਪਸ਼ਨ ਕੁੰਜੀ"
+msgstr "ਇਨਕ੍ਰਿਪਟ(_E)"
#: ../iw/partition_dialog_gui.py:350
msgid "Allowable _Drives:"
@@ -4003,19 +3977,16 @@ msgid "<Not Applicable>"
msgstr "<ਅਨੁਕੂਲ ਨਹੀਂ>"
#: ../iw/partition_ui_helpers_gui.py:284
-#, fuzzy
msgid "_Format as:"
-msgstr "ਫਾਰਮੈਟ ਇੰਝ:"
+msgstr "ਫਾਰਮੈਟ ਇੰਝ(_F):"
#: ../iw/partition_ui_helpers_gui.py:307
-#, fuzzy
msgid "Mi_grate filesystem to:"
-msgstr "ਫਾਇਲ-ਸਿਸਟਮ ਮਾਈਗਰੇਟ ਕਰੋ"
+msgstr "ਫਾਇਲ-ਸਿਸਟਮ ਮਾਈਗਰੇਟ ਕਰੋ(_G):"
#: ../iw/partition_ui_helpers_gui.py:327 tmp/autopart.glade.h:9
-#, fuzzy
msgid "_Resize"
-msgstr "ਨਿਸ਼ਚਿਤ ਆਕਾਰ(_F)"
+msgstr "ਮੁੜ-ਆਕਾਰ(_R)"
#: ../iw/partition_ui_helpers_gui.py:381
#, python-format
@@ -4262,9 +4233,8 @@ msgid ""
msgstr "%s ਲਈ ਗਰੁੱਪ ਲੱਭਣ ਲਈ ਅਸਫ਼ਲ ਹੈ। ਇਸ ਨਾਲ ਰਿਪੋਜ਼ਟਰੀ ਤੋਂ ਦਸਤੀ ਪੈਕੇਜ ਚੋਣ ਕੰਮ ਨਹੀਂ ਕਰੇਗੀ।"
#: ../iw/task_gui.py:80
-#, fuzzy
msgid "Edit Repository"
-msgstr "ਰਿਪੋਜ਼ਟਰੀ ਸ਼ਾਮਿਲ"
+msgstr "ਰਿਪੋਜ਼ਟਰੀ ਸੋਧੋ"
#: ../iw/task_gui.py:155
msgid "Invalid Repository Name"
@@ -4275,23 +4245,20 @@ msgid "You must provide a repository name."
msgstr "ਤੁਹਾਨੂੰ ਇੱਕ ਰਿਪੋਜ਼ਟਰੀ ਨਾਂ ਦੇਣਾ ਪਵੇਗਾ।"
#: ../iw/task_gui.py:167
-#, fuzzy
msgid "Invalid Proxy URL"
-msgstr "ਗਲਤ ਰਿਪੋਜ਼ਟਰੀ URL"
+msgstr "ਗਲਤ ਪਰਾਕਸੀ URL"
#: ../iw/task_gui.py:168
-#, fuzzy
msgid "You must provide an HTTP, HTTPS, or FTP URL to a proxy."
-msgstr "ਤੁਹਾਨੂੰ ਇੱਕ ਰਿਪੋਜ਼ਟਰੀ ਲਈ ਇੱਕ HTTP ਜਾਂ FTP URL ਦੇਣਾ ਪਵੇਗਾ।"
+msgstr "ਤੁਹਾਨੂੰ ਪਰਾਕਸੀ ਲਈ ਇੱਕ HTTP, HTTPS, ਜਾਂ FTP URL ਦੇਣਾ ਪਵੇਗਾ।"
#: ../iw/task_gui.py:187
msgid "Invalid Repository URL"
msgstr "ਗਲਤ ਰਿਪੋਜ਼ਟਰੀ URL"
#: ../iw/task_gui.py:188
-#, fuzzy
msgid "You must provide an HTTP, HTTPS, or FTP URL to a repository."
-msgstr "ਤੁਹਾਨੂੰ ਇੱਕ ਰਿਪੋਜ਼ਟਰੀ ਲਈ ਇੱਕ HTTP ਜਾਂ FTP URL ਦੇਣਾ ਪਵੇਗਾ।"
+msgstr "ਤੁਹਾਨੂੰ ਇੱਕ ਰਿਪੋਜ਼ਟਰੀ ਲਈ ਇੱਕ HTTP, HTTPS, ਜਾਂ FTP URL ਦੇਣਾ ਪਵੇਗਾ।"
#: ../iw/task_gui.py:227
#, python-format
@@ -4437,11 +4404,11 @@ msgstr ""
#: ../iw/upgrade_swap_gui.py:173
msgid "Swap file _size (MB):"
-msgstr "ਸਵੈਪ ਫਾਇਲ ਆਕਾਰ (MB)(_s):"
+msgstr "ਸਵੈਪ ਫਾਇਲ ਆਕਾਰ (MB)(_S):"
#: ../iw/upgrade_swap_gui.py:183
msgid "I _don't want to create a swap file"
-msgstr "ਮੈਂ ਇੱਕ ਸਵੈਪ ਫਾਇਲ ਨਹੀਂ ਬਣਾਉਣੀ ਚਾਹੁੰਦਾ(_d)"
+msgstr "ਮੈਂ ਇੱਕ ਸਵੈਪ ਫਾਇਲ ਨਹੀਂ ਬਣਾਉਣੀ ਚਾਹੁੰਦਾ(_D)"
#: ../iw/upgrade_swap_gui.py:193
msgid ""
@@ -4612,16 +4579,16 @@ msgid ""
"kernel. For highest security, you should set a password, but a password is "
"not necessary for more casual users."
msgstr ""
-"ਬੂਟ ਲੋਡਰ ਗੁਪਤ-ਕੋਡ ਉਪਭੋਗੀ ਨੂੰ ਕਰਨਲ ਲਈ ਵੱਖਰੀ ਚੋਣ ਭੇਜਣ ਤੋਂ ਰੋਕਦਾ ਹੈ। ਬਹੁਤ ਸਖਤ ਸੁਰੱਖਿਆ ਲਈ ਅਸੀਂ ਇਸ "
-"ਗੁਪਤ-ਕੋਡ ਨੂੰ ਸੈੱਟ ਦੀ ਸਿਫ਼ਾਰਸ਼ ਕਰਦੇ ਹਾਂ, ਪਰ ਆਮ ਉਪਭੋਗੀ ਲਈ ਇਸ ਦੀ ਲੋਡ਼ ਨਹੀਂ ਹੈ।"
+"ਬੂਟ ਲੋਡਰ ਪਾਸਵਰਡ ਉਪਭੋਗੀ ਨੂੰ ਕਰਨਲ ਲਈ ਵੱਖਰੀ ਚੋਣ ਭੇਜਣ ਤੋਂ ਰੋਕਦਾ ਹੈ। ਬਹੁਤ ਸਖਤ ਸੁਰੱਖਿਆ ਲਈ ਅਸੀਂ ਇਸ "
+"ਪਾਸਵਰਡ ਨੂੰ ਸੈੱਟ ਦੀ ਸਿਫ਼ਾਰਸ਼ ਕਰਦੇ ਹਾਂ, ਪਰ ਆਮ ਉਪਭੋਗੀ ਲਈ ਇਸ ਦੀ ਲੋਡ਼ ਨਹੀਂ ਹੈ।"
#: ../textw/bootloader_text.py:400
msgid "Use a GRUB Password"
-msgstr "ਇੱਕ GRUB ਗੁਪਤ-ਕੋਡ ਵਰਤੋ"
+msgstr "ਇੱਕ GRUB ਪਾਸਵਰਡ ਵਰਤੋ"
#: ../textw/bootloader_text.py:412
msgid "Boot Loader Password:"
-msgstr "ਬੂਟ ਲੋਡਰ ਗੁਪਤ-ਕੋਡ:"
+msgstr "ਬੂਟ ਲੋਡਰ ਪਾਸਵਰਡ:"
#: ../textw/bootloader_text.py:413 tmp/account.glade.h:1
msgid "Confirm:"
@@ -4629,15 +4596,15 @@ msgstr "ਪੁਸ਼ਟੀ:"
#: ../textw/bootloader_text.py:442
msgid "Passwords Do Not Match"
-msgstr "ਗੁਪਤ-ਕੋਡ ਮੇਲ ਨਹੀਂ ਖਾਂਦਾ"
+msgstr "ਪਾਸਵਰਡ ਮੇਲ ਨਹੀਂ ਖਾਂਦਾ"
#: ../textw/bootloader_text.py:447
msgid "Password Too Short"
-msgstr "ਗੁਪਤ-ਕੋਡ ਬਹੁਤ ਛੋਟਾ ਹੈ"
+msgstr "ਪਾਸਵਰਡ ਬਹੁਤ ਛੋਟਾ ਹੈ"
#: ../textw/bootloader_text.py:448
msgid "Boot loader password is too short"
-msgstr "ਬੂਟ ਲੋਡਰ ਗੁਪਤ-ਕੋਡ ਬਹੁਤ ਛੋਟਾ ਹੈ"
+msgstr "ਬੂਟ ਲੋਡਰ ਪਾਸਵਰਡ ਬਹੁਤ ਛੋਟਾ ਹੈ"
#: ../textw/complete_text.py:31
msgid ""
@@ -5358,21 +5325,17 @@ msgstr ""
#: ../textw/userauth_text.py:27
msgid "Root Password"
-msgstr "ਪ੍ਰਬੰਧਕ(root) ਗੁਪਤ-ਕੋਡ"
+msgstr "ਪ੍ਰਬੰਧਕ(root) ਪਾਸਵਰਡ"
#: ../textw/userauth_text.py:30
-#, fuzzy
msgid ""
"Pick a root password. You must type it twice to ensure you know it and do "
"not make a typing mistake. "
-msgstr ""
-"ਇੱਕ ਪ੍ਰਬੰਧਕ (root) ਗੁਪਤ-ਕੋਡ ਚੁਣੋ। ਤੁਹਾਨੂੰ ਇਸ ਨੂੰ ਦੋ ਵਾਰ ਲਿਖਣਾ ਪਵੇਗਾ ਤਾਂ ਕਿ ਇਹ ਯਕੀਨ ਬਣਾਇਆ ਜਾ "
-"ਸਕੇ ਕਿ ਤੁਹਾਨੂੰ ਇਹ ਯਾਦ ਹੈ ਅਤੇ ਲਿਖਣ ਵਿੱਚ ਗਲਤੀ ਨਹੀਂ ਕੀਤੀ ਹੈ। ਯਾਦ ਰੱਖੋ ਕਿ ਪ੍ਰਬੰਧਕ (root) ਦਾ "
-"ਗੁਪਤ-ਕੋਡ ਤੁਹਾਡੇ ਸਿਸਟਮ ਦੀ ਸੁਰੱਖਿਆ ਦਾ ਸਭ ਤੋਂ ਨਾਜ਼ੁਕ ਹਿੱਸਾ ਹੈ!"
+msgstr "ਇੱਕ ਪ੍ਰਬੰਧਕ (root) ਪਾਸਵਰਡ ਚੁਣੋ। ਤੁਹਾਨੂੰ ਇਸ ਨੂੰ ਦੋ ਵਾਰ ਲਿਖਣਾ ਪਵੇਗਾ ਤਾਂ ਕਿ ਇਹ ਯਕੀਨ ਬਣਾਇਆ ਜਾ ਸਕੇ ਕਿ ਤੁਹਾਨੂੰ ਇਹ ਯਾਦ ਹੈ ਅਤੇ ਲਿਖਣ ਵਿੱਚ ਗਲਤੀ ਨਹੀਂ ਕੀਤੀ ਹੈ।"
#: ../textw/userauth_text.py:64
msgid "The root password must be at least 6 characters long."
-msgstr "ਪ੍ਰਬੰਧਕ (root) ਗੁਪਤ-ਕੋਡ ਘੱਟੋ-ਘੱਟ 6 ਅੱਖਰਾਂ ਦਾ ਹੋਣਾ ਜ਼ਰੂਰੀ ਹੈ।"
+msgstr "ਪ੍ਰਬੰਧਕ (root) ਪਾਸਵਰਡ ਘੱਟੋ-ਘੱਟ 6 ਅੱਖਰਾਂ ਦਾ ਹੋਣਾ ਜ਼ਰੂਰੀ ਹੈ।"
#: ../textw/welcome_text.py:27
#, python-format
@@ -5832,9 +5795,8 @@ msgid "Error in %s on line %d of kickstart file %s."
msgstr "%s ਵਿੱਚ ਲਾਈਨ %d ਉੱਤੇ ਗਲਤੀ ਹੈ, ਕਿੱਕਸਟਾਰਟ ਫਾਇਲ %s ਵਿੱਚ।"
#: ../loader2/kickstart.c:285
-#, fuzzy
msgid "Cannot find ks.cfg on removable media."
-msgstr "ਬੂਟ ਫਲਾਪੀ ਤੇ ks.cfg ਨਹੀ ਲੱਭੀ"
+msgstr "ਹਟਾਉਣਯੋਗ-ਮਾਧਿਅਮ ਤੇ ks.cfg ਨਹੀ ਲੱਭੀ।"
#: ../loader2/kickstart.c:377
msgid ""
@@ -5854,9 +5816,9 @@ msgid "Bad argument to shutdown kickstart method command %s: %s"
msgstr "ਕਿੱਕਸਟਾਰਟ ਢੰਗ ਕਮਾਂਡ %s ਬੰਦ ਕਰਨ ਲਈ ਗਲਤ ਮੁੱਲ: %s"
#: ../loader2/lang.c:64
-#, fuzzy, c-format
+#, c-format
msgid "Welcome to %s for %s - Rescue Mode"
-msgstr "%s ਵਲੋਂ ਜੀ ਆਇਆਂ ਨੂੰ - ਸੰਕਟਕਾਲੀਨ ਢੰਗ"
+msgstr "%s ਵਲੋਂ %s ਲਈ ਜੀ ਆਇਆਂ ਨੂੰ - ਸੰਕਟਕਾਲੀਨ ਢੰਗ"
#: ../loader2/lang.c:65 ../loader2/loader.c:166
msgid " <Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen "
@@ -5879,9 +5841,9 @@ msgid "NFS directory"
msgstr "NFS ਡਾਇਰੈਕਟਰੀ"
#: ../loader2/loader.c:156
-#, fuzzy, c-format
+#, c-format
msgid "Welcome to %s%n for %s"
-msgstr "%s ਵਲੋਂ ਜੀ ਆਇਆਂ ਨੂੰ"
+msgstr "%s%n ਵਲੋਂ %s ਲਈ ਜੀ ਆਇਆਂ ਨੂੰ"
#: ../loader2/loader.c:374 ../loader2/loader.c:410
msgid "Update Disk Source"
@@ -5896,11 +5858,10 @@ msgstr ""
"ਵਰਤਣਾ ਪਸੰਦ ਕਰੋਗੇ?"
#: ../loader2/loader.c:411
-#, fuzzy
msgid ""
"There are multiple partitions on this device which could contain the update "
"disk image. Which would you like to use?"
-msgstr "ਇਹ ਜੰਤਰ ਉੱਤੇ ਕਈ ਭਾਗ ਹਨ, ਜੋ ਕਿ ਡਰਾਈਵਰ-ਡਿਸਕ ਈਮੇਜ਼ ਰੱਖਦੇ ਹੋ ਸਕਦੇ ਹਨ। ਕਿਹਡ਼ਾ ਤੁਸੀਂ ਵਰਤਣਾ ਚਾਹੋਗੇ?"
+msgstr "ਇਹ ਜੰਤਰ ਉੱਤੇ ਕਈ ਭਾਗ ਹਨ, ਜੋ ਕਿ ਡਰਾਈਵਰ-ਡਿਸਕ ਈਮੇਜ਼ ਰੱਖੇ ਜਾ ਸਕਦੇ ਹਨ। ਤੁਸੀਂ ਕਿਹਡ਼ਾ ਵਰਤਣਾ ਚਾਹੋਗੇ?"
#: ../loader2/loader.c:429
#, c-format
@@ -5924,18 +5885,14 @@ msgid "Reading anaconda updates..."
msgstr "ਐਨਾਕਾਂਡਾ ਅੱਪਡੇਟ ਪੜ੍ਹ ਰਿਹਾ ਹੈ..."
#: ../loader2/loader.c:484
-#, fuzzy
msgid ""
"Unable to download the updates image. Please modify the updates location "
"below or press Cancel to proceed without updates.."
-msgstr ""
-"ਕਿੱਕਸਟਾਰਟ ਫਾਇਲ ਡਾਊਨਲੋਡ ਕਰਨ ਲਈ ਅਸਮਰੱਥ ਹੈ। ਹੇਠਾਂ ਕਿੱਕਸਟਾਰਟ ਮੁੱਲ ਸੋਧੋ ਜਾਂ ਰੱਦ ਕਰੋ ਨੂੰ ਇੰਸਟਾਲੇਸ਼ਨ "
-"ਜਾਰੀ ਰੱਖਣ ਵਾਸਤੇ ਦੱਬੋ।"
+msgstr "ਅੱਪਡੇਟ ਈਮੇਜ਼ ਡਾਊਨਲੋਡ ਕਰਨ ਲਈ ਅਸਮਰੱਥ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਹੇਠਾਂ ਅੱਪਡੇਟ ਸਥਿਤੀ ਸੋਧੋ ਜਾਂ ਅੱਪਡੇਟਾਂ ਤੋਂ ਬਿਨਾਂ ਜਾਰੀ ਕਰਨ ਲਈ ਰੱਦ ਕਰੋ।"
#: ../loader2/loader.c:493
-#, fuzzy
msgid "Error downloading updates image"
-msgstr "ਕਿੱਕਸਟਾਰਟ ਫਾਇਲ ਡਾਊਨਲੋਡ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ"
+msgstr "ਅੱਪਡੇਟ ਇਮੇਜ਼ ਡਾਊਨਲੋਡ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ"
#: ../loader2/loader.c:989
#, c-format
@@ -6006,14 +5963,14 @@ msgid "loader has already been run. Starting shell.\n"
msgstr "ਲੋਡਰ ਤਾਂ ਪਹਿਲਾਂ ਹੀ ਚੱਲ ਰਿਹਾ ਹੈ। ਸ਼ੈੱਲ ਸ਼ੁਰੂ ਹੋ ਰਹੀ ਹੈ।\n"
#: ../loader2/loader.c:1915
-#, fuzzy, c-format
+#, c-format
msgid "Running anaconda %s, the %s rescue mode - please wait...\n"
-msgstr "ਐਨਾਕਾਂਡਾ ਚੱਲ ਰਿਹਾ ਹੈ, %s ਸੰਕਟਕਾਲੀਨ ਢੰਗ - ਉਡੀਕ ਕਰੋ ਜੀ...\n"
+msgstr "ਐਨਾਕਾਂਡਾ %s ਚੱਲ ਰਿਹਾ ਹੈ, %s ਸੰਕਟਕਾਲੀਨ ਢੰਗ - ਉਡੀਕ ਕਰੋ ਜੀ...\n"
#: ../loader2/loader.c:1917
-#, fuzzy, c-format
+#, c-format
msgid "Running anaconda %s, the %s system installer - please wait...\n"
-msgstr "ਐਨਾਕਾਂਡਾ ਚੱਲ ਰਿਹਾ ਹੈ, %s ਸਿਸਟਮ ਇੰਸਟਾਲਰ - ਉਡੀਕ ਕਰੋ ਜੀ...\n"
+msgstr "ਐਨਾਕਾਂਡਾ %s ਚੱਲ ਰਿਹਾ ਹੈ, %s ਸਿਸਟਮ ਇੰਸਟਾਲਰ - ਉਡੀਕ ਕਰੋ ਜੀ...\n"
#: ../loader2/mediacheck.c:62
#, c-format
@@ -6059,9 +6016,8 @@ msgid "Bad argument to device kickstart method command %s: %s"
msgstr "ਜੰਤਰ ਕਿੱਕਸਟਾਰਟ ਢੰਗ ਕਮਾਂਡ %s ਲਈ ਗਲਤ ਆਰਗੂਮੈਂਟ ਹੈ: %s"
#: ../loader2/modules.c:349
-#, fuzzy
msgid "A module name must be specified for the kickstart device command."
-msgstr "ਕਿੱਕਸਟਾਰਟ ਜੰਤਰ ਕਮਾਂਡ ਲਈ ਦੋਵੇਂ ਮੈਡਿਊਲ ਕਿਸਮ ਅਤੇ ਨਾਂ ਦੇਣਾ ਲਾਜ਼ਮੀ ਹੈ।"
+msgstr "ਕਿੱਕਸਟਾਰਟ ਜੰਤਰ ਕਮਾਂਡ ਲਈ ਮੈਡਿਊਲ ਨਾਂ ਦੇਣਾ ਲਾਜ਼ਮੀ ਹੈ।"
#: ../loader2/net.c:57
#, c-format
@@ -6069,6 +6025,8 @@ msgid ""
"Please enter the URL containing %s on your\n"
"server.\n"
msgstr ""
+"ਕਿਰਪਾ ਕਰਕੇ ਆਪਣੇ ਸਰਵਰ ਦਾ URL ਦਿਓ ਜਿੱਥੇ %s ਮੌਜੂਦ\n"
+"ਹੈ।\n"
#: ../loader2/net.c:97
msgid ""
@@ -6290,19 +6248,16 @@ msgid "Retrieving"
msgstr "ਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
#: ../loader2/urls.c:306
-#, fuzzy
msgid "Configure proxy"
-msgstr "TCP/IP ਸੰਰਚਨਾ"
+msgstr "ਪਰਾਕਸੀ ਸੰਰਚਨਾ"
#: ../loader2/urls.c:321
-#, fuzzy
msgid "URL Setup"
-msgstr "NFS ਸੈਟਅੱਪ"
+msgstr "URL ਸੈਟਅੱਪ"
#: ../loader2/urls.c:329
-#, fuzzy
msgid "You must enter a URL."
-msgstr "ਤੁਹਾਨੂੰ ਇੱਕ ਡਾਇਰੈਕਟਰੀ ਦੇਣੀ ਚਾਹੀਦੀ ਹੈ।"
+msgstr "ਤੁਹਾਨੂੰ ਇੱਕ URL ਦੇਣਾ ਚਾਹੀਦਾ ਹੈ।"
#: ../loader2/urls.c:339
msgid "Unknown Host"
@@ -6321,16 +6276,15 @@ msgstr "ਜੇਕਰ ਤੁਸੀਂ HTTP ਪਰਾਕਸੀ ਸਰਵਰ ਵਰ
#: ../loader2/urls.c:401
msgid "Proxy Name:"
-msgstr ""
+msgstr "ਪਰਾਕਸੀ ਨਾਂ:"
#: ../loader2/urls.c:406
msgid "Proxy Port:"
-msgstr ""
+msgstr "ਪਰਾਕਸੀ ਪੋਰਟ:"
#: ../loader2/urls.c:422
-#, fuzzy
msgid "Further Setup"
-msgstr "ਹੋਰ FTP ਸੈਟਅੱਪ"
+msgstr "ਹੋਰ ਸੈਟਅੱਪ"
#: ../loader2/windows.c:63
msgid "Loading SCSI driver"
@@ -6342,9 +6296,8 @@ msgid "Loading %s driver..."
msgstr "ਡਰਾਈਵਰ %s ਲੋਡ ਕਰ ਰਿਹਾ ਹੈ..."
#: tmp/account.glade.h:2
-#, fuzzy
msgid "Root Password:"
-msgstr "ਪ੍ਰਬੰਧਕ(root) ਗੁਪਤ-ਕੋਡ"
+msgstr "ਪ੍ਰਬੰਧਕ(root) ਪਾਸਵਰਡ:"
#: tmp/account.glade.h:3
msgid ""
@@ -6352,7 +6305,7 @@ msgid ""
"the root user."
msgstr ""
"ਪ੍ਰਬੰਧਕ (root) ਖਾਤਾ ਤੁਹਾਡੇ ਸਿਸਟਮ ਦੇ ਪਰਸ਼ਾਸ਼ਨ ਵਾਸਤੇ ਵਰਤਿਆ ਜਾਂਦਾ ਹੈ, ਪ੍ਰਬੰਧਕ (root) ਉਪਭੋਗੀ "
-"ਲਈ ਗੁਪਤ-ਕੋਡ ਭਰੋ।"
+"ਲਈ ਪਾਸਵਰਡ ਭਰੋ।"
#: tmp/adddrive.glade.h:1
msgid "Add _ZFCP LUN"
@@ -6372,49 +6325,41 @@ msgstr "ਡਰਾਈਵ ਸ਼ਾਮਿਲ(_A)"
#: tmp/addrepo.glade.h:1
msgid "<b>Repository _name:</b>"
-msgstr "<b>ਰਿਪੋਜ਼ਟਰੀ ਨਾਂ(_n):</b>"
+msgstr "<b>ਰਿਪੋਜ਼ਟਰੀ ਨਾਂ(_N):</b>"
#: tmp/addrepo.glade.h:2
msgid "Add Repository"
msgstr "ਰਿਪੋਜ਼ਟਰੀ ਸ਼ਾਮਿਲ"
#: tmp/addrepo.glade.h:3
-#, fuzzy
msgid ""
"Please provide the location where your additional software can be installed "
"from."
-msgstr ""
-"ਉਹ ਟਿਕਾਣਾ ਦਿਓ, ਜਿੱਥੋਂ ਹੋਰ ਸਾਫਟਵੇਅਰ ਇੰਸਟਾਲ ਕੀਤੇ ਜਾ ਸਕਦੇ ਹੋ। ਯਾਦ ਰੱਖੋ ਕਿ ਇਹ %s ਲਈ ਠੀਕ "
-"ਰਿਪੋਜ਼ਟਰੀ ਹੋਣੀ ਚਾਹੀਦੀ ਹੈ।"
+msgstr "ਉਹ ਟਿਕਾਣਾ ਦਿਓ, ਜਿੱਥੋਂ ਵਾਧੂ ਸਾਫਟਵੇਅਰ ਇੰਸਟਾਲ ਕੀਤੇ ਜਾ ਸਕਦੇ ਹੋ।"
#: tmp/addrepo.glade.h:4
msgid "Proxy U_RL:"
-msgstr ""
+msgstr "ਪਰਾਕਸੀ U_RL:"
#: tmp/addrepo.glade.h:5
-#, fuzzy
msgid "Proxy pass_word:"
-msgstr "ਕੋਈ ਗੁਪਤ-ਕੋਡ ਨਹੀਂ"
+msgstr "ਪਰਾਕਸੀ ਪਾਸਵਰਡ(_W):"
#: tmp/addrepo.glade.h:6
-#, fuzzy
msgid "Proxy u_sername:"
-msgstr "FTP ਸਾਇਟ ਨਾਂ:"
+msgstr "ਪਰਾਕਸੀ ਉਪਭੋਗੀ-ਨਾਂ (_S):"
#: tmp/addrepo.glade.h:7
-#, fuzzy
msgid "Repository _Mirror"
-msgstr "ਰਿਪੋਜ਼ਟਰੀ ਸ਼ਾਮਿਲ"
+msgstr "ਰਿਪੋਜ਼ਟਰੀ ਮਿਰਰ(_M)"
#: tmp/addrepo.glade.h:8
-#, fuzzy
msgid "Repository _URL"
-msgstr "<b>ਰਿਪੋਜ਼ਟਰੀ _URL:</b>"
+msgstr "ਰਿਪੋਜ਼ਟਰੀ _URL"
#: tmp/addrepo.glade.h:9
-#, fuzzy
msgid "_Proxy configuration"
-msgstr "ਮਾਊਸ ਸੰਰਚਨਾ"
+msgstr "ਪਰਾਕਸੀ ਸੰਰਚਨਾ(_P)"
#: tmp/anaconda.glade.h:1
msgid "Reboo_t"
@@ -6425,9 +6370,8 @@ msgid "_Next"
msgstr "ਅੱਗੇ(_N)"
#: tmp/autopart.glade.h:1
-#, fuzzy
msgid "<b>Resize _target:</b>"
-msgstr "<b>ਰਿਪੋਜ਼ਟਰੀ ਨਾਂ(_n):</b>"
+msgstr "<b>ਟਾਰਗਿਟ ਮੁੜ-ਅਕਾਰ(_T):</b>"
#: tmp/autopart.glade.h:2
msgid ""
@@ -6444,93 +6388,84 @@ msgid "Re_view and modify partitioning layout"
msgstr "ਭਾਗ ਢਾਂਚੇ ਦੀ ਸਮੀਖਿਆ ਅਤੇ ਸੋਧ(_V)"
#: tmp/autopart.glade.h:4
-#, fuzzy
msgid "What drive would you like to _boot this installation from?"
-msgstr "ਇਹ ਇੰਸਟਾਲੇਸ਼ਨ ਨੂੰ ਤੁਸੀਂ ਕਿਸ ਡਰਾਈਵ ਤੋਂ ਬੂਟ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
+msgstr "ਇਸ ਇੰਸਟਾਲੇਸ਼ਨ ਨੂੰ ਤੁਸੀਂ ਕਿਸ ਡਰਾਈਵ ਤੋਂ ਬੂਟ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ (_B)?"
#: tmp/autopart.glade.h:5
msgid "Which Partition to resize"
-msgstr ""
+msgstr "ਮੁੜ-ਅਕਾਰ ਲਈ ਭਾਗ"
#: tmp/autopart.glade.h:6
-#, fuzzy
msgid "Which partition would you like to resize to make room for your installation?"
-msgstr "ਕਿਹਡ਼ਾ ਭਾਗ ਤੁਹਾਡੀ ਇੰਸਟਾਲੇਸ਼ਨ ਦੇ ਰੂਟ-ਭਾਗ (root) ਨੂੰ ਸੰਭਾਲਦਾ ਹੈ?"
+msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਲਈ ਥਾਂ ਬਣਾਉਣ ਲਈ ਤੁਸੀਂ ਕਿਹੜਾ ਭਾਗ ਮੁੜ-ਅਕਾਰ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
#: tmp/autopart.glade.h:7
msgid "_Advanced storage configuration"
msgstr "ਤਕਨੀਕੀ ਸਟੋਰੇਜ਼ ਸੰਰਚਨਾ(_A)"
#: tmp/autopart.glade.h:8
-#, fuzzy
msgid "_Encrypt system"
-msgstr "ਇੰਕ੍ਰਿਪਸ਼ਨ ਕੁੰਜੀ"
+msgstr "ਇਨਕ੍ਰਿਪਟ ਸਿਸਟਮ(_E)"
#: tmp/autopart.glade.h:10
msgid "_Select the drive(s) to use for this installation."
msgstr "ਇਸ ਇੰਸਟਾਲੇਸ਼ਨ ਦੌਰਾਨ ਵਰਤਣ ਲਈ ਡਰਾਈਵਾਂ ਚੁਣੋ(_S)।"
#: tmp/blwhere.glade.h:1
-#, fuzzy
msgid "/boot"
-msgstr "ਮੁਡ਼ ਚਾਲੂ"
+msgstr "/boot"
#: tmp/blwhere.glade.h:2
-#, fuzzy
msgid "BIOS Drive Order"
-msgstr "ਡਰਾਈਵ ਕ੍ਰਮ ਸੋਧ"
+msgstr "BIOS ਡਰਾਈਵ ਕ੍ਰਮ"
#: tmp/blwhere.glade.h:3
-#, fuzzy
msgid "Boot loader device"
-msgstr "ਬੂਟ-ਲੋਡਰ"
+msgstr "ਬੂਟ ਲੋਡਰ ਜੰਤਰ"
#: tmp/blwhere.glade.h:4
msgid "First BIOS drive:"
-msgstr ""
+msgstr "ਪਹਿਲੀ BIOS ਡਰਾਈਵ:"
#: tmp/blwhere.glade.h:5
msgid "Fourth BIOS drive:"
-msgstr ""
+msgstr "ਚੌਥੀ BIOS ਡਰਾਈਵ:"
#: tmp/blwhere.glade.h:6
msgid "MBR"
-msgstr ""
+msgstr "MBR"
#: tmp/blwhere.glade.h:7
msgid "Second BIOS drive:"
-msgstr ""
+msgstr "ਦੂਜੀ BIOS ਡਰਾਈਵ:"
#: tmp/blwhere.glade.h:8
msgid "Third BIOS drive:"
-msgstr ""
+msgstr "ਤੀਜੀ BIOS ਡਰਾਈਵ:"
#: tmp/blwhere.glade.h:9
-#, fuzzy
msgid "Where would you like to install the boot loader for your system?"
-msgstr "ਤੁਸੀਂ ਬੂਟ-ਲੋਡਰ ਕਿੱਥੇ ਇੰਸਟਾਲ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
+msgstr "ਤੁਸੀਂ ਆਪਣੇ ਸਿਸਟਮ ਲਈ ਬੂਟ-ਲੋਡਰ ਕਿੱਥੇ ਇੰਸਟਾਲ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
#: tmp/detailed-dialog.glade.h:1
-#, fuzzy
msgid "Info"
-msgstr "ਅਣਡਿੱਠਾ"
+msgstr "ਜਾਣਕਾਰੀ"
#: tmp/detailed-dialog.glade.h:2
msgid "_Details"
-msgstr ""
+msgstr "ਵੇਰਵਾ(_D)"
#: tmp/exnSave.glade.h:2
msgid "Select a destination for the exception information."
-msgstr ""
+msgstr "ਅੱਪਵਾਦ ਜਾਣਕਾਰੀ ਲਈ ਮੰਜ਼ਿਲ ਚੁਣੋ।"
#: tmp/exnSave.glade.h:3
msgid "_Disk"
-msgstr ""
+msgstr "ਡਿਸਕ(_D)"
#: tmp/exnSave.glade.h:4
-#, fuzzy
msgid "_Remote"
-msgstr "ਰਿਮੋਟ"
+msgstr "ਰਿਮੋਟ(_R)"
#: tmp/instkey.glade.h:2
#, no-c-format
@@ -6544,7 +6479,7 @@ msgstr "ਆਪਣੀ %(instkey)s ਕੁੰਜੀ ਦਿਓ ਜੀ"
#: tmp/iscsi-config.glade.h:1
msgid "<b>_Password:</b>"
-msgstr "<b>ਗੁਪਤ-ਕੋਡ(_P):</b>"
+msgstr "<b>ਪਾਸਵਰਡ(_P):</b>"
#: tmp/iscsi-config.glade.h:2
msgid "<b>_Target IP Address:</b>"
@@ -6578,20 +6513,19 @@ msgstr "ਹਾਰਡ ਡਰਾਈਵ ਉੱਤੇ ਇੰਸਟਾਲ"
msgid ""
"Choose a passphrase for this encrypted partition. You will be prompted for "
"the passphrase during system boot."
-msgstr ""
+msgstr "ਇਸ ਇੰਕ੍ਰਿਪਟਡ ਭਾਗ ਲਈ ਗੁਪਤਕੋਡ ਚੁਣੋ। ਤੁਹਾਨੂੰ ਸਿਸਟਮ ਬੂਟ ਹੋਣ ਤੇ ਗੁਪਤਕੋਡ ਪੁੱਛਿਆ ਜਾਵੇਗਾ।m boot."
#: tmp/lukspassphrase.glade.h:2
-#, fuzzy
msgid "Confirm passphrase:"
-msgstr "ਮੁੜ-ਸੈੱਟ ਪੁਸ਼ਟੀ"
+msgstr "ਗੁਪਤ-ਕੋਡ ਪੁਸ਼ਟੀ:"
#: tmp/lukspassphrase.glade.h:3
msgid "Enter passphrase for encrypted partition"
-msgstr ""
+msgstr "ਇਨਕ੍ਰਿਪਟਡ ਭਾਗ ਲਈ ਗੁਪਤ-ਕੋਡ ਦਿਓ"
#: tmp/lukspassphrase.glade.h:4
msgid "Enter passphrase:"
-msgstr ""
+msgstr "ਗੁਪਤ-ਕੋਡ ਦਿਓ:"
#: tmp/netconfig.glade.h:2
msgid "<b>Gateway:</b>"
@@ -6688,9 +6622,8 @@ msgid "_Customize now"
msgstr "ਆਪਣੀ ਪਸੰਦ(_C)"
#: tmp/tasksel.glade.h:8
-#, fuzzy
msgid "_Modify repository"
-msgstr "ਰਿਪੋਜ਼ਟਰੀ ਸ਼ਾਮਿਲ(_A)"
+msgstr "ਰਿਪੋਜ਼ਟਰੀ ਸੋਧ(_M)"
#: tmp/zfcp-config.glade.h:1
msgid "<b>Device number:</b>"
diff --git a/users.py b/users.py
index 856012db1..3f5d73538 100644
--- a/users.py
+++ b/users.py
@@ -80,10 +80,6 @@ class Users:
def __init__ (self):
self.admin = libuser.admin()
- def reset(self):
- os.unsetenv("LIBUSER_CONF")
- self.admin = libuser.admin()
-
def createUser (self, name=None, password=None, isCrypted=False, groups=[],
homedir=None, shell=None, uid=None, algo=None, lock=False,
root="/mnt/sysimage"):
@@ -92,6 +88,9 @@ class Users:
if not childpid:
os.chroot(root)
+ del(os.environ["LIBUSER_CONF"])
+ self.admin = libuser.admin()
+
try:
if self.admin.lookupUserByName(name):
os._exit(1)
diff --git a/yuminstall.py b/yuminstall.py
index 4fa1fa85b..c3f984f37 100644
--- a/yuminstall.py
+++ b/yuminstall.py
@@ -155,16 +155,16 @@ class AnacondaCallback:
repo = self.repos.getRepo(po.repoid)
- s = _("<b>Installing %s</b> (%s)\n") %(str(po), size_string(hdr['size']))
+ pkgStr = "%s-%s-%s.%s" % (po.name, po.version, po.release, po.name)
+ s = _("<b>Installing %s</b> (%s)\n") %(pkgStr, size_string(hdr['size']))
s += (hdr['summary'] or "")
self.progress.set_label(s)
- nvra = str("%s" %(po,))
- self.instLog.write(self.modeText % (nvra,))
+ self.instLog.write(self.modeText % pkgStr)
self.instLog.flush()
self.openfile = None
-
+
if os.path.exists("%s/var/cache/yum/anaconda-upgrade/packages/%s"
%(self.rootPath,os.path.basename(po.localPkg()))):
try:
@@ -913,7 +913,7 @@ class YumBackend(AnacondaBackend):
waitwin.next_task()
waitwin.pop()
except Exception, e:
- buttons = [_("_Exit installer"), "gtk-edit", _("_Retry")]
+ buttons = [_("_Exit installer"), _("Edit"), _("_Retry")]
else:
break # success
@@ -1614,11 +1614,29 @@ class YumBackend(AnacondaBackend):
return 0
def deselectPackage(self, pkg, *args):
- try:
- mbrs = self.ayum.remove(pattern=pkg)
- return len(mbrs)
- except yum.Errors.RemoveError:
- log.debug("no package matching %s" % pkg)
+ sp = pkg.rsplit(".", 2)
+ txmbrs = []
+ if len(sp) == 2:
+ txmbrs = self.ayum.tsInfo.matchNaevr(name=sp[0], arch=sp[1])
+
+ if len(txmbrs) == 0:
+ exact, match, unmatch = yum.packages.parsePackages(self.ayum.pkgSack.returnPackages(), [pkg], casematch=1)
+ for p in exact + match:
+ txmbrs.append(p)
+
+ if len(txmbrs) > 0:
+ for x in txmbrs:
+ self.ayum.tsInfo.remove(x.pkgtup)
+ # we also need to remove from the conditionals
+ # dict so that things don't get pulled back in as a result
+ # of them. yes, this is ugly. conditionals should die.
+ for req, pkgs in self.ayum.tsInfo.conditionals.iteritems():
+ if x in pkgs:
+ pkgs.remove(x)
+ self.ayum.tsInfo.conditionals[req] = pkgs
+ return len(txmbrs)
+ else:
+ log.debug("no such package %s to remove" %(pkg,))
return 0
def upgradeFindPackages(self):
generated by cgit (git 2.34.1) at 2024-10-02 07:21:15 +0000