nautilus r14192 - in trunk: . libnautilus-private src

[cneumair svn gnome org]

Author: cneumair
Date: Fri May 23 22:39:48 2008
New Revision: 14192
URL: http://svn.gnome.org/viewvc/nautilus?rev=14192&view=rev

Log:
2008-05-24  Christian Neumair  <cneumair gnome org>

	* libnautilus-private/apps_nautilus_preferences.schemas.in:
	* libnautilus-private/nautilus-autorun.c:
	* src/nautilus-autorun-software.c
	(present_autorun_for_software_dialog):
	Use medium as singular of media. Fixes #522986.


Modified:
   trunk/ChangeLog
   trunk/libnautilus-private/apps_nautilus_preferences.schemas.in
   trunk/libnautilus-private/nautilus-autorun.c
   trunk/src/nautilus-autorun-software.c

Modified: trunk/libnautilus-private/apps_nautilus_preferences.schemas.in
==============================================================================
--- trunk/libnautilus-private/apps_nautilus_preferences.schemas.in	(original)
+++ trunk/libnautilus-private/apps_nautilus_preferences.schemas.in	Fri May 23 22:39:48 2008
@@ -108,10 +108,10 @@
       <type>bool</type>
       <default>false</default>
       <locale name="C">
-         <short>Never prompt or autorun/autostart programs when media is inserted</short>
+         <short>Never prompt or autorun/autostart programs when media are inserted</short>
          <long>
            If set to true, then Nautilus will never prompt nor autorun/autostart
-           programs when media is inserted.
+           programs when a medium is inserted.
          </long>
       </locale>
     </schema>

Modified: trunk/libnautilus-private/nautilus-autorun.c
==============================================================================
--- trunk/libnautilus-private/nautilus-autorun.c	(original)
+++ trunk/libnautilus-private/nautilus-autorun.c	Fri May 23 22:39:48 2008
@@ -1103,14 +1103,14 @@
 	} else if (strcmp (x_content_type, "x-content/image-picturecd") == 0) {
 		media_greeting = _("You have just inserted a Picture CD.");
 	} else if (strcmp (x_content_type, "x-content/image-dcf") == 0) {
-		media_greeting = _("You have just inserted media with digital photos.");
+		media_greeting = _("You have just inserted a medium with digital photos.");
 	} else if (strcmp (x_content_type, "x-content/audio-player") == 0) {
 		media_greeting = _("You have just inserted a digital audio player.");
 	} else if (strcmp (x_content_type, "x-content/software") == 0) {
-		media_greeting = _("You have just inserted media with software intended to be automatically started.");
+		media_greeting = _("You have just inserted a medium with software intended to be automatically started.");
 	} else {
 		/* fallback to generic greeting */
-		media_greeting = _("You have just inserted media.");
+		media_greeting = _("You have just inserted a medium.");
 	}
 	markup = g_strdup_printf ("<big><b>%s %s</b></big>", media_greeting, _("Choose what application to launch."));
 	gtk_label_set_markup (GTK_LABEL (label), markup);

Modified: trunk/src/nautilus-autorun-software.c
==============================================================================
--- trunk/src/nautilus-autorun-software.c	(original)
+++ trunk/src/nautilus-autorun-software.c	Fri May 23 22:39:48 2008
@@ -191,9 +191,9 @@
 						     0,
 						     GTK_MESSAGE_OTHER,
 						     GTK_BUTTONS_CANCEL,
-						     _("<big><b>This media contains software intended to be automatically started. Would you like to run it?</b></big>"));
+						     _("<big><b>This medium contains software intended to be automatically started. Would you like to run it?</b></big>"));
 	gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-						  _("The software will run directly from the media \"%s\". "
+						  _("The software will run directly from the medium \"%s\". "
 						    "You should never run software that you don't trust.\n"
 						    "\n"
 						    "If in doubt, press Cancel."),