Gentoo Archives: gentoo-commits

From: "Ben de Groot (yngwin)" <yngwin@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-nautilus-gettext.patch gnome-mplayer-0.9.5-gettext.patch
Date: Mon, 01 Jun 2009 19:22:56
Message-Id: E1MBD5y-0003wN-Qq@stork.gentoo.org
1 yngwin 09/06/01 19:22:54
2
3 Added: gnome-mplayer-0.9.5-nautilus-gettext.patch
4 Removed: gnome-mplayer-0.9.5-gettext.patch
5 Log:
6 Add patch from bug 266801 that actually applies, and edit ebuild to make sure the patch actually gets applied...
7 (Portage version: 2.2_rc33/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 media-video/gnome-mplayer/files/gnome-mplayer-0.9.5-nautilus-gettext.patch
11
12 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
13 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
14
15 Index: gnome-mplayer-0.9.5-nautilus-gettext.patch
16 ===================================================================
17 Index: src/nautilus_property_page.c
18 ===================================================================
19 --- src/nautilus_property_page.c (wersja 1179)
20 +++ src/nautilus_property_page.c (wersja 1246)
21 @@ -22,7 +22,9 @@
22 * Boston, MA 02110-1301, USA.
23 */
24
25 -#include "config.h"
26 +#ifdef HAVE_CONFIG_H
27 +# include <config.h>
28 +#endif
29 #include "mime_types.h"
30 #include <libnautilus-extension/nautilus-extension-types.h>
31 #include <libnautilus-extension/nautilus-property-page-provider.h>
32 @@ -82,9 +84,9 @@
33 }
34
35 if (hour == 0) {
36 - result = g_strdup_printf(_("%2i:%02.0f"), min, seconds);
37 + result = g_strdup_printf(dgettext(GETTEXT_PACKAGE,"%2i:%02.0f"), min, seconds);
38 } else {
39 - result = g_strdup_printf(_("%i:%02i:%02.0f"), hour, min, seconds);
40 + result = g_strdup_printf(dgettext(GETTEXT_PACKAGE,"%i:%02i:%02.0f"), hour, min, seconds);
41 }
42 return g_strstrip(result);
43 }
44 @@ -263,7 +265,7 @@
45
46 data = get_metadata(filename);
47
48 - label = gtk_label_new(_("<span weight=\"bold\">Media Details</span>"));
49 + label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"<span weight=\"bold\">Media Details</span>"));
50 gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
51 gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
52 gtk_misc_set_padding(GTK_MISC(label), 0, 6);
53 @@ -271,7 +273,7 @@
54 i++;
55
56 if (data->title && strlen(data->title) > 0) {
57 - label = gtk_label_new(_("Title"));
58 + label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Title"));
59 gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
60 gtk_misc_set_padding(GTK_MISC(label), 12, 0);
61 gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
62 @@ -283,7 +285,7 @@
63 }
64
65 if (data->artist && strlen(data->artist) > 0) {
66 - label = gtk_label_new(_("Artist"));
67 + label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Artist"));
68 gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
69 gtk_misc_set_padding(GTK_MISC(label), 12, 0);
70 gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
71 @@ -295,7 +297,7 @@
72 }
73
74 if (data->album && strlen(data->album) > 0) {
75 - label = gtk_label_new(_("Album"));
76 + label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Album"));
77 gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
78 gtk_misc_set_padding(GTK_MISC(label), 12, 0);
79 gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
80 @@ -307,7 +309,7 @@
81 }
82
83 if (data->length) {
84 - label = gtk_label_new(_("Length"));
85 + label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Length"));
86 gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
87 gtk_misc_set_padding(GTK_MISC(label), 12, 0);
88 gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
89 @@ -319,7 +321,7 @@
90 }
91
92 if (data->demuxer && strlen(data->demuxer) > 0) {
93 - label = gtk_label_new(_("Demuxer"));
94 + label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Demuxer"));
95 gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
96 gtk_misc_set_padding(GTK_MISC(label), 12, 0);
97 gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
98 @@ -331,14 +333,14 @@
99 }
100
101 if (data->video_present) {
102 - label = gtk_label_new(_("<span weight=\"bold\">Video Details</span>"));
103 + label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"<span weight=\"bold\">Video Details</span>"));
104 gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
105 gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
106 gtk_misc_set_padding(GTK_MISC(label), 0, 6);
107 gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
108 i++;
109
110 - label = gtk_label_new(_("Video Size:"));
111 + label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Video Size:"));
112 gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
113 gtk_misc_set_padding(GTK_MISC(label), 12, 0);
114 gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
115 @@ -349,7 +351,7 @@
116 g_free(buf);
117 i++;
118
119 - label = gtk_label_new(_("Video Codec:"));
120 + label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Video Codec:"));
121 gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
122 gtk_misc_set_padding(GTK_MISC(label), 12, 0);
123 gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
124 @@ -360,7 +362,7 @@
125 gtk_table_attach_defaults(GTK_TABLE(page), label, 1, 2, i, i + 1);
126 i++;
127
128 - label = gtk_label_new(_("Video Bitrate:"));
129 + label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Video Bitrate:"));
130 gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
131 gtk_misc_set_padding(GTK_MISC(label), 12, 0);
132 gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
133 @@ -371,7 +373,7 @@
134 gtk_table_attach_defaults(GTK_TABLE(page), label, 1, 2, i, i + 1);
135 i++;
136
137 - label = gtk_label_new(_("Video Frame Rate:"));
138 + label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Video Frame Rate:"));
139 gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
140 gtk_misc_set_padding(GTK_MISC(label), 12, 0);
141 gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
142 @@ -385,14 +387,14 @@
143 }
144
145 if (data->audio_present) {
146 - label = gtk_label_new(_("<span weight=\"bold\">Audio Details</span>"));
147 + label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"<span weight=\"bold\">Audio Details</span>"));
148 gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
149 gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
150 gtk_misc_set_padding(GTK_MISC(label), 0, 6);
151 gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
152 i++;
153
154 - label = gtk_label_new(_("Audio Codec:"));
155 + label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Audio Codec:"));
156 gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
157 gtk_misc_set_padding(GTK_MISC(label), 12, 0);
158 gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
159 @@ -403,7 +405,7 @@
160 gtk_table_attach_defaults(GTK_TABLE(page), label, 1, 2, i, i + 1);
161 i++;
162
163 - label = gtk_label_new(_("Audio Bitrate:"));
164 + label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Audio Bitrate:"));
165 gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
166 gtk_misc_set_padding(GTK_MISC(label), 12, 0);
167 gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
168 @@ -415,7 +417,7 @@
169 i++;
170
171 if (g_strtod(data->audio_nch, NULL) > 0) {
172 - label = gtk_label_new(_("Audio Channels:"));
173 + label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Audio Channels:"));
174 gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
175 gtk_misc_set_padding(GTK_MISC(label), 12, 0);
176 gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
177 @@ -473,7 +475,7 @@
178
179 if (found) {
180 uri = nautilus_file_info_get_uri(file);
181 - label = gtk_label_new(_("Audio/Video"));
182 + label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Audio/Video"));
183 page = gtk_table_new(20, 2, FALSE);
184 gtk_container_set_border_width(GTK_CONTAINER(page), 6);
185 if (get_properties(page, uri)) {
186 @@ -528,7 +530,9 @@
187 #ifdef ENABLE_NLS
188 bindtextdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
189 bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
190 - textdomain(GETTEXT_PACKAGE);
191 + // specify the domain in the translation calls so
192 + // we don't mess up the translation of the other tabs
193 + // textdomain(GETTEXT_PACKAGE);
194 #endif
195
196 gnome_mplayer_properties_plugin_register_type(module);