public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in media-video/gnome-mplayer/files: gnome-mplayer-0.9.5-nautilus-gettext.patch gnome-mplayer-0.9.5-gettext.patch
@ 2009-06-01 19:22 Ben de Groot (yngwin)
  0 siblings, 0 replies; only message in thread
From: Ben de Groot (yngwin) @ 2009-06-01 19:22 UTC (permalink / raw
  To: gentoo-commits

yngwin      09/06/01 19:22:54

  Added:                gnome-mplayer-0.9.5-nautilus-gettext.patch
  Removed:              gnome-mplayer-0.9.5-gettext.patch
  Log:
  Add patch from bug 266801 that actually applies, and edit ebuild to make sure the patch actually gets applied...
  (Portage version: 2.2_rc33/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  media-video/gnome-mplayer/files/gnome-mplayer-0.9.5-nautilus-gettext.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/gnome-mplayer/files/gnome-mplayer-0.9.5-nautilus-gettext.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/gnome-mplayer/files/gnome-mplayer-0.9.5-nautilus-gettext.patch?rev=1.1&content-type=text/plain

Index: gnome-mplayer-0.9.5-nautilus-gettext.patch
===================================================================
Index: src/nautilus_property_page.c
===================================================================
--- src/nautilus_property_page.c	(wersja 1179)
+++ src/nautilus_property_page.c	(wersja 1246)
@@ -22,7 +22,9 @@
  * 	Boston, MA  02110-1301, USA.
  */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
 #include "mime_types.h"
 #include <libnautilus-extension/nautilus-extension-types.h>
 #include <libnautilus-extension/nautilus-property-page-provider.h>
@@ -82,9 +84,9 @@
     }
 
     if (hour == 0) {
-        result = g_strdup_printf(_("%2i:%02.0f"), min, seconds);
+        result = g_strdup_printf(dgettext(GETTEXT_PACKAGE,"%2i:%02.0f"), min, seconds);
     } else {
-        result = g_strdup_printf(_("%i:%02i:%02.0f"), hour, min, seconds);
+        result = g_strdup_printf(dgettext(GETTEXT_PACKAGE,"%i:%02i:%02.0f"), hour, min, seconds);
     }
     return g_strstrip(result);
 }
@@ -263,7 +265,7 @@
 
         data = get_metadata(filename);
 
-        label = gtk_label_new(_("<span weight=\"bold\">Media Details</span>"));
+        label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"<span weight=\"bold\">Media Details</span>"));
         gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
         gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
         gtk_misc_set_padding(GTK_MISC(label), 0, 6);
@@ -271,7 +273,7 @@
         i++;
 
         if (data->title && strlen(data->title) > 0) {
-            label = gtk_label_new(_("Title"));
+            label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Title"));
             gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
             gtk_misc_set_padding(GTK_MISC(label), 12, 0);
             gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
@@ -283,7 +285,7 @@
         }
 
         if (data->artist && strlen(data->artist) > 0) {
-            label = gtk_label_new(_("Artist"));
+            label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Artist"));
             gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
             gtk_misc_set_padding(GTK_MISC(label), 12, 0);
             gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
@@ -295,7 +297,7 @@
         }
 
         if (data->album && strlen(data->album) > 0) {
-            label = gtk_label_new(_("Album"));
+            label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Album"));
             gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
             gtk_misc_set_padding(GTK_MISC(label), 12, 0);
             gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
@@ -307,7 +309,7 @@
         }
 
         if (data->length) {
-            label = gtk_label_new(_("Length"));
+            label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Length"));
             gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
             gtk_misc_set_padding(GTK_MISC(label), 12, 0);
             gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
@@ -319,7 +321,7 @@
         }
 
         if (data->demuxer && strlen(data->demuxer) > 0) {
-            label = gtk_label_new(_("Demuxer"));
+            label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Demuxer"));
             gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
             gtk_misc_set_padding(GTK_MISC(label), 12, 0);
             gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
@@ -331,14 +333,14 @@
         }
 
         if (data->video_present) {
-            label = gtk_label_new(_("<span weight=\"bold\">Video Details</span>"));
+            label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"<span weight=\"bold\">Video Details</span>"));
             gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
             gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
             gtk_misc_set_padding(GTK_MISC(label), 0, 6);
             gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
             i++;
 
