summaryrefslogtreecommitdiffstats
path: root/perl-install/share/po/he.po
diff options
context:
space:
mode:
authorAhmad Samir <ahmad@mageia.org>2011-04-04 21:02:13 +0000
committerAhmad Samir <ahmad@mageia.org>2011-04-04 21:02:13 +0000
commit403de5c0474df05f0808493cf203de0888429074 (patch)
treebb9980d27e869841bf7a7fece5e41eb520f158ce /perl-install/share/po/he.po
parent2aff8fb5001014bfef0c554ca77025a09eb6be72 (diff)
downloaddrakx-403de5c0474df05f0808493cf203de0888429074.tar
drakx-403de5c0474df05f0808493cf203de0888429074.tar.gz
drakx-403de5c0474df05f0808493cf203de0888429074.tar.bz2
drakx-403de5c0474df05f0808493cf203de0888429074.tar.xz
drakx-403de5c0474df05f0808493cf203de0888429074.zip
- perl -pi -e 's!need to reboot before the modification can take place"!"need to reboot before the modification can take effect"!'
- perl -pi -e 's!"You need to reboot for the partition table modifications to take place"!"You need to reboot for the partition table modifications to take effect"!'
Diffstat (limited to 'perl-install/share/po/he.po')
-rw-r--r--perl-install/share/po/he.po4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/share/po/he.po b/perl-install/share/po/he.po
index ad529a5d7..43be68a49 100644
--- a/perl-install/share/po/he.po
+++ b/perl-install/share/po/he.po
@@ -1472,7 +1472,7 @@ msgstr "האם ברצונך לשמור את שינויי /etc/fstab"
#: diskdrake/interactive.pm:301 fs/partitioning_wizard.pm:283
#, c-format
-msgid "You need to reboot for the partition table modifications to take place"
+msgid "You need to reboot for the partition table modifications to take effect"
msgstr "יש צורך בהפעלת המחשב מחדש בכדי שהשינויים בטבלת המחיצות יכנסו לתוקף"
#: diskdrake/interactive.pm:306
@@ -1948,7 +1948,7 @@ msgstr "איזה סוג חלוקה למחיצות?"
#: diskdrake/interactive.pm:1235
#, c-format
-msgid "You'll need to reboot before the modification can take place"
+msgid "You'll need to reboot before the modification can take effect"
msgstr "יש צורך להפעיל מחדש את המחשב בכדי שהשינויים יכנסו לתוקף"
#: diskdrake/interactive.pm:1244
='#n207'>207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226
/*
 * Guillaume Cottenceau (gc)
 *
 * Copyright 2000 Mandriva
 *
 * This software may be freely redistributed under the terms of the GNU
 * public license.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 *
 */

/*
 * Portions from Erik Troan (ewt@redhat.com)
 *
 * Copyright 1996 Red Hat Software 
 *
 */

#include <stdlib.h>
#include <unistd.h>
#include <string.h>
#include <stdio.h>
#include <sys/mount.h>
#include "stage1.h"
#include "frontend.h"
#include "modules.h"
#include "probing.h"
#include "log.h"
#include "mount.h"
#include "tools.h"
#include "utils.h"

#include "cdrom.h"


static int mount_that_cd_device(char * dev_name)
{
	char device_fullname[50];
	int mount_result;

	snprintf(device_fullname, sizeof(device_fullname), "/dev/%s", dev_name);

	mount_result = my_mount(device_fullname, MEDIA_LOCATION, "iso9660", 0);

	create_IMAGE_LOCATION(MEDIA_LOCATION);

	return mount_result;
}


static enum return_type try_with_device(char * dev_name, char * dev_model);

static enum return_type do_with_device(char * dev_name, char * dev_model)
{
	if (!image_has_stage2()) {
		enum return_type results;
		umount(MEDIA_LOCATION);
		results = ask_yes_no("That CDROM disc does not seem to be a " DISTRIB_NAME " Installation CDROM.\nRetry with another disc?");
		if (results == RETURN_OK)
			return try_with_device(dev_name, dev_model);
		return results;
	}

	log_message("found a " DISTRIB_NAME " CDROM, good news!");

	may_load_compressed_image();

	if (!KEEP_MOUNTED)
		/* in rescue mode, we don't need the media anymore */
		umount(MEDIA_LOCATION);

        add_to_env("METHOD", "cdrom");
	return RETURN_OK;
}		

static enum return_type try_with_device(char * dev_name, char * dev_model)
{
	wait_message("Trying to access a CDROM disc (drive %s)", dev_model);

	if (mount_that_cd_device(dev_name) == -1) {
		enum return_type results;
		char msg[500];
		unset_automatic(); /* we are in a fallback mode */
		remove_wait_message();

		snprintf(msg, sizeof(msg), "I can't access a " DISTRIB_NAME " Installation disc in your CDROM drive (%s).\nRetry?", dev_model);
		results = ask_yes_no(msg);
		if (results == RETURN_OK)
			return try_with_device(dev_name, dev_model);
		return results;
	}	
	remove_wait_message();

	return do_with_device(dev_name, dev_model);
}

int try_automatic(char ** medias, char ** medias_models)
{
	static char * already_tried[50] = { NULL };
	char ** model = medias_models;
	char ** ptr = medias;
	int i = 0;
	while (ptr && *ptr) {
		char ** p;
		for (p = already_tried; p && *p; p++)
			if (streq(*p, *ptr)) 
				goto try_automatic_already_tried;
		*p = strdup(*ptr);
		*(p+1) = NULL;

		wait_message("Trying to access " DISTRIB_NAME " CDROM disc (drive %s)", *model);
		if (mount_that_cd_device(*ptr) != -1) {
			if (image_has_stage2()) {
				remove_wait_message();
				return i;
			}
			else
				umount(MEDIA_LOCATION);
		}
		remove_wait_message();

	try_automatic_already_tried:
		ptr++;
		model++;
		i++;
	}
	return -1;
}

enum return_type cdrom_prepare(void)
{
	char ** medias, ** ptr, ** medias_models;
	char * choice;
	int i, count = 0;
	enum return_type results;
	static int already_probed_ide_generic = 0;

	my_insmod("ide_cd_mod", ANY_DRIVER_TYPE, NULL, 0);

	if (IS_AUTOMATIC) {
		get_medias(CDROM, &medias, &medias_models, BUS_IDE);
		if ((i = try_automatic(medias, medias_models)) != -1)
			return do_with_device(medias[i], medias_models[i]);
		
		get_medias(CDROM, &medias, &medias_models, BUS_PCMCIA);
		if ((i = try_automatic(medias, medias_models)) != -1)
			return do_with_device(medias[i], medias_models[i]);
		
		my_insmod("sr_mod", ANY_DRIVER_TYPE, NULL, 0);
		get_medias(CDROM, &medias, &medias_models, BUS_SCSI);
		if ((i = try_automatic(medias, medias_models)) != -1)
			return do_with_device(medias[i], medias_models[i]);
		
		get_medias(CDROM, &medias, &medias_models, BUS_USB);
		if ((i = try_automatic(medias, medias_models)) != -1)
			return do_with_device(medias[i], medias_models[i]);

		/* detect hybrid isos (isos dumped to an USB stick) */
		my_insmod("sd_mod", ANY_DRIVER_TYPE, NULL, 0);
		get_medias(DISK, &medias, &medias_models, BUS_USB);
		if ((i = try_automatic(medias, medias_models)) != -1) {
			return do_with_device(medias[i], medias_models[i]);
		}

		unset_automatic();
	} else
		my_insmod("sr_mod", ANY_DRIVER_TYPE, NULL, 0);


	get_medias(CDROM, &medias, &medias_models, BUS_ANY);
        ptr = medias;
        while (ptr && *ptr) {
                count++;
                ptr++;
        }

	if (count == 0) {
		if (!already_probed_ide_generic) {
			already_probed_ide_generic = 1;
			my_insmod("ide_generic", ANY_DRIVER_TYPE, NULL, 0);
			return cdrom_prepare();
		}
		stg1_error_message("No CDROM device found.");
		i = ask_insmod(MEDIA_ADAPTERS);
		if (i == RETURN_BACK)
			return RETURN_BACK;
		return cdrom_prepare();
	}

	if (count == 1) {
		results = try_with_device(*medias, *medias_models);
		if (results == RETURN_OK)
			return RETURN_OK;
		i = ask_insmod(MEDIA_ADAPTERS);
		if (i == RETURN_BACK)
			return RETURN_BACK;
		return cdrom_prepare();
	}

	results = ask_from_list_comments("Please choose the CDROM drive to use for the installation.", medias, medias_models, &choice);
	if (results == RETURN_OK) {
		char ** model = medias_models;
		ptr = medias;
		while (ptr && *ptr && model && *model) {
			if (!strcmp(*ptr, choice))
				break;
			ptr++;
			model++;
		}
			results = try_with_device(choice, *model);
	} else
		return results;

	if (results == RETURN_OK)
		return RETURN_OK;
	if (results == RETURN_BACK)
		return cdrom_prepare();

	i = ask_insmod(MEDIA_ADAPTERS);
	if (i == RETURN_BACK)
		return RETURN_BACK;
	return cdrom_prepare();
}