brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

An attempt to make life a little easier for our beloved translators; this

Browse Source 
2008-10-12  Thomas Thurman  <tthurman@gnome.org>

        An attempt to make life a little easier for our beloved translators;
        this has the same behaviour as before, but removes over thirty
        translation strings.

        * src/core/session.c (start_element_handler): all "attribute not found
          on element" strings are identical
        * src/ui/theme-parser.c (locate_attributes): allow attribute names to
          be preceded with "!" (in the code) to show they're required.
          (parse_aspect_ratio, parse_distance, parse_toplevel_element,
           parse_style_element, parse_gradient_element, static, parse_border,
           parse_style_set_element, parse_draw_op_element): use the new "!"
           prefix for locate_attributes(), or in some cases just the identical
           constant, for generating this error.
        * src/ui/theme.c (check_state, meta_theme_validate): add
          translator comments
        * src/ui/resizepopup.c (update_size_window): add
          translator comments


svn path=/trunk/; revision=3949
This commit is contained in:
Thomas Thurman 2008-10-12 14:34:54 +00:00 committed by Thomas James Alexander Thurman
parent 334370f5d1
commit b625ed254d
5 changed files with 147 additions and 693 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ChangeLog
View File

@ -1,3 +1,23 @@
2008-10-12 Thomas Thurman <tthurman@gnome.org>
An attempt to make life a little easier for our beloved translators;
this has the same behaviour as before, but removes over thirty
translation strings.
* src/core/session.c (start_element_handler): all "attribute not found
on element" strings are identical
* src/ui/theme-parser.c (locate_attributes): allow attribute names to
be preceded with "!" (in the code) to show they're required.
(parse_aspect_ratio, parse_distance, parse_toplevel_element,
parse_style_element, parse_gradient_element, static, parse_border,
parse_style_set_element, parse_draw_op_element): use the new "!"
prefix for locate_attributes(), or in some cases just the identical
constant, for generating this error.
* src/ui/theme.c (check_state, meta_theme_validate): add
translator comments
* src/ui/resizepopup.c (update_size_window): add
translator comments
2008-10-06 William Lachance <wrlach@gmail.com> 2008-10-06 William Lachance <wrlach@gmail.com>
Pass modified mouse button events down to panel windows Pass modified mouse button events down to panel windows

20
src/core/session.c
View File

@ -1191,8 +1191,8 @@ start_element_handler (GMarkupParseContext *context,
g_set_error (error, g_set_error (error,
G_MARKUP_ERROR, G_MARKUP_ERROR,
G_MARKUP_ERROR_UNKNOWN_ATTRIBUTE, G_MARKUP_ERROR_UNKNOWN_ATTRIBUTE,
_("Unknown attribute %s on <metacity_session> element"), _("Unknown attribute %s on <%s> element"),
name); name, "metacity_session");
return; return;
} }
@ -1266,8 +1266,8 @@ start_element_handler (GMarkupParseContext *context,
g_set_error (error, g_set_error (error,
G_MARKUP_ERROR, G_MARKUP_ERROR,
G_MARKUP_ERROR_UNKNOWN_ATTRIBUTE, G_MARKUP_ERROR_UNKNOWN_ATTRIBUTE,
_("Unknown attribute %s on <window> element"), _("Unknown attribute %s on <%s> element"),
name); name, "window");
session_info_free (pd->info); session_info_free (pd->info);
pd->info = NULL; pd->info = NULL;
return; return;
@ -1298,8 +1298,8 @@ start_element_handler (GMarkupParseContext *context,
g_set_error (error, g_set_error (error,
G_MARKUP_ERROR, G_MARKUP_ERROR,
G_MARKUP_ERROR_UNKNOWN_ATTRIBUTE, G_MARKUP_ERROR_UNKNOWN_ATTRIBUTE,
_("Unknown attribute %s on <window> element"), _("Unknown attribute %s on <%s> element"),
name); name, "window");
session_info_free (pd->info); session_info_free (pd->info);
pd->info = NULL; pd->info = NULL;
return; return;
@ -1370,8 +1370,8 @@ start_element_handler (GMarkupParseContext *context,
g_set_error (error, g_set_error (error,
G_MARKUP_ERROR, G_MARKUP_ERROR,
G_MARKUP_ERROR_UNKNOWN_ATTRIBUTE, G_MARKUP_ERROR_UNKNOWN_ATTRIBUTE,
_("Unknown attribute %s on <maximized> element"), _("Unknown attribute %s on <%s> element"),
name); name, "maximized");
return; return;
} }
@ -1430,8 +1430,8 @@ start_element_handler (GMarkupParseContext *context,
g_set_error (error, g_set_error (error,
G_MARKUP_ERROR, G_MARKUP_ERROR,
G_MARKUP_ERROR_UNKNOWN_ATTRIBUTE, G_MARKUP_ERROR_UNKNOWN_ATTRIBUTE,
_("Unknown attribute %s on <geometry> element"), _("Unknown attribute %s on <%s> element"),
name); name, "geometry");
return; return;
} }

3
src/ui/resizepopup.c
View File

@ -110,6 +110,9 @@ update_size_window (MetaResizePopup *popup)
g_return_if_fail (popup->size_window != NULL); g_return_if_fail (popup->size_window != NULL);
/* Translators: This represents the size of a window. The first number is
* the width of the window and the second is the height.
*/
str = g_strdup_printf (_("%d x %d"), str = g_strdup_printf (_("%d x %d"),
popup->horizontal_size, popup->horizontal_size,
popup->vertical_size); popup->vertical_size);

789
src/ui/theme-parser.c
View File

File diff suppressed because it is too large Load Diff

8
src/ui/theme.c
View File

@ -4628,6 +4628,10 @@ check_state (MetaFrameStyleSet *style_set,
if (get_style (style_set, state, if (get_style (style_set, state,
META_FRAME_RESIZE_NONE, i) == NULL) META_FRAME_RESIZE_NONE, i) == NULL)
{ {
/* Translators: This error occurs when a <frame> tag is missing
* in theme XML. The "<frame ...>" is intended as a noun phrase,
* and the "missing" qualifies it. You should translate "whatever".
*/
g_set_error (error, META_THEME_ERROR, g_set_error (error, META_THEME_ERROR,
META_THEME_ERROR_FAILED, META_THEME_ERROR_FAILED,
_("Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"), _("Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"),
@ -4824,6 +4828,10 @@ meta_theme_validate (MetaTheme *theme,
if (theme->readable_name == NULL) if (theme->readable_name == NULL)
{ {
/* Translators: This error means that a necessary XML tag (whose name
* is given in angle brackets) was not found in a given theme (whose
* name is given second, in quotation marks).
*/
g_set_error (error, META_THEME_ERROR, META_THEME_ERROR_FAILED, g_set_error (error, META_THEME_ERROR, META_THEME_ERROR_FAILED,
_("No <%s> set for theme \"%s\""), "name", theme->name); _("No <%s> set for theme \"%s\""), "name", theme->name);
return FALSE; return FALSE;