Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Steve Dibb (beandog)" <beandog@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-video/gnome-mplayer/files: gnome-mplayer-0.9.5-gettext.patch
Date: Fri, 29 May 2009 21:47:31
Message-Id: E1MA9vE-0002XF-B1@stork.gentoo.org
1 beandog 09/05/29 21:47:28
2
3 Added: gnome-mplayer-0.9.5-gettext.patch
4 Log:
5 Apply upstream diff to build against nautilus, bug 266801
6 (Portage version: 2.2_rc33/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 media-video/gnome-mplayer/files/gnome-mplayer-0.9.5-gettext.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/gnome-mplayer/files/gnome-mplayer-0.9.5-gettext.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/gnome-mplayer/files/gnome-mplayer-0.9.5-gettext.patch?rev=1.1&content-type=text/plain
13
14 Index: gnome-mplayer-0.9.5-gettext.patch
15 ===================================================================
16 --- src/nautilus_property_page.c (revision 1243)
17 +++ src/nautilus_property_page.c (working copy)
18 @@ -84,9 +84,9 @@
19 }
20
21 if (hour == 0) {
22 - result = g_strdup_printf(_("%2i:%02.0f"), min, seconds);
23 + result = g_strdup_printf(dgettext(GETTEXT_PACKAGE,"%2i:%02.0f"), min, seconds);
24 } else {
25 - result = g_strdup_printf(_("%i:%02i:%02.0f"), hour, min, seconds);
26 + result = g_strdup_printf(dgettext(GETTEXT_PACKAGE,"%i:%02i:%02.0f"), hour, min, seconds);
27 }
28 return g_strstrip(result);
29 }
30 @@ -265,7 +265,7 @@
31
32 data = get_metadata(filename);
33
34 - label = gtk_label_new(_("<span weight=\"bold\">Media Details</span>"));
35 + label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"<span weight=\"bold\">Media Details</span>"));
36 gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
37 gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
38 gtk_misc_set_padding(GTK_MISC(label), 0, 6);
39 @@ -273,7 +273,7 @@
40 i++;
41
42 if (data->title && strlen(data->title) > 0) {
43 - label = gtk_label_new(_("Title"));
44 + label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Title"));
45 gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
46 gtk_misc_set_padding(GTK_MISC(label), 12, 0);
47 gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
48 @@ -285,7 +285,7 @@
49 }
50
51 if (data->artist && strlen(data->artist) > 0) {
52 - label = gtk_label_new(_("Artist"));
53 + label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Artist"));
54 gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
55 gtk_misc_set_padding(GTK_MISC(label), 12, 0);
56 gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
57 @@ -297,7 +297,7 @@
58 }
59
60 if (data->album && strlen(data->album) > 0) {
61 - label = gtk_label_new(_("Album"));
62 + label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Album"));
63 gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
64 gtk_misc_set_padding(GTK_MISC(label), 12, 0);
65 gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
66 @@ -309,7 +309,7 @@
67 }
68
69 if (data->length) {
70 - label = gtk_label_new(_("Length"));
71 + label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Length"));
72 gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
73 gtk_misc_set_padding(GTK_MISC(label), 12, 0);
74 gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
75 @@ -321,7 +321,7 @@
76 }
77
78 if (data->demuxer && strlen(data->demuxer) > 0) {
79 - label = gtk_label_new(_("Demuxer"));
80 + label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Demuxer"));
81 gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
82 gtk_misc_set_padding(GTK_MISC(label), 12, 0);
83 gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
84 @@ -333,14 +333,14 @@
85 }
86
87 if (data->video_present) {
88 - label = gtk_label_new(_("<span weight=\"bold\">Video Details</span>"));
89 + label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"<span weight=\"bold\">Video Details</span>"));
90 gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
91 gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
92 gtk_misc_set_padding(GTK_MISC(label), 0, 6);
93 gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
94 i++;
95
96 - label = gtk_label_new(_("Video Size:"));
97 + label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Video Size:"));
98 gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
99 gtk_misc_set_padding(GTK_MISC(label), 12, 0);
100 gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
101 @@ -351,7 +351,7 @@
102 g_free(buf);
103 i++;
104
105 - label = gtk_label_new(_("Video Codec:"));
106 + label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Video Codec:"));
107 gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
108 gtk_misc_set_padding(GTK_MISC(label), 12, 0);
109 gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
110 @@ -362,7 +362,7 @@
111 gtk_table_attach_defaults(GTK_TABLE(page), label, 1, 2, i, i + 1);
112 i++;
113
114 - label = gtk_label_new(_("Video Bitrate:"));
115 + label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Video Bitrate:"));
116 gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
117 gtk_misc_set_padding(GTK_MISC(label), 12, 0);
118 gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
119 @@ -373,7 +373,7 @@
120 gtk_table_attach_defaults(GTK_TABLE(page), label, 1, 2, i, i + 1);
121 i++;
122
123 - label = gtk_label_new(_("Video Frame Rate:"));
124 + label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Video Frame Rate:"));
125 gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
126 gtk_misc_set_padding(GTK_MISC(label), 12, 0);
127 gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
128 @@ -387,14 +387,14 @@
129 }
130
131 if (data->audio_present) {
132 - label = gtk_label_new(_("<span weight=\"bold\">Audio Details</span>"));
133 + label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"<span weight=\"bold\">Audio Details</span>"));
134 gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
135 gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
136 gtk_misc_set_padding(GTK_MISC(label), 0, 6);
137 gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
138 i++;
139
140 - label = gtk_label_new(_("Audio Codec:"));
141 + label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Audio Codec:"));
142 gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
143 gtk_misc_set_padding(GTK_MISC(label), 12, 0);
144 gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
145 @@ -405,7 +405,7 @@
146 gtk_table_attach_defaults(GTK_TABLE(page), label, 1, 2, i, i + 1);
147 i++;
148
149 - label = gtk_label_new(_("Audio Bitrate:"));
150 + label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Audio Bitrate:"));
151 gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
152 gtk_misc_set_padding(GTK_MISC(label), 12, 0);
153 gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
154 @@ -417,7 +417,7 @@
155 i++;
156
157 if (g_strtod(data->audio_nch, NULL) > 0) {
158 - label = gtk_label_new(_("Audio Channels:"));
159 + label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Audio Channels:"));
160 gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
161 gtk_misc_set_padding(GTK_MISC(label), 12, 0);
162 gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
163 @@ -475,7 +475,7 @@
164
165 if (found) {
166 uri = nautilus_file_info_get_uri(file);
167 - label = gtk_label_new(_("Audio/Video"));
168 + label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Audio/Video"));
169 page = gtk_table_new(20, 2, FALSE);
170 gtk_container_set_border_width(GTK_CONTAINER(page), 6);
171 if (get_properties(page, uri)) {
172 @@ -528,8 +528,11 @@
173 {
174
175 #ifdef ENABLE_NLS
176 + //printf("%s\n",GETTEXT_PACKAGE);
177 + //printf("%s\n",PACKAGE_LOCALE_DIR);
178 bindtextdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
179 bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
180 + //textdomain(GETTEXT_PACKAGE);
181 #endif
182
183 gnome_mplayer_properties_plugin_register_type(module);
Report Message
Find on MARC Find on Google Groups