aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 8.2.4105: translation related comment in the wrong place

Browse Source 
Problem:    Translation related comment in the wrong place.
Solution:   Move it back with the text. (Ken Takata, closes #9537)
This commit is contained in:
K.Takata
2022-01-16 11:25:26 +00:00
committed by Bram Moolenaar
parent bfac409d0b
commit b5988e3656
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/errors.h
View File

@@ -1239,6 +1239,7 @@ EXTERN char e_no_autocommand_match_name_to_substitute_for_amatch[]
EXTERN char e_no_source_file_name_to_substitute_for_sfile[] EXTERN char e_no_source_file_name_to_substitute_for_sfile[]
INIT(= N_("E498: no :source file name to substitute for \"<sfile>\"")); INIT(= N_("E498: no :source file name to substitute for \"<sfile>\""));
EXTERN char e_empty_file_name_for_percent_or_hash_only_works_with_ph[] EXTERN char e_empty_file_name_for_percent_or_hash_only_works_with_ph[]
// xgettext:no-c-format
INIT(= N_("E499: Empty file name for '%' or '#', only works with \":p:h\"")); INIT(= N_("E499: Empty file name for '%' or '#', only works with \":p:h\""));
EXTERN char e_evaluates_to_an_empty_string[] EXTERN char e_evaluates_to_an_empty_string[]
INIT(= N_("E500: Evaluates to an empty string")); INIT(= N_("E500: Evaluates to an empty string"));
@@ -2041,6 +2042,7 @@ EXTERN char e_id_not_found_nr[]
#endif #endif
#ifdef FEAT_EVAL #ifdef FEAT_EVAL
EXTERN char e_cannot_use_percent_with_float[] EXTERN char e_cannot_use_percent_with_float[]
// xgettext:no-c-format
INIT(= N_("E804: Cannot use '%' with Float")); INIT(= N_("E804: Cannot use '%' with Float"));
#endif #endif
#ifdef FEAT_FLOAT #ifdef FEAT_FLOAT
@@ -2219,6 +2221,7 @@ EXTERN char e_not_allowed_for_terminal_in_popup_window[]
INIT(= N_("E863: Not allowed for a terminal in a popup window")); INIT(= N_("E863: Not allowed for a terminal in a popup window"));
#endif #endif
EXTERN char e_percent_hash_can_only_be_followed_by_zero_one_two_automatic_engine_will_be_used[] EXTERN char e_percent_hash_can_only_be_followed_by_zero_one_two_automatic_engine_will_be_used[]
// xgettext:no-c-format
INIT(= N_("E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be used")); INIT(= N_("E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be used"));
EXTERN char e_nfa_regexp_end_encountered_prematurely[] EXTERN char e_nfa_regexp_end_encountered_prematurely[]
INIT(= N_("E865: (NFA) Regexp end encountered prematurely")); INIT(= N_("E865: (NFA) Regexp end encountered prematurely"));
@@ -2464,6 +2467,7 @@ EXTERN char e_file_changed_while_writing[]
EXTERN char e_cannot_convert_between_str_and_str[] EXTERN char e_cannot_convert_between_str_and_str[]
INIT(= N_("E950: Cannot convert between %s and %s")); INIT(= N_("E950: Cannot convert between %s and %s"));
EXTERN char e_percent_value_too_large[] EXTERN char e_percent_value_too_large[]
// xgettext:no-c-format
INIT(= N_("E951: \\% value too large")); INIT(= N_("E951: \\% value too large"));
#if defined(FEAT_EVAL) && defined(FEAT_QUICKFIX) #if defined(FEAT_EVAL) && defined(FEAT_QUICKFIX)
EXTERN char e_autocommand_caused_recursive_behavior[] EXTERN char e_autocommand_caused_recursive_behavior[]
@@ -2690,6 +2694,7 @@ EXTERN char e_catch_unreachable_after_catch_all[]
EXTERN char e_cannot_use_reserved_name[] EXTERN char e_cannot_use_reserved_name[]
INIT(= N_("E1034: Cannot use reserved name %s")); INIT(= N_("E1034: Cannot use reserved name %s"));
EXTERN char e_percent_requires_number_arguments[] EXTERN char e_percent_requires_number_arguments[]
// xgettext:no-c-format
INIT(= N_("E1035: % requires number arguments")); INIT(= N_("E1035: % requires number arguments"));
EXTERN char e_char_requires_number_or_float_arguments[] EXTERN char e_char_requires_number_or_float_arguments[]
INIT(= N_("E1036: %c requires number or float arguments")); INIT(= N_("E1036: %c requires number or float arguments"));

1
src/ex_docmd.c
View File

@@ -9219,7 +9219,6 @@ eval_vars(
if (resultlen == 0 || valid != VALID_HEAD + VALID_PATH) if (resultlen == 0 || valid != VALID_HEAD + VALID_PATH)
{ {
if (valid != VALID_HEAD + VALID_PATH) if (valid != VALID_HEAD + VALID_PATH)
// xgettext:no-c-format
*errormsg = _(e_empty_file_name_for_percent_or_hash_only_works_with_ph); *errormsg = _(e_empty_file_name_for_percent_or_hash_only_works_with_ph);
else else
*errormsg = _(e_evaluates_to_an_empty_string); *errormsg = _(e_evaluates_to_an_empty_string);

2
src/version.c
View File

@@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
4105,
/**/ /**/
4104, 4104,
/**/ /**/