-            label = gtk_label_new(_("Video Size:"));
+            label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Video Size:"));
             gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
             gtk_misc_set_padding(GTK_MISC(label), 12, 0);
             gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
@@ -349,7 +351,7 @@
             g_free(buf);
             i++;
 
-            label = gtk_label_new(_("Video Codec:"));
+            label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Video Codec:"));
             gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
             gtk_misc_set_padding(GTK_MISC(label), 12, 0);
             gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
@@ -360,7 +362,7 @@
             gtk_table_attach_defaults(GTK_TABLE(page), label, 1, 2, i, i + 1);
             i++;
 
-            label = gtk_label_new(_("Video Bitrate:"));
+            label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Video Bitrate:"));
             gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
             gtk_misc_set_padding(GTK_MISC(label), 12, 0);
             gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
@@ -371,7 +373,7 @@
             gtk_table_attach_defaults(GTK_TABLE(page), label, 1, 2, i, i + 1);
             i++;
 
-            label = gtk_label_new(_("Video Frame Rate:"));
+            label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Video Frame Rate:"));
             gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
             gtk_misc_set_padding(GTK_MISC(label), 12, 0);
             gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
@@ -385,14 +387,14 @@
         }
 
         if (data->audio_present) {
-            label = gtk_label_new(_("<span weight=\"bold\">Audio Details</span>"));
+            label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"<span weight=\"bold\">Audio Details</span>"));
             gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
             gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
             gtk_misc_set_padding(GTK_MISC(label), 0, 6);
             gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
             i++;
 
-            label = gtk_label_new(_("Audio Codec:"));
+            label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Audio Codec:"));
             gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
             gtk_misc_set_padding(GTK_MISC(label), 12, 0);
             gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
@@ -403,7 +405,7 @@
             gtk_table_attach_defaults(GTK_TABLE(page), label, 1, 2, i, i + 1);
             i++;
 
-            label = gtk_label_new(_("Audio Bitrate:"));
+            label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Audio Bitrate:"));
             gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
             gtk_misc_set_padding(GTK_MISC(label), 12, 0);
             gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
@@ -415,7 +417,7 @@
             i++;
 
             if (g_strtod(data->audio_nch, NULL) > 0) {
-                label = gtk_label_new(_("Audio Channels:"));
+                label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Audio Channels:"));
                 gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
                 gtk_misc_set_padding(GTK_MISC(label), 12, 0);
                 gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
@@ -473,7 +475,7 @@
 
     if (found) {
         uri = nautilus_file_info_get_uri(file);
-        label = gtk_label_new(_("Audio/Video"));
+        label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Audio/Video"));
         page = gtk_table_new(20, 2, FALSE);
         gtk_container_set_border_width(GTK_CONTAINER(page), 6);
         if (get_properties(page, uri)) {
@@ -528,7 +530,9 @@
 #ifdef ENABLE_NLS
     bindtextdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
     bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
-    textdomain(GETTEXT_PACKAGE);
+	// specify the domain in the translation calls so
+	// we don't mess up the translation of the other tabs
+	// textdomain(GETTEXT_PACKAGE);
 #endif
 
     gnome_mplayer_properties_plugin_register_type(module);






^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2009-06-01 19:22 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-06-01 19:22 [gentoo-commits] gentoo-x86 commit in media-video/gnome-mplayer/files: gnome-mplayer-0.9.5-nautilus-gettext.patch gnome-mplayer-0.9.5-gettext.patch Ben de Groot (yngwin)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox