Fixing typos and/or inconsistencies in error messages. Some backports for the Dutch .po file. --- WINGs/dragcommon.c | 4 ++-- WINGs/dragsource.c | 2 +- WINGs/menuparser.c | 12 +++++----- WINGs/menuparser_macros.c | 4 ++-- WINGs/po/cs.po | 8 +++---- WINGs/po/nl.po | 61 ++++++++++++++++++++++++++++++++++------------- 6 files changed, 60 insertions(+), 31 deletions(-)
diff --git a/WINGs/dragcommon.c b/WINGs/dragcommon.c index b537e23..3598550 100644 --- a/WINGs/dragcommon.c +++ b/WINGs/dragcommon.c @@ -139,7 +139,7 @@ W_SendDnDClientMessage(Display * dpy, Window win, Atom message, #endif if (!windowExists(dpy, win)) { - wwarning(_("target %lu for xdnd message no longer exists"), win); + wwarning(_("target %lu for XDND message no longer exists"), win); return False; /* message not sent */ } @@ -217,7 +217,7 @@ void W_HandleDNDClientMessage(WMView * toplevel, XClientMessageEvent * event) return; } } else { - wwarning(_("unsupported version %i for xdnd enter message"), XDND_SOURCE_VERSION(info)); + wwarning(_("unsupported version %i for XDND enter message"), XDND_SOURCE_VERSION(info)); W_DragDestinationCancelDropOnEnter(toplevel, info); return; } diff --git a/WINGs/dragsource.c b/WINGs/dragsource.c index 8087fce..bc77c12 100644 --- a/WINGs/dragsource.c +++ b/WINGs/dragsource.c @@ -771,7 +771,7 @@ static void initMotionProcess(WMView * view, WMDraggingInfo * info, XEvent * eve XDND_TIMESTAMP(info) = event->xmotion.time; if (!WMCreateSelectionHandler(view, scr->xdndSelectionAtom, CurrentTime, XDND_SELECTION_PROCS(info), NULL)) { - wwarning(_("could not get ownership or DND selection")); + wwarning(_("could not get ownership of XDND selection")); return; } diff --git a/WINGs/menuparser.c b/WINGs/menuparser.c index db0225b..7c4e875 100644 --- a/WINGs/menuparser.c +++ b/WINGs/menuparser.c @@ -377,7 +377,7 @@ found_end_squote: if (limit-- > 0) goto restart_token_split; - WMenuParserError(parser, _("too many nested macro expansion, breaking loop") ); + WMenuParserError(parser, _("too many nested macro expansions, breaking loop") ); while (isnamechr(*parser->rd)) parser->rd++; @@ -436,7 +436,7 @@ static void menu_parser_get_directive(WMenuParser parser) menu_parser_condition_end(parser); } else { - WMenuParserError(parser, _("unknow directive '#%s'"), command); + WMenuParserError(parser, _("unknown directive '#%s'"), command); return; } @@ -500,7 +500,7 @@ found_end_define_fname: count++; if (count > MAX_NESTED_INCLUDES) { - WMenuParserError(parser, _("too many nested includes") ); + WMenuParserError(parser, _("too many nested #include's") ); return False; } } @@ -565,7 +565,7 @@ found_end_define_fname: src++; } } - WMenuParserError(parser, _("could not find file \"%s\" for include"), req_filename); + WMenuParserError(parser, _("could not find file \"%s\" for #include"), req_filename); return False; } @@ -623,7 +623,7 @@ static void menu_parser_condition_ifmacro(WMenuParser parser, Bool check_exists) static void menu_parser_condition_else(WMenuParser parser) { if (parser->cond.depth <= 0) { - WMenuParserError(parser, _("found #%s but have no matching #if"), "else" ); + WMenuParserError(parser, _("found #%s but has no matching #if"), "else" ); return; } @@ -640,7 +640,7 @@ static void menu_parser_condition_end(WMenuParser parser) int idx; if (parser->cond.depth <= 0) { - WMenuParserError(parser, _("found #%s but have no matching #if"), "endif" ); + WMenuParserError(parser, _("found #%s but has no matching #if"), "endif" ); return; } diff --git a/WINGs/menuparser_macros.c b/WINGs/menuparser_macros.c index 5b98ef8..33241b1 100644 --- a/WINGs/menuparser_macros.c +++ b/WINGs/menuparser_macros.c @@ -206,7 +206,7 @@ void menu_parser_define_macro(WMenuParser parser) arg_names_buf[idx] = '\0'; if (idx < sizeof(arg_names_buf) - 1) idx++; } else { - WMenuParserError(parser, _("invalid characted '%c' in arg-list for macro \"%s\" while expecting parameter name"), + WMenuParserError(parser, _("invalid character '%c' in arg-list for macro \"%s\" while expecting parameter name"), *parser->rd, macro->name); wfree(macro); *parser->rd = '\0'; // fake end-of-line to avoid warnings from remaining line content @@ -217,7 +217,7 @@ void menu_parser_define_macro(WMenuParser parser) if (*parser->rd == ')') break; if (*parser->rd != ',') { - WMenuParserError(parser, _("invalid characted '%c' in arg-list for macro \"%s\" while expecting ',' or ')'"), + WMenuParserError(parser, _("invalid character '%c' in arg-list for macro \"%s\" while expecting ',' or ')'"), *parser->rd, macro->name); wfree(macro); *parser->rd = '\0'; // fake end-of-line to avoid warnings from remaining line content diff --git a/WINGs/po/cs.po b/WINGs/po/cs.po index 0358b2d..942c9bf 100644 --- a/WINGs/po/cs.po +++ b/WINGs/po/cs.po @@ -22,8 +22,8 @@ msgid "Bad address-service-protocol combination" msgstr "Nesprávná kombinace adresa-služba-protokol" #: ../../WINGs/dragsource.c:541 -msgid "DND selection lost during drag operation..." -msgstr "DND výběr se ztratil během opere táhnutí..." +msgid "XDND selection lost during drag operation..." +msgstr "XDND výběr se ztratil během opere táhnutí..." #: ../../WINGs/dragsource.c:610 #, c-format @@ -31,8 +31,8 @@ msgid "drag & drop timed out while waiting for response from 0x%x\n" msgstr "čas pro drag & drop vypršel během čekání na odpoveď z 0x%x\n" #: ../../WINGs/dragsource.c:728 -msgid "could not get ownership or DND selection" -msgstr "nemožné získat vlastnictví nebo DND výběr" +msgid "could not get ownership of XDND selection" +msgstr "nemožné získat vlastnictví nebo XDND výběr" #: ../../WINGs/dragsource.c:898 #, c-format diff --git a/WINGs/po/nl.po b/WINGs/po/nl.po index 9333e33..d138e0c 100644 --- a/WINGs/po/nl.po +++ b/WINGs/po/nl.po @@ -111,12 +111,12 @@ msgid "missing closing simple-quote before end-of-line" msgstr "ontbrekend sluitend enkel aanhalingsteken voor regeleinde" #: ../../WINGs/menuparser.c:380 -msgid "too many nested macro expansion, breaking loop" +msgid "too many nested macro expansions, breaking loop" msgstr "te veel geneste macro-uitwerkingen, cyclus afgebroken" #: ../../WINGs/menuparser.c:439 #, c-format -msgid "unknow directive '#%s'" +msgid "unknown directive '#%s'" msgstr "onbekende aanwijzing '#%s'" #: ../../WINGs/menuparser.c:444 @@ -140,12 +140,12 @@ msgid "missing closing '%c' in filename specification" msgstr "ontbrekende sluitende '%c' in bestandsnaamopgave" #: ../../WINGs/menuparser.c:503 -msgid "too many nested includes" +msgid "too many nested #include's" msgstr "te veel geneste #include's" #: ../../WINGs/menuparser.c:568 #, c-format -msgid "could not find file \"%s\" for include" +msgid "could not find file \"%s\" for #include" msgstr "kon bestand \"%s\" niet vinden voor #include" #: ../../WINGs/menuparser.c:589 @@ -159,7 +159,7 @@ msgstr "te veel geneste #if-reeksen" #: ../../WINGs/menuparser.c:626 ../../WINGs/menuparser.c:643 #, c-format -msgid "found #%s but have no matching #if" +msgid "found #%s but has no matching #if" msgstr "#%s gevonden, maar heeft geen bijbehorende #if" #: ../../WINGs/menuparser_macros.c:166 @@ -179,7 +179,7 @@ msgstr "te veel parameters voor bepaling macro \"%s\"" #: ../../WINGs/menuparser_macros.c:209 #, c-format msgid "" -"invalid characted '%c' in arg-list for macro \"%s\" while expecting " +"invalid character '%c' in arg-list for macro \"%s\" while expecting " "parameter name" msgstr "" "ongeldig letterteken '%c' in arg.-lijst voor macro \"%s\", verwachtte " @@ -188,7 +188,7 @@ msgstr "" #: ../../WINGs/menuparser_macros.c:220 #, c-format msgid "" -"invalid characted '%c' in arg-list for macro \"%s\" while expecting ',' or " +"invalid character '%c' in arg-list for macro \"%s\" while expecting ',' or " "')'" msgstr "" "ongeldig letterteken '%c' in arg.-lijst voor macro \"%s\", verwachtte ',' of " @@ -402,29 +402,29 @@ msgstr "kan domeinbestand '%s' niet inlezen bij synchroniseren" #: ../../WINGs/dragcommon.c:60 #, c-format msgid "unknown XDND action %s" -msgstr "onbekende XDnD-actie %s" +msgstr "onbekende XDND-actie %s" #: ../../WINGs/dragcommon.c:142 #, c-format -msgid "target %lu for xdnd message no longer exists" -msgstr "doel %lu voor XDnD-bericht bestaat niet meer" +msgid "target %lu for XDND message no longer exists" +msgstr "doel %lu voor XDND-bericht bestaat niet meer" #: ../../WINGs/dragcommon.c:220 #, c-format -msgid "unsupported version %i for xdnd enter message" -msgstr "niet-ondersteunde versie %i voor XDnD-bericht bij binnengaan" +msgid "unsupported version %i for XDND enter message" +msgstr "niet-ondersteunde versie %i voor XDND-bericht bij binnengaan" #: ../../WINGs/dragsource.c:163 msgid "XDND selection lost during drag operation..." -msgstr "XDnD-selectie verloren tijdens versleephandeling..." +msgstr "XDND-selectie verloren tijdens versleephandeling..." #: ../../WINGs/dragsource.c:758 msgid "could not get XDND version for target of drop" -msgstr "kon XDnD-versie niet krijgen voor doel van verslepen" +msgstr "kon XDND-versie niet krijgen voor doel van verslepen" #: ../../WINGs/dragsource.c:774 -msgid "could not get ownership or DND selection" -msgstr "kon eigendom van XDnD-selectie niet krijgen" +msgid "could not get ownership of XDND selection" +msgstr "kon eigendom van XDND-selectie niet krijgen" #: ../../WINGs/dragsource.c:1070 msgid "delay for drag destination response expired" @@ -845,3 +845,32 @@ msgstr "Kon doelbestand \"%s\" niet aanmaken" msgid "An error occured browsing '%s'." msgstr "Er trad 'n fout op bij bladeren door '%s'." + +msgid "" +"invalid characted '%c' in arg-list for macro \"%s\" while expecting " +"parameter name" +msgstr "" +"ongeldig letterteken '%c' in arg.-lijst voor macro \"%s\", verwachtte " +"parameternaam" + +msgid "" +"invalid characted '%c' in arg-list for macro \"%s\" while expecting ',' or " +"')'" +msgstr "" +"ongeldig letterteken '%c' in arg.-lijst voor macro \"%s\", verwachtte ',' of " +"')'" + +msgid "unknow directive '#%s'" +msgstr "onbekende aanwijzing '#%s'" + +msgid "found #%s but have no matching #if" +msgstr "#%s gevonden, maar heeft geen bijbehorende #if" + +msgid "too many nested includes" +msgstr "te veel geneste #include's" + +msgid "could not find file \"%s\" for include" +msgstr "kon bestand \"%s\" niet vinden voor #include" + +msgid "too many nested macro expansion, breaking loop" +msgstr "te veel geneste macro-uitwerkingen, cyclus afgebroken" -- 2.0.5 -- To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.