diff --git a/src/lang/extra/czech.txt b/src/lang/extra/czech.txt index 62e8f3bdea..2a6405b6c4 100644 --- a/src/lang/extra/czech.txt +++ b/src/lang/extra/czech.txt @@ -1817,24 +1817,6 @@ STR_VIEWPORT_SHOW_VEHICLE_ROUTE_STEP_IMPLICIT :{GRAY}IM STR_VIEWPORT_SHOW_VEHICLE_ROUTE_STEP_DEPOT :{RED}DE STR_VIEWPORT_SHOW_VEHICLE_ROUTE_STEP_OVERFLOW :{RED}{NUM}x -STR_JUST_DECIMAL1 :{DECIMAL1} - -STR_JUST_DATE_WALLCLOCK_TINY :{DATE_WALLCLOCK_TINY} -STR_JUST_DATE_WALLCLOCK_SHORT :{DATE_WALLCLOCK_SHORT} -STR_JUST_DATE_WALLCLOCK_LONG :{DATE_WALLCLOCK_LONG} -STR_JUST_DATE_WALLCLOCK_ISO :{DATE_WALLCLOCK_ISO} -STR_JUST_TIME_HHMM :{TIME_HHMM} - -STR_JUST_STRING1 :{STRING} -STR_JUST_STRING2 :{STRING} -STR_JUST_STRING3 :{STRING} - -STR_JUST_VELOCITY :{VELOCITY} - -STR_JUST_TT_TICKS :{TT_TICKS} -STR_JUST_TT_TICKS_LONG :{TT_TICKS_LONG} - -STR_RED_INT :{RED}{NUM} STR_BLACK_PLUS :{BLACK}+ STR_DECIMAL1_WITH_SCALE :{DECIMAL1} ({DECIMAL}x) diff --git a/src/lang/extra/english.txt b/src/lang/extra/english.txt index 68b1c05d97..6f08e95136 100644 --- a/src/lang/extra/english.txt +++ b/src/lang/extra/english.txt @@ -5,6 +5,23 @@ STR_NEWGRF_ERROR_POPUP :{WHITE}The NewG STR_ORDER_TEXT :{STRING6} {STRING2} {STRING} ##override off +##no-translate on +STR_JUST_DECIMAL1 :{DECIMAL1} +STR_JUST_DATE_WALLCLOCK_TINY :{DATE_WALLCLOCK_TINY} +STR_JUST_DATE_WALLCLOCK_SHORT :{DATE_WALLCLOCK_SHORT} +STR_JUST_DATE_WALLCLOCK_LONG :{DATE_WALLCLOCK_LONG} +STR_JUST_DATE_WALLCLOCK_ISO :{DATE_WALLCLOCK_ISO} +STR_JUST_TIME_HHMM :{TIME_HHMM} +STR_JUST_STRING1 :{STRING1} +STR_JUST_STRING2 :{STRING2} +STR_JUST_STRING3 :{STRING3} +STR_JUST_VELOCITY :{VELOCITY} +STR_JUST_TT_TICKS :{TT_TICKS} +STR_JUST_TT_TICKS_LONG :{TT_TICKS_LONG} + +STR_RED_INT :{RED}{NUM} +##no-translate off + ##after STR_CONFIG_SETTING_TREE_PLACER_IMPROVED STR_CONFIG_SETTING_TREE_PLACER_PERFECT :Perfect @@ -1856,24 +1873,6 @@ STR_VIEWPORT_SHOW_VEHICLE_ROUTE_STEP_IMPLICIT :{GRAY}IM STR_VIEWPORT_SHOW_VEHICLE_ROUTE_STEP_DEPOT :{RED}DE STR_VIEWPORT_SHOW_VEHICLE_ROUTE_STEP_OVERFLOW :{RED}{NUM}x -STR_JUST_DECIMAL1 :{DECIMAL1} - -STR_JUST_DATE_WALLCLOCK_TINY :{DATE_WALLCLOCK_TINY} -STR_JUST_DATE_WALLCLOCK_SHORT :{DATE_WALLCLOCK_SHORT} -STR_JUST_DATE_WALLCLOCK_LONG :{DATE_WALLCLOCK_LONG} -STR_JUST_DATE_WALLCLOCK_ISO :{DATE_WALLCLOCK_ISO} -STR_JUST_TIME_HHMM :{TIME_HHMM} - -STR_JUST_STRING1 :{STRING1} -STR_JUST_STRING2 :{STRING2} -STR_JUST_STRING3 :{STRING3} - -STR_JUST_VELOCITY :{VELOCITY} - -STR_JUST_TT_TICKS :{TT_TICKS} -STR_JUST_TT_TICKS_LONG :{TT_TICKS_LONG} - -STR_RED_INT :{RED}{NUM} STR_BLACK_PLUS :{BLACK}+ STR_DECIMAL1_WITH_SCALE :{DECIMAL1} ({DECIMAL}x) diff --git a/src/lang/extra/galician.txt b/src/lang/extra/galician.txt index 75e8b191b1..2630563150 100644 --- a/src/lang/extra/galician.txt +++ b/src/lang/extra/galician.txt @@ -1823,24 +1823,6 @@ STR_VIEWPORT_SHOW_VEHICLE_ROUTE_STEP_IMPLICIT :{GRAY}IM STR_VIEWPORT_SHOW_VEHICLE_ROUTE_STEP_DEPOT :{RED}DE STR_VIEWPORT_SHOW_VEHICLE_ROUTE_STEP_OVERFLOW :{RED}{NUM}x -STR_JUST_DECIMAL1 :{DECIMAL1} - -STR_JUST_DATE_WALLCLOCK_TINY :{DATE_WALLCLOCK_TINY} -STR_JUST_DATE_WALLCLOCK_SHORT :{DATE_WALLCLOCK_SHORT} -STR_JUST_DATE_WALLCLOCK_LONG :{DATE_WALLCLOCK_LONG} -STR_JUST_DATE_WALLCLOCK_ISO :{DATE_WALLCLOCK_ISO} -STR_JUST_TIME_HHMM :{TIME_HHMM} - -STR_JUST_STRING1 :{STRING} -STR_JUST_STRING2 :{STRING} -STR_JUST_STRING3 :{STRING} - -STR_JUST_VELOCITY :{VELOCITY} - -STR_JUST_TT_TICKS :{TT_TICKS} -STR_JUST_TT_TICKS_LONG :{TT_TICKS_LONG} - -STR_RED_INT :{RED}{NUM} STR_BLACK_PLUS :{BLACK}+ STR_DECIMAL1_WITH_SCALE :{DECIMAL1} ({DECIMAL}x) diff --git a/src/lang/extra/german.txt b/src/lang/extra/german.txt index 73b432c911..c39ad6af0a 100644 --- a/src/lang/extra/german.txt +++ b/src/lang/extra/german.txt @@ -1632,18 +1632,6 @@ STR_VIEWPORT_SHOW_VEHICLE_ROUTE_STEP_IMPLICIT :{GRAY}IM STR_VIEWPORT_SHOW_VEHICLE_ROUTE_STEP_DEPOT :{RED}DE STR_VIEWPORT_SHOW_VEHICLE_ROUTE_STEP_OVERFLOW :{RED}{NUM}x -STR_JUST_DECIMAL1 :{DECIMAL1} - -STR_JUST_DATE_WALLCLOCK_TINY :{DATE_WALLCLOCK_TINY} -STR_JUST_DATE_WALLCLOCK_SHORT :{DATE_WALLCLOCK_SHORT} -STR_JUST_DATE_WALLCLOCK_LONG :{DATE_WALLCLOCK_LONG} -STR_JUST_DATE_WALLCLOCK_ISO :{DATE_WALLCLOCK_ISO} -STR_JUST_TIME_HHMM :{TIME_HHMM} - -STR_JUST_STRING1 :{STRING} -STR_JUST_STRING2 :{STRING} - -STR_RED_INT :{RED}{NUM} STR_BLACK_PLUS :{BLACK}+ STR_ZONING_TOOLBAR :{WHITE}Bereiche anzeigen diff --git a/src/lang/extra/korean.txt b/src/lang/extra/korean.txt index 2faec34ed5..fda2c45c96 100644 --- a/src/lang/extra/korean.txt +++ b/src/lang/extra/korean.txt @@ -1824,24 +1824,6 @@ STR_VIEWPORT_SHOW_VEHICLE_ROUTE_STEP_IMPLICIT :{GRAY}암 STR_VIEWPORT_SHOW_VEHICLE_ROUTE_STEP_DEPOT :{RED}기 STR_VIEWPORT_SHOW_VEHICLE_ROUTE_STEP_OVERFLOW :{RED}{NUM}x -STR_JUST_DECIMAL1 :{DECIMAL1} - -STR_JUST_DATE_WALLCLOCK_TINY :{DATE_WALLCLOCK_TINY} -STR_JUST_DATE_WALLCLOCK_SHORT :{DATE_WALLCLOCK_SHORT} -STR_JUST_DATE_WALLCLOCK_LONG :{DATE_WALLCLOCK_LONG} -STR_JUST_DATE_WALLCLOCK_ISO :{DATE_WALLCLOCK_ISO} -STR_JUST_TIME_HHMM :{TIME_HHMM} - -STR_JUST_STRING1 :{STRING} -STR_JUST_STRING2 :{STRING} -STR_JUST_STRING3 :{STRING} - -STR_JUST_VELOCITY :{VELOCITY} - -STR_JUST_TT_TICKS :{TT_TICKS} -STR_JUST_TT_TICKS_LONG :{TT_TICKS_LONG} - -STR_RED_INT :{RED}{NUM} STR_BLACK_PLUS :{BLACK}+ STR_DECIMAL1_WITH_SCALE :{DECIMAL1} (x{DECIMAL}) diff --git a/src/lang/extra/simplified_chinese.txt b/src/lang/extra/simplified_chinese.txt index 49c6f03b12..3e503a1e9a 100644 --- a/src/lang/extra/simplified_chinese.txt +++ b/src/lang/extra/simplified_chinese.txt @@ -1717,18 +1717,6 @@ STR_VIEWPORT_SHOW_VEHICLE_ROUTE_STEP_IMPLICIT :{GRAY}转 STR_VIEWPORT_SHOW_VEHICLE_ROUTE_STEP_DEPOT :{RED}库 STR_VIEWPORT_SHOW_VEHICLE_ROUTE_STEP_OVERFLOW :{RED}{NUM}x -STR_JUST_DECIMAL1 :{DECIMAL1} - -STR_JUST_DATE_WALLCLOCK_TINY :{DATE_WALLCLOCK_TINY} -STR_JUST_DATE_WALLCLOCK_SHORT :{DATE_WALLCLOCK_SHORT} -STR_JUST_DATE_WALLCLOCK_LONG :{DATE_WALLCLOCK_LONG} -STR_JUST_DATE_WALLCLOCK_ISO :{DATE_WALLCLOCK_ISO} -STR_JUST_TIME_HHMM :{TIME_HHMM} - -STR_JUST_STRING1 :{STRING} -STR_JUST_STRING2 :{STRING} - -STR_RED_INT :{RED}{NUM} STR_BLACK_PLUS :{BLACK}+ STR_DECIMAL1_WITH_SCALE :{DECIMAL1}（{DECIMAL}x） diff --git a/utils/conv-lang.pl b/utils/conv-lang.pl index 3806051940..60fb3e3bef 100755 --- a/utils/conv-lang.pl +++ b/utils/conv-lang.pl @@ -82,11 +82,17 @@ welsh.txt my @lang_lines; -my $start = 0; +my $override = 0; +my $no_translate = 0; my @lines = read_file("extra/english.txt") or die("Can't read english.txt"); for (@lines) { - $start = 1 if /##override off/; - next unless $start; + $override = 0 if /##override off/; + $override = 1 if /##override on/; + $no_translate = 0 if /##no-translate off/; + $no_translate = 1 if /##no-translate on/; + + next if $override; + next if $no_translate; next if /^##/;