diff --git a/bin/ptna-routes.pl b/bin/ptna-routes.pl index 8949b45..ed6ad6b 100755 --- a/bin/ptna-routes.pl +++ b/bin/ptna-routes.pl @@ -1175,6 +1175,7 @@ 'operator' => $relation_ptr->{'tag'}->{'operator'}, # take 'operator' value from first relation, undef outside this for-loop 'pt_type' => $entryref->{'route'}, 'colour' => $relation_ptr->{'tag'}->{'colour'}, # take 'colour' value from first relation, undef outside this for-loop + 'colour:text' => $relation_ptr->{'tag'}->{'colour:text'}, # take 'colour:text' value from first relation, undef outside this for-loop 'CSV-Comment' => $entryref->{'comment'}, 'CSV-From' => $entryref->{'from'}, 'CSV-From-List' => $entryref->{'from-list'}, @@ -1804,7 +1805,7 @@ sub SearchMatchingRelations { $RelFrom = $RELATIONS{$rel_id}->{'tag'}->{'from'} || ''; $RelTo = $RELATIONS{$rel_id}->{'tag'}->{'to'} || ''; $RelVia = $RELATIONS{$rel_id}->{'tag'}->{'via'} || ''; - $RelColour = $RELATIONS{$rel_id}->{'tag'}->{'to'} || ''; + $RelColour = $RELATIONS{$rel_id}->{'tag'}->{'colour'} || ''; printf STDERR "%s Checking %s relation %s, 'ref' %s and 'operator' %s \n", get_time(), $type, $rel_id, $ExpRefPart, $RelOperator if ( $debug ); @@ -2331,19 +2332,21 @@ sub analyze_route_environment { push( @{$relation_ptr->{'__issues__'}}, sprintf( $issues_string, handle_foreign($relation_ptr->{'tag'}->{'operator'}), handle_foreign($RELATIONS{$route_master_rel_id}->{'tag'}->{'operator'}), printRelationTemplate($route_master_rel_id)) ); } } - if ( $relation_ptr->{'tag'}->{'colour'} ) { - if ( $RELATIONS{$route_master_rel_id}->{'tag'}->{'colour'} ) { - if ( uc($relation_ptr->{'tag'}->{'colour'}) ne uc($RELATIONS{$route_master_rel_id}->{'tag'}->{'colour'}) ) { - $issues_string = gettext( "'%s' = '%s' of Route does not fit to '%s' = '%s' of Route-Master: %s" ); - push( @{$relation_ptr->{'__issues__'}}, sprintf( $issues_string, 'colour', $relation_ptr->{'tag'}->{'colour'}, 'colour', $RELATIONS{$route_master_rel_id}->{'tag'}->{'colour'}, printRelationTemplate($route_master_rel_id)) ); + foreach my $colour_tag ( 'colour', 'colour:text' ) { + if ( $relation_ptr->{'tag'}->{$colour_tag} ) { + if ( $RELATIONS{$route_master_rel_id}->{'tag'}->{$colour_tag} ) { + if ( uc($relation_ptr->{'tag'}->{$colour_tag}) ne uc($RELATIONS{$route_master_rel_id}->{'tag'}->{$colour_tag}) ) { + $issues_string = gettext( "'%s' = '%s' of Route does not fit to '%s' = '%s' of Route-Master: %s" ); + push( @{$relation_ptr->{'__issues__'}}, sprintf( $issues_string, $colour_tag, $relation_ptr->{'tag'}->{$colour_tag}, $colour_tag, $RELATIONS{$route_master_rel_id}->{'tag'}->{$colour_tag}, printRelationTemplate($route_master_rel_id)) ); + } + } else { + $issues_string = gettext( "'%s' = '%s' of Route is set but '%s' of Route-Master is not set: %s" ); + push( @{$relation_ptr->{'__issues__'}}, sprintf( $issues_string, , $colour_tag, handle_foreign($relation_ptr->{'tag'}->{$colour_tag}), $colour_tag, printRelationTemplate($route_master_rel_id)) ); } - } else { - $issues_string = gettext( "'%s' = '%s' of Route is set but '%s' of Route-Master is not set: %s" ); - push( @{$relation_ptr->{'__issues__'}}, sprintf( $issues_string, , 'colour', $relation_ptr->{'tag'}->{'colour'}, 'colour', printRelationTemplate($route_master_rel_id)) ); + } elsif ( $RELATIONS{$route_master_rel_id}->{'tag'}->{$colour_tag} ) { + $issues_string = gettext( "'%s' of Route is not set but '%s' = '%s' of Route-Master is set: %s" ); + push( @{$relation_ptr->{'__issues__'}}, sprintf( $issues_string, $colour_tag, $colour_tag, $RELATIONS{$route_master_rel_id}->{'tag'}->{$colour_tag}, printRelationTemplate($route_master_rel_id)) ); } - } elsif ( $RELATIONS{$route_master_rel_id}->{'tag'}->{'colour'} ) { - $issues_string = gettext( "'%s' of Route is not set but '%s' = '%s' of Route-Master is set: %s" ); - push( @{$relation_ptr->{'__issues__'}}, sprintf( $issues_string, 'colour', 'colour', $RELATIONS{$route_master_rel_id}->{'tag'}->{'colour'}, printRelationTemplate($route_master_rel_id)) ); } # @@ -2671,15 +2674,17 @@ sub analyze_relation { push( @{$relation_ptr->{'__issues__'}}, $issues_string ); } - if ( $relation_ptr->{'tag'}->{'colour'} ) { - my $colour = GetColourFromString( $relation_ptr->{'tag'}->{'colour'} ); - unless ( $colour ) { - if ( $relation_ptr->{'tag'}->{'colour'} =~ m/^[0-9A-Fa-f]{3,6}$/ ) { - $issues_string = gettext( "'colour' has unknown value '%s'. Add '#' as first character." ); - push( @{$relation_ptr->{'__issues__'}}, sprintf( $issues_string, html_escape($relation_ptr->{'tag'}->{'colour'}) ) ); - } else { - $issues_string = gettext( "'colour' has unknown value '%s'. Choose one of the 140 well defined HTML/CSS colour names or the HTML Hex colour codes '#...' or '#......'." ); - push( @{$relation_ptr->{'__issues__'}}, sprintf( $issues_string, handle_foreign($relation_ptr->{'tag'}->{'colour'}) ) ); + foreach my $colour_tag ( 'colour', 'colour:text' ) { + if ( $relation_ptr->{'tag'}->{$colour_tag} ) { + my $colour = GetColourFromString( $relation_ptr->{'tag'}->{$colour_tag} ); + unless ( $colour ) { + if ( $relation_ptr->{'tag'}->{$colour_tag} =~ m/^[0-9A-Fa-f]{3,6}$/ ) { + $issues_string = gettext( "'%s' has unknown value '%s'. Add '#' as first character." ); + push( @{$relation_ptr->{'__issues__'}}, $colour_tag, sprintf( $issues_string, html_escape($relation_ptr->{'tag'}->{$colour_tag}) ) ); + } else { + $issues_string = gettext( "'%s' has unknown value '%s'. Choose one of the 140 well defined HTML/CSS colour names or the HTML Hex colour codes '#...' or '#......'." ); + push( @{$relation_ptr->{'__issues__'}}, sprintf( $issues_string, $colour_tag, handle_foreign($relation_ptr->{'tag'}->{$colour_tag}) ) ); + } } } } @@ -6794,6 +6799,7 @@ sub printTableSubHeader { my $operator = $hash{'operator'} || ''; my $pt_type = $hash{'pt_type'} || ''; my $colour = $hash{'colour'} || ''; + my $text_colour = $hash{'colour:text'} || ''; my $ref_text = undef; my $csv_text = ''; # some information comming from the CSV input file my $info = ''; @@ -6811,7 +6817,7 @@ sub printTableSubHeader { } if ( scalar @ref_or_array ) { - $ref_text = join(' ', map { printSketchLineTemplate( $_, $network, $operator, $pt_type, $colour ) } @ref_or_array ); + $ref_text = join(' ', map { printSketchLineTemplate( $_, $network, $operator, $pt_type, $colour, $text_colour ) } @ref_or_array ); } if ( scalar @ref_or_array && $pt_type ) { @@ -6826,7 +6832,7 @@ sub printTableSubHeader { $nav_label = $id_label; } $id_string = sprintf( "id=\"%s\" ", $nav_label ); - printAddIdLabelToLocalNavigation( $nav_label, join(' ',@ref_or_array), $colour ); + printAddIdLabelToLocalNavigation( $nav_label, join(' ',@ref_or_array), $colour, $text_colour ); } if ( $hash{'CSV-Comment'} ) { @@ -7121,6 +7127,7 @@ sub printSketchLineTemplate { my $operator = shift || ''; my $pt_type = shift || ''; my $colour = shift || ''; + my $text_colour = shift || ''; my $text = undef; my $colour_string = ''; my $pt_string = ''; @@ -7131,7 +7138,7 @@ sub printSketchLineTemplate { my $outer_span_end = ''; my $inner_span_end = ''; my $bg_colour = GetColourFromString( $colour ); - my $fg_colour = GetForeGroundFromBackGround( $bg_colour ); + my $fg_colour = ($text_colour ne '') ? GetColourFromString($text_colour) : GetForeGroundFromBackGround($bg_colour); if ( $bg_colour && $fg_colour && $coloured_sketchline ) { $colour_string = "&bg=" . uri_escape($bg_colour) . "&fg=". uri_escape($fg_colour); @@ -7159,11 +7166,12 @@ sub printAddIdLabelToLocalNavigation { my $id_label = shift; my $visible_string = shift; my $colour = shift; + my $text_colour = shift || ''; if ( !$no_additional_navigation && $local_navigation_at_index && $id_label && $visible_string ne '' ) { my $bg_colour = GetColourFromString( $colour ); - my $fg_colour = GetForeGroundFromBackGround( $bg_colour ); + my $fg_colour = ($text_colour ne '') ? GetColourFromString($text_colour) : GetForeGroundFromBackGround($bg_colour); my $outer_span_begin = ''; my $inner_span_begin = ''; my $outer_span_end = ''; diff --git a/locale/ca/LC_MESSAGES/ptna.mo b/locale/ca/LC_MESSAGES/ptna.mo index bf186e6..9d7648f 100644 Binary files a/locale/ca/LC_MESSAGES/ptna.mo and b/locale/ca/LC_MESSAGES/ptna.mo differ diff --git a/locale/de/LC_MESSAGES/ptna.mo b/locale/de/LC_MESSAGES/ptna.mo index de5d22b..4026360 100644 Binary files a/locale/de/LC_MESSAGES/ptna.mo and b/locale/de/LC_MESSAGES/ptna.mo differ diff --git a/locale/es/LC_MESSAGES/ptna.mo b/locale/es/LC_MESSAGES/ptna.mo index 390e992..5f78616 100644 Binary files a/locale/es/LC_MESSAGES/ptna.mo and b/locale/es/LC_MESSAGES/ptna.mo differ diff --git a/locale/fr/LC_MESSAGES/ptna.mo b/locale/fr/LC_MESSAGES/ptna.mo index 61dd5dc..bda39e0 100644 Binary files a/locale/fr/LC_MESSAGES/ptna.mo and b/locale/fr/LC_MESSAGES/ptna.mo differ diff --git a/locale/hu/LC_MESSAGES/ptna.mo b/locale/hu/LC_MESSAGES/ptna.mo index 26f602a..9552f27 100644 Binary files a/locale/hu/LC_MESSAGES/ptna.mo and b/locale/hu/LC_MESSAGES/ptna.mo differ diff --git a/locale/it/LC_MESSAGES/ptna.mo b/locale/it/LC_MESSAGES/ptna.mo index b82de2d..a0f5c20 100644 Binary files a/locale/it/LC_MESSAGES/ptna.mo and b/locale/it/LC_MESSAGES/ptna.mo differ diff --git a/locale/pl_PL/LC_MESSAGES/ptna.mo b/locale/pl_PL/LC_MESSAGES/ptna.mo index e684e4a..f6d21ed 100644 Binary files a/locale/pl_PL/LC_MESSAGES/ptna.mo and b/locale/pl_PL/LC_MESSAGES/ptna.mo differ diff --git a/locale/pt_BR/LC_MESSAGES/ptna.mo b/locale/pt_BR/LC_MESSAGES/ptna.mo index e87dde6..b068c3a 100644 Binary files a/locale/pt_BR/LC_MESSAGES/ptna.mo and b/locale/pt_BR/LC_MESSAGES/ptna.mo differ diff --git a/locale/sr/LC_MESSAGES/ptna.mo b/locale/sr/LC_MESSAGES/ptna.mo index 618ae5a..1b10e0d 100644 Binary files a/locale/sr/LC_MESSAGES/ptna.mo and b/locale/sr/LC_MESSAGES/ptna.mo differ diff --git a/modules/PtnaStrings.pm b/modules/PtnaStrings.pm index 8f2f3b0..746b4ee 100755 --- a/modules/PtnaStrings.pm +++ b/modules/PtnaStrings.pm @@ -43,7 +43,7 @@ sub InitMessageStrings { $MessageHash{$MessageList[$i]->{'message'}} = $i; $i++; - $MessageList[$i]->{'message'} = gettext( "'colour' has unknown value '%s'. Add '#' as first character." ); + $MessageList[$i]->{'message'} = gettext( "'%s' has unknown value '%s'. Add '#' as first character." ); $MessageList[$i]->{'type'} = gettext( "Errors" ); $MessageList[$i]->{'option'} = ""; $MessageList[$i]->{'description'} = ""; @@ -52,7 +52,7 @@ sub InitMessageStrings { $MessageHash{$MessageList[$i]->{'message'}} = $i; $i++; - $MessageList[$i]->{'message'} = gettext( "'colour' has unknown value '%s'. Choose one of the 140 well defined HTML/CSS colour names or the HTML Hex colour codes '#...' or '#......'." ); + $MessageList[$i]->{'message'} = gettext( "'%s' has unknown value '%s'. Choose one of the 140 well defined HTML/CSS colour names or the HTML Hex colour codes '#...' or '#......'." ); $MessageList[$i]->{'type'} = gettext( "Errors" ); $MessageList[$i]->{'option'} = ""; $MessageList[$i]->{'description'} = ""; @@ -61,7 +61,7 @@ sub InitMessageStrings { $MessageHash{$MessageList[$i]->{'message'}} = $i; $i++; - $MessageList[$i]->{'message'} = gettext( "'colour' of Route is not set but 'colour' of Route-Master is set: %s" ); + $MessageList[$i]->{'message'} = gettext( "'%s' of Route is not set but '%s' of Route-Master is set: %s" ); $MessageList[$i]->{'type'} = gettext( "Errors" ); $MessageList[$i]->{'option'} = ""; $MessageList[$i]->{'description'} = ""; @@ -70,7 +70,7 @@ sub InitMessageStrings { $MessageHash{$MessageList[$i]->{'message'}} = $i; $i++; - $MessageList[$i]->{'message'} = gettext( "'colour' of Route is set but 'colour' of Route-Master is not set: %s" ); + $MessageList[$i]->{'message'} = gettext( "'%s' of Route is set but '%s' of Route-Master is not set: %s" ); $MessageList[$i]->{'type'} = gettext( "Errors" ); $MessageList[$i]->{'option'} = ""; $MessageList[$i]->{'description'} = ""; diff --git a/po/ca.po b/po/ca.po index cf69a43..c672083 100644 --- a/po/ca.po +++ b/po/ca.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: ptna 2.0.2\n" "Report-Msgid-Bugs-To: osm-ToniE@web.de\n" -"POT-Creation-Date: 2025-01-05 14:34+0100\n" +"POT-Creation-Date: 2025-01-29 15:02+0100\n" "PO-Revision-Date: 2019-04-05 14:25+0000\n" "Last-Translator: Carlos Sánchez López , 2024\n" "Language-Team: Catalan (https://app.transifex.com/jungle-bus/teams/97874/ca/)\n" @@ -428,18 +428,14 @@ msgid "'network' is not set" msgstr "No s'ha definit 'network'" #, perl-format -msgid "'colour' has unknown value '%s'. Add '#' as first character." +msgid "'%s' has unknown value '%s'. Add '#' as first character." msgstr "" -"L'etiqueta 'colour' té un valor no reconegut '%s'. Afegeix '#' com a primer " -"caràcter." #, perl-format msgid "" -"'colour' has unknown value '%s'. Choose one of the 140 well defined HTML/CSS" -" colour names or the HTML Hex colour codes '#...' or '#......'." +"'%s' has unknown value '%s'. Choose one of the 140 well defined HTML/CSS " +"colour names or the HTML Hex colour codes '#...' or '#......'." msgstr "" -"'colour' té un valor desconegut '%s'. Escull un dels 140 noms de color " -"definits HTML/CSS o el codi de color HTML Hex '#000' o '#000000'." msgid "'network:long' is long form" msgstr "'network:long' és la forma llarga" @@ -463,6 +459,12 @@ msgstr "" "L'etiqueta 'line' (='%s') està reservada per a etiquetatge relacionat amb " "'power' = 'line'. Per a quan es fa ús de 'route_master' o 'route'." +#, perl-format +msgid "" +"The tag 'public_transport' (='%s') is not defined for 'route_master' and " +"'route' relations. Do you mean 'public_transport:version'='2'?" +msgstr "" + #, perl-format msgid "The tag '%s' has an empty value." msgstr "L'etiqueta '%s' té un valor buit." @@ -1366,16 +1368,12 @@ msgid "" msgstr "'%s' = '%s' inclou el separador ';' (punt i coma) amb espais en blanc" #, perl-format -msgid "'colour' of Route is not set but 'colour' of Route-Master is set: %s" +msgid "'%s' of Route is not set but '%s' of Route-Master is set: %s" msgstr "" -"L'etiqueta 'colour' de la Ruta no es troba definida però si el 'colour' de " -"la Ruta Mestra: %s" #, perl-format -msgid "'colour' of Route is set but 'colour' of Route-Master is not set: %s" +msgid "'%s' of Route is set but '%s' of Route-Master is not set: %s" msgstr "" -"'colour' de la Route es troba definit però 'colour' del Route-Master no es " -"troba definit: %s" #, perl-format msgid "" diff --git a/po/de.po b/po/de.po index a0d0b7b..b7ab023 100644 --- a/po/de.po +++ b/po/de.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: ptna 2.0.2\n" "Report-Msgid-Bugs-To: osm-ToniE@web.de\n" -"POT-Creation-Date: 2025-01-28 17:37+0100\n" +"POT-Creation-Date: 2025-01-29 15:02+0100\n" "PO-Revision-Date: 2019-04-05 14:25+0000\n" "Last-Translator: ToniE , 2025\n" "Language-Team: German (https://app.transifex.com/jungle-bus/teams/97874/de/)\n" @@ -434,16 +434,16 @@ msgid "'network' is not set" msgstr "'network' ist nicht gesetzt" #, perl-format -msgid "'colour' has unknown value '%s'. Add '#' as first character." +msgid "'%s' has unknown value '%s'. Add '#' as first character." msgstr "" -"'colour' hat einen unbekannten Wert '%s'. Füge '#' als erstes Zeichen hinzu." +"'%s' hat einen unbekannten Wert '%s'. Füge '#' als erstes Zeichen hinzu." #, perl-format msgid "" -"'colour' has unknown value '%s'. Choose one of the 140 well defined HTML/CSS" -" colour names or the HTML Hex colour codes '#...' or '#......'." +"'%s' has unknown value '%s'. Choose one of the 140 well defined HTML/CSS " +"colour names or the HTML Hex colour codes '#...' or '#......'." msgstr "" -"'colour' hat einen unbekannten Wert '%s'. Wähle einen der 140 definierten " +"'%s' hat einen unbekannten Wert '%s'. Wähle einen der 140 definierten " "HTML/CSS Farbnamen oder den HTML Hex Farben Code '#...' oder '#......'." msgid "'network:long' is long form" @@ -1412,16 +1412,14 @@ msgstr "" "Leerzeichen" #, perl-format -msgid "'colour' of Route is not set but 'colour' of Route-Master is set: %s" +msgid "'%s' of Route is not set but '%s' of Route-Master is set: %s" msgstr "" -"'colour' der Route ist nicht gesetzt aber 'colour' des Route-Masters ist " -"gesetzt: %s" +"'%s' der Route ist nicht gesetzt aber '%s' des Route-Masters ist gesetzt: %s" #, perl-format -msgid "'colour' of Route is set but 'colour' of Route-Master is not set: %s" +msgid "'%s' of Route is set but '%s' of Route-Master is not set: %s" msgstr "" -"'colour' der Route ist gesetzt aber 'colour' des Route-Masters ist nicht " -"gesetzt: %s" +"'%s' der Route ist gesetzt aber '%s' des Route-Masters ist nicht gesetzt: %s" #, perl-format msgid "" diff --git a/po/es.po b/po/es.po index d3ecc13..0752451 100644 --- a/po/es.po +++ b/po/es.po @@ -19,7 +19,7 @@ msgid "" msgstr "" "Project-Id-Version: ptna 2.0.2\n" "Report-Msgid-Bugs-To: osm-ToniE@web.de\n" -"POT-Creation-Date: 2025-01-05 14:34+0100\n" +"POT-Creation-Date: 2025-01-29 15:02+0100\n" "PO-Revision-Date: 2019-04-05 14:25+0000\n" "Last-Translator: ToniE , 2023\n" "Language-Team: Spanish (https://app.transifex.com/jungle-bus/teams/97874/es/)\n" @@ -430,18 +430,14 @@ msgid "'network' is not set" msgstr "'network' no está establecido" #, perl-format -msgid "'colour' has unknown value '%s'. Add '#' as first character." +msgid "'%s' has unknown value '%s'. Add '#' as first character." msgstr "" -"'colour' tiene el valor desconocido '%s'. Añade '#' como primer carácter." #, perl-format msgid "" -"'colour' has unknown value '%s'. Choose one of the 140 well defined HTML/CSS" -" colour names or the HTML Hex colour codes '#...' or '#......'." +"'%s' has unknown value '%s'. Choose one of the 140 well defined HTML/CSS " +"colour names or the HTML Hex colour codes '#...' or '#......'." msgstr "" -"'colour' tiene el valor desconocido '%s'. Escoge uno de los 140 nombres de " -"color HTML/CSS bien definidos o los códigos hexadecimales de color '#...' o " -"'#......'" msgid "'network:long' is long form" msgstr "'network:long' es la forma larga" @@ -465,6 +461,12 @@ msgstr "" "La etiqueta 'line'(='%s') se reserva para etiquetado relacionado con " "'power'='line'. Para transporte público, se usan 'route_master' y 'route'." +#, perl-format +msgid "" +"The tag 'public_transport' (='%s') is not defined for 'route_master' and " +"'route' relations. Do you mean 'public_transport:version'='2'?" +msgstr "" + #, perl-format msgid "The tag '%s' has an empty value." msgstr "" @@ -1252,16 +1254,12 @@ msgstr "" "lados" #, perl-format -msgid "'colour' of Route is not set but 'colour' of Route-Master is set: %s" +msgid "'%s' of Route is not set but '%s' of Route-Master is set: %s" msgstr "" -"No se ha establecido el 'colour' de la ruta, pero sí el 'colour' de la Ruta-" -"Maestra: %s " #, perl-format -msgid "'colour' of Route is set but 'colour' of Route-Master is not set: %s" +msgid "'%s' of Route is set but '%s' of Route-Master is not set: %s" msgstr "" -"Se ha establecido el 'colour' de la ruta, pero el 'colour' de la Ruta-" -"Maestra no: %s" #, perl-format msgid "" diff --git a/po/fr.po b/po/fr.po index cec657b..d9dba9e 100644 --- a/po/fr.po +++ b/po/fr.po @@ -18,7 +18,7 @@ msgid "" msgstr "" "Project-Id-Version: ptna 2.0.2\n" "Report-Msgid-Bugs-To: osm-ToniE@web.de\n" -"POT-Creation-Date: 2025-01-05 14:34+0100\n" +"POT-Creation-Date: 2025-01-29 15:02+0100\n" "PO-Revision-Date: 2019-04-05 14:25+0000\n" "Last-Translator: Patchi, 2024\n" "Language-Team: French (https://app.transifex.com/jungle-bus/teams/97874/fr/)\n" @@ -449,19 +449,14 @@ msgid "'network' is not set" msgstr "L'attribut 'network' n'est pas défini" #, perl-format -msgid "'colour' has unknown value '%s'. Add '#' as first character." +msgid "'%s' has unknown value '%s'. Add '#' as first character." msgstr "" -"La couleur 'colour' a une valeur inconnue : '%s'. Ajoutez '#' comme premier " -"caractère." #, perl-format msgid "" -"'colour' has unknown value '%s'. Choose one of the 140 well defined HTML/CSS" -" colour names or the HTML Hex colour codes '#...' or '#......'." +"'%s' has unknown value '%s'. Choose one of the 140 well defined HTML/CSS " +"colour names or the HTML Hex colour codes '#...' or '#......'." msgstr "" -"La couleur 'colour' a une valeur inconnue : '%s'. Choisissez l'une des 140 " -"couleurs HTML / CSS bien définies ou les codes de couleur HTML Hex '#...' ou" -" '#......'." msgid "'network:long' is long form" msgstr "L'attribut 'network:long' est une forme longue" @@ -486,6 +481,12 @@ msgstr "" "'power' = 'line'. Pour les transports en commun 'route_master' et 'route' " "sont utilisés." +#, perl-format +msgid "" +"The tag 'public_transport' (='%s') is not defined for 'route_master' and " +"'route' relations. Do you mean 'public_transport:version'='2'?" +msgstr "" + #, perl-format msgid "The tag '%s' has an empty value." msgstr "L'attribut '%s' a une valeur vide." @@ -1469,16 +1470,12 @@ msgstr "" "séparateur ';' (point-virgule)" #, perl-format -msgid "'colour' of Route is not set but 'colour' of Route-Master is set: %s" +msgid "'%s' of Route is not set but '%s' of Route-Master is set: %s" msgstr "" -"La couleur 'colour' de la ligne n'est pas définie contrairement à celle de " -"la ligne maître : %s" #, perl-format -msgid "'colour' of Route is set but 'colour' of Route-Master is not set: %s" +msgid "'%s' of Route is set but '%s' of Route-Master is not set: %s" msgstr "" -"La couleur 'colour' de la ligne est définie mais pas celle de la ligne " -"maître : %s" #, perl-format msgid "" diff --git a/po/hu.po b/po/hu.po index 2bd2c63..ca14c44 100644 --- a/po/hu.po +++ b/po/hu.po @@ -13,10 +13,10 @@ msgid "" msgstr "" "Project-Id-Version: ptna 2.0.2\n" "Report-Msgid-Bugs-To: osm-ToniE@web.de\n" -"POT-Creation-Date: 2022-09-19 18:41+0200\n" +"POT-Creation-Date: 2025-01-29 15:02+0100\n" "PO-Revision-Date: 2019-04-05 14:25+0000\n" "Last-Translator: ToniE , 2022\n" -"Language-Team: Hungarian (https://www.transifex.com/jungle-bus/teams/97874/hu/)\n" +"Language-Team: Hungarian (https://app.transifex.com/jungle-bus/teams/97874/hu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -403,13 +403,13 @@ msgid "'network' is not set" msgstr "Nincs megadva 'network' címke" #, perl-format -msgid "'colour' has unknown value '%s'. Add '#' as first character." +msgid "'%s' has unknown value '%s'. Add '#' as first character." msgstr "" #, perl-format msgid "" -"'colour' has unknown value '%s'. Choose one of the 140 well defined HTML/CSS" -" colour names or the HTML Hex colour codes '#...' or '#......'." +"'%s' has unknown value '%s'. Choose one of the 140 well defined HTML/CSS " +"colour names or the HTML Hex colour codes '#...' or '#......'." msgstr "" msgid "'network:long' is long form" @@ -430,6 +430,28 @@ msgid "" " public transport 'route_master' and 'route' are used." msgstr "" +#, perl-format +msgid "" +"The tag 'public_transport' (='%s') is not defined for 'route_master' and " +"'route' relations. Do you mean 'public_transport:version'='2'?" +msgstr "" + +#, perl-format +msgid "The tag '%s' has an empty value." +msgstr "" + +#, perl-format +msgid "" +"The tag '%s' includes whitespace character '%s' (=%#2x) in key. Value of " +"tag: '%s'" +msgstr "" + +#, perl-format +msgid "" +"The tag '%s' includes potentially problematic character '%s' in key. Value " +"of tag: '%s'" +msgstr "" + msgid "Route-Master without Route(s)" msgstr "" @@ -442,10 +464,16 @@ msgstr "" msgid "Route-Master with Node(s)" msgstr "" +#, perl-format +msgid "Route-Master has %d member with 'role' being set" +msgid_plural "Route-Master has %d members with 'role' being set" +msgstr[0] "" +msgstr[1] "" + msgid "'public_transport:version' is not set to '2'" msgstr "A 'public_transport:version' kulcs értéke nem '2'" -msgid "Skipping further analysis ..." +msgid "Skipping further analysis. PTNA did not download all needed OSM data." msgstr "" msgid "Route without Way(s)" @@ -557,6 +585,11 @@ msgid "" "'stop_position'" msgstr "" +#, perl-format +msgid "" +"PTv2 route: 'role' = '%s' and 'public_transport' is not set but '%s' is set" +msgstr "" + #, perl-format msgid "PTv2 route: 'role' = '%s' but 'public_transport' is not set" msgstr "" @@ -631,6 +664,22 @@ msgstr "" msgid "PTv2 route: last node of way is not a stop position of this route: %s" msgstr "" +#, perl-format +msgid "PTv2 route: wrong 'role' = '%s' for first stop" +msgstr "" + +#, perl-format +msgid "PTv2 route: wrong 'role' = '%s' for last stop" +msgstr "" + +#, perl-format +msgid "PTv2 route: wrong 'role' = '%s' for first platform" +msgstr "" + +#, perl-format +msgid "PTv2 route: wrong 'role' = '%s' for last platform" +msgstr "" + msgid "wrong value" msgstr "" @@ -725,6 +774,15 @@ msgstr "" msgid "Route: using way type (%s)" msgstr "" +msgid "" +"Route: restricted access ('bus'='school') to way for a route relation not " +"tagged with 'bus'='school'" +msgid_plural "" +"Route: restricted access ('bus'='school') to ways for a route relation not " +"tagged with 'bus'='school'" +msgstr[0] "" +msgstr[1] "" + #, perl-format msgid "" "Route: incorrect access restriction (%s) to way. Consider tagging as " @@ -735,6 +793,26 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" +#, perl-format +msgid "" +"Route: suspicious access restriction (%s) to way. Check whether this should " +"be '%s:lanes'='%s'" +msgid_plural "" +"Route: suspicious access restriction (%s) to ways. Check whether this should" +" be '%s:lanes'='%s'" +msgstr[0] "" +msgstr[1] "" + +#, perl-format +msgid "" +"Route: suspicious access restriction (%s) to way. Check whether this should " +"be '%s'='yes' or 'psv'='yes'" +msgid_plural "" +"Route: suspicious access restriction (%s) to ways. Check whether this should" +" be '%s'='yes' or 'psv'='yes'" +msgstr[0] "" +msgstr[1] "" + #, perl-format msgid "Route: unclear access (%s) to way" msgid_plural "Route: unclear access (%s) to ways" @@ -813,6 +891,9 @@ msgstr "" msgid "(consider creating a 'route_ref' = '%s' tag for the stop)" msgstr "" +msgid "Error in input data: insufficient data for relations" +msgstr "" + msgid "Error in input data: insufficient data for ways" msgstr "" @@ -833,6 +914,12 @@ msgid "" "href='/en/index.php#messages'>Messages'." msgstr "" +msgid "New" +msgstr "" + +msgid "Request start of new analysis" +msgstr "" + msgid "Static Analysis for OpenStreetMap" msgstr "" @@ -1084,6 +1171,9 @@ msgstr "" msgid "Edit in JOSM" msgstr "" +msgid "Edit in Relatify" +msgstr "" + msgid "Show relation on special map" msgstr "" @@ -1097,16 +1187,12 @@ msgid "" msgstr "" #, perl-format -msgid "'colour' of Route is not set but 'colour' of Route-Master is set: %s" +msgid "'%s' of Route is not set but '%s' of Route-Master is set: %s" msgstr "" -"a route_master kapcsolatra ugyan meg van adva 'colour' érték, az útvonalra " -"viszont nincs: %s" #, perl-format -msgid "'colour' of Route is set but 'colour' of Route-Master is not set: %s" +msgid "'%s' of Route is set but '%s' of Route-Master is not set: %s" msgstr "" -"az útvonalra ugyan meg van adva 'colour' érték, a route_master kapcsolatra " -"viszont nincs: %s" #, perl-format msgid "" @@ -1135,9 +1221,34 @@ msgstr "" msgid "'public_transport:version' is not set" msgstr "Nincs megadva 'public_transport:version' címke" +#, perl-format +msgid "" +"CSV data includes too many ';'. Line %s of Routes-Data. Contents of line: " +"'%s'" +msgstr "" + +#, perl-format +msgid "" +"CSV data: field 'gtfs_feed' (= '%s') is wrong. Line %s of Routes-Data. " +"Contents of line: '%s'" +msgstr "" + +#, perl-format +msgid "" +"CSV data: field 'release_date' (= '%s') is wrong. Should be a date (YYYY-MM-" +"DD), 'latest', 'previous' or 'long-term'. Line %s of Routes-Data. Contents " +"of line: '%s'" +msgstr "" + +#, perl-format +msgid "" +"First character of line ('%s') is reserved. Please put the first CSV field " +"into double quotes (\"...\"). Line %s of Routes-Data. Contents of line: '%s'" +msgstr "" + msgid "" "This Route relation has been included into the input data as a side-effect, " -"the member ways and member nodes of this Route have not been included." +"the members (relations, ways, nodes) of this Route have not been included." msgstr "" #, perl-format @@ -1191,6 +1302,19 @@ msgstr "" msgid "This is currently deactivated." msgstr "" +msgid "" +"The vehicle uses a service way with a 'service' tag which is considered as " +"not suitable for public transport routes." +msgstr "" + +msgid "" +"Public transport routes should not use service ways tagged with 'service' = " +"'alley', 'driveway', 'emergence', 'drive-through' or 'parking_aisle'." +msgstr "" + +msgid "Check the route and consider deleting the 'service' tag from the way." +msgstr "" + msgid "" "This Route-Master has less route relations than listed here (Route(s) not " "listed in the Route-Master?)." @@ -1283,7 +1407,7 @@ msgstr "" msgid "" "Further analysis of this Route relation does not make sense without the data" -" for ways and nodes." +" for ways, nodes or relations." msgstr "" msgid "" @@ -1312,6 +1436,12 @@ msgid "" " '%s'" msgstr "" +msgid "Values of tags must not be empty." +msgstr "" + +msgid "See also:" +msgstr "" + msgid "Defines the language for the output." msgstr "" @@ -1329,6 +1459,24 @@ msgstr "" msgid "This applies to 'barrier' = '...' as well." msgstr "" +msgid "Check OSM route_master/route data against GTFS feed data" +msgstr "" + +msgid "no checking" +msgstr "" + +msgid "check against GTFS feed data specified in" +msgstr "" + +msgid "CSV entry in the routes file" +msgstr "" + +msgid "tags in the route_master and route relations" +msgstr "" + +msgid "check against 'csv' and 'tags'" +msgstr "" + msgid "'highway' = 'bus_stop' can be set on nodes only, not on ways or areas." msgstr "" @@ -1479,6 +1627,9 @@ msgid "" "match this regular expression as 'short' form or can be empty (unset)." msgstr "" +msgid "Do not print the additional navigation buttons on top of the tables." +msgstr "" + msgid "" "The value of 'operator' = '...' of the Route-Master and Route relations must" " match this regular expression or can be empty (unset)." @@ -1503,9 +1654,6 @@ msgstr "" msgid "assume and show compatibility with legacy bus-stops (aka: PTv1)" msgstr "" -msgid "See also:" -msgstr "" - msgid "Compatibility with well known tags" msgstr "" @@ -1526,29 +1674,35 @@ msgid "" "Do not consider Route-Master and Route relations with empty 'operator'." msgstr "" -#, perl-format +msgid "This sets the field separator in the CSV list of routes." +msgstr "" + msgid "" -"First character of line ('%s') is reserved. Please put the first CSV field " -"into double quotes (\"...\"). Line %s of Routes-Data. Contents of line: '%s'" +"Show also the values of these tags in the table for the list of 'positive' " +"routes." msgstr "" -#, perl-format msgid "" -"CSV data: field 'gtfs_feed' (= '%s') is wrong. Line %s of Routes-Data. " -"Contents of line: '%s'" +"This sets the OR separator in the 'ref' field of the CSV list of routes." msgstr "" -#, perl-format msgid "" -"CSV data: field 'release_date' (= '%s') is wrong. Should be a date (YYYY-MM-" -"DD), 'latest', 'previous' or 'long-term'. Line %s of Routes-Data. Contents " -"of line: '%s'" +"Example: '250|250a|250b' : defines that routes with 'ref' = '250' and 'ref' " +"= '250a' and 'ref' = '250b' are allowed here." msgstr "" -#, perl-format msgid "" -"CSV data includes too many ';'. Line %s of Routes-Data. Contents of line: " -"'%s'" +"This sets the 'network-ref' separator in the 'ref' field of the CSV list of " +"routes." +msgstr "" + +msgid "" +"Example: '605/50' : defines that here 'ref' of two 'network' are valid." +msgstr "" + +msgid "" +"It is checked, whether 'ref:network1' = '605' and 'ref:network2' = '50' " +"exist." msgstr "" msgid "is not set" @@ -1563,11 +1717,20 @@ msgstr "" msgid "is not yet valid (in the future)" msgstr "" -msgid "outdated, fits to older GTFS version only" +msgid "is outdated, fits to older GTFS version only" msgstr "" msgid "does not exist" msgstr "" +msgid "Compare GTFS route with OSM route_master/route" +msgstr "" + +msgid "Compare GTFS trip with OSM route" +msgstr "" + msgid "does not provide any 'shape' data" msgstr "" + +msgid "internal error" +msgstr "" diff --git a/po/it.po b/po/it.po index f3de222..faebcc3 100644 --- a/po/it.po +++ b/po/it.po @@ -12,10 +12,10 @@ msgid "" msgstr "" "Project-Id-Version: ptna 2.0.2\n" "Report-Msgid-Bugs-To: osm-ToniE@web.de\n" -"POT-Creation-Date: 2022-12-29 18:59+0100\n" +"POT-Creation-Date: 2025-01-29 15:02+0100\n" "PO-Revision-Date: 2019-04-05 14:25+0000\n" "Last-Translator: ToniE , 2023\n" -"Language-Team: Italian (https://www.transifex.com/jungle-bus/teams/97874/it/)\n" +"Language-Team: Italian (https://app.transifex.com/jungle-bus/teams/97874/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -424,13 +424,13 @@ msgid "'network' is not set" msgstr "‘network‘ non è impostata" #, perl-format -msgid "'colour' has unknown value '%s'. Add '#' as first character." +msgid "'%s' has unknown value '%s'. Add '#' as first character." msgstr "" #, perl-format msgid "" -"'colour' has unknown value '%s'. Choose one of the 140 well defined HTML/CSS" -" colour names or the HTML Hex colour codes '#...' or '#......'." +"'%s' has unknown value '%s'. Choose one of the 140 well defined HTML/CSS " +"colour names or the HTML Hex colour codes '#...' or '#......'." msgstr "" msgid "'network:long' is long form" @@ -451,6 +451,28 @@ msgid "" " public transport 'route_master' and 'route' are used." msgstr "" +#, perl-format +msgid "" +"The tag 'public_transport' (='%s') is not defined for 'route_master' and " +"'route' relations. Do you mean 'public_transport:version'='2'?" +msgstr "" + +#, perl-format +msgid "The tag '%s' has an empty value." +msgstr "" + +#, perl-format +msgid "" +"The tag '%s' includes whitespace character '%s' (=%#2x) in key. Value of " +"tag: '%s'" +msgstr "" + +#, perl-format +msgid "" +"The tag '%s' includes potentially problematic character '%s' in key. Value " +"of tag: '%s'" +msgstr "" + msgid "Route-Master without Route(s)" msgstr "Itinerario ‘master’ senza itinerari" @@ -463,10 +485,17 @@ msgstr "" msgid "Route-Master with Node(s)" msgstr "" +#, perl-format +msgid "Route-Master has %d member with 'role' being set" +msgid_plural "Route-Master has %d members with 'role' being set" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + msgid "'public_transport:version' is not set to '2'" msgstr "" -msgid "Skipping further analysis ..." +msgid "Skipping further analysis. PTNA did not download all needed OSM data." msgstr "" msgid "Route without Way(s)" @@ -583,6 +612,11 @@ msgid "" "'stop_position'" msgstr "" +#, perl-format +msgid "" +"PTv2 route: 'role' = '%s' and 'public_transport' is not set but '%s' is set" +msgstr "" + #, perl-format msgid "PTv2 route: 'role' = '%s' but 'public_transport' is not set" msgstr "" @@ -657,6 +691,22 @@ msgstr "" msgid "PTv2 route: last node of way is not a stop position of this route: %s" msgstr "" +#, perl-format +msgid "PTv2 route: wrong 'role' = '%s' for first stop" +msgstr "" + +#, perl-format +msgid "PTv2 route: wrong 'role' = '%s' for last stop" +msgstr "" + +#, perl-format +msgid "PTv2 route: wrong 'role' = '%s' for first platform" +msgstr "" + +#, perl-format +msgid "PTv2 route: wrong 'role' = '%s' for last platform" +msgstr "" + msgid "wrong value" msgstr "" @@ -877,6 +927,9 @@ msgstr "" msgid "(consider creating a 'route_ref' = '%s' tag for the stop)" msgstr "" +msgid "Error in input data: insufficient data for relations" +msgstr "" + msgid "Error in input data: insufficient data for ways" msgstr "" @@ -897,6 +950,12 @@ msgid "" "href='/en/index.php#messages'>Messages'." msgstr "" +msgid "New" +msgstr "" + +msgid "Request start of new analysis" +msgstr "" + msgid "Static Analysis for OpenStreetMap" msgstr "Analisi statica per OpenStreetMap" @@ -1148,6 +1207,9 @@ msgstr "" msgid "Edit in JOSM" msgstr "" +msgid "Edit in Relatify" +msgstr "" + msgid "Show relation on special map" msgstr "" @@ -1161,14 +1223,12 @@ msgid "" msgstr "" #, perl-format -msgid "'colour' of Route is not set but 'colour' of Route-Master is set: %s" +msgid "'%s' of Route is not set but '%s' of Route-Master is set: %s" msgstr "" #, perl-format -msgid "'colour' of Route is set but 'colour' of Route-Master is not set: %s" +msgid "'%s' of Route is set but '%s' of Route-Master is not set: %s" msgstr "" -"‘colour’ dell’itinerario è impostato ma ’colour’ dell’itinerario ‘master’ " -"non lo è: %s" #, perl-format msgid "" @@ -1224,7 +1284,7 @@ msgstr "" msgid "" "This Route relation has been included into the input data as a side-effect, " -"the member ways and member nodes of this Route have not been included." +"the members (relations, ways, nodes) of this Route have not been included." msgstr "" #, perl-format @@ -1383,7 +1443,7 @@ msgstr "" msgid "" "Further analysis of this Route relation does not make sense without the data" -" for ways and nodes." +" for ways, nodes or relations." msgstr "" msgid "" @@ -1412,6 +1472,12 @@ msgid "" " '%s'" msgstr "" +msgid "Values of tags must not be empty." +msgstr "" + +msgid "See also:" +msgstr "" + msgid "Defines the language for the output." msgstr "" @@ -1429,6 +1495,24 @@ msgstr "" msgid "This applies to 'barrier' = '...' as well." msgstr "" +msgid "Check OSM route_master/route data against GTFS feed data" +msgstr "" + +msgid "no checking" +msgstr "" + +msgid "check against GTFS feed data specified in" +msgstr "" + +msgid "CSV entry in the routes file" +msgstr "" + +msgid "tags in the route_master and route relations" +msgstr "" + +msgid "check against 'csv' and 'tags'" +msgstr "" + msgid "'highway' = 'bus_stop' can be set on nodes only, not on ways or areas." msgstr "" @@ -1606,9 +1690,6 @@ msgstr "" msgid "assume and show compatibility with legacy bus-stops (aka: PTv1)" msgstr "" -msgid "See also:" -msgstr "" - msgid "Compatibility with well known tags" msgstr "" @@ -1632,6 +1713,11 @@ msgstr "" msgid "This sets the field separator in the CSV list of routes." msgstr "" +msgid "" +"Show also the values of these tags in the table for the list of 'positive' " +"routes." +msgstr "" + msgid "" "This sets the OR separator in the 'ref' field of the CSV list of routes." msgstr "" @@ -1667,11 +1753,20 @@ msgstr "" msgid "is not yet valid (in the future)" msgstr "" -msgid "outdated, fits to older GTFS version only" +msgid "is outdated, fits to older GTFS version only" msgstr "" msgid "does not exist" msgstr "" +msgid "Compare GTFS route with OSM route_master/route" +msgstr "" + +msgid "Compare GTFS trip with OSM route" +msgstr "" + msgid "does not provide any 'shape' data" msgstr "" + +msgid "internal error" +msgstr "" diff --git a/po/pl_PL.po b/po/pl_PL.po index 0b7991a..c756f4c 100644 --- a/po/pl_PL.po +++ b/po/pl_PL.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: ptna 2.0.2\n" "Report-Msgid-Bugs-To: osm-ToniE@web.de\n" -"POT-Creation-Date: 2025-01-05 14:34+0100\n" +"POT-Creation-Date: 2025-01-29 15:02+0100\n" "PO-Revision-Date: 2019-04-05 14:25+0000\n" "Last-Translator: ToniE , 2023\n" "Language-Team: Polish (Poland) (https://app.transifex.com/jungle-bus/teams/97874/pl_PL/)\n" @@ -395,13 +395,13 @@ msgid "'network' is not set" msgstr "'network' nie jest ustawione" #, perl-format -msgid "'colour' has unknown value '%s'. Add '#' as first character." -msgstr "`colour` ma nieznaną wartość '%s'. Dodaj '#' jako pierwszy znak" +msgid "'%s' has unknown value '%s'. Add '#' as first character." +msgstr "" #, perl-format msgid "" -"'colour' has unknown value '%s'. Choose one of the 140 well defined HTML/CSS" -" colour names or the HTML Hex colour codes '#...' or '#......'." +"'%s' has unknown value '%s'. Choose one of the 140 well defined HTML/CSS " +"colour names or the HTML Hex colour codes '#...' or '#......'." msgstr "" msgid "'network:long' is long form" @@ -422,6 +422,12 @@ msgid "" " public transport 'route_master' and 'route' are used." msgstr "" +#, perl-format +msgid "" +"The tag 'public_transport' (='%s') is not defined for 'route_master' and " +"'route' relations. Do you mean 'public_transport:version'='2'?" +msgstr "" + #, perl-format msgid "The tag '%s' has an empty value." msgstr "" @@ -1221,15 +1227,12 @@ msgid "" msgstr "" #, perl-format -msgid "'colour' of Route is not set but 'colour' of Route-Master is set: %s" +msgid "'%s' of Route is not set but '%s' of Route-Master is set: %s" msgstr "" -"Tag 'colour' dla trasy nie jest ustawiony, ale jest dla relacji route-" -"master: %s" #, perl-format -msgid "'colour' of Route is set but 'colour' of Route-Master is not set: %s" +msgid "'%s' of Route is set but '%s' of Route-Master is not set: %s" msgstr "" -"Tag 'colour' dla trasy jest ustawiony, ale nie dla relacji route-master: %s" #, perl-format msgid "" diff --git a/po/pt_BR.po b/po/pt_BR.po index b5122e5..412dc53 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: ptna 2.0.2\n" "Report-Msgid-Bugs-To: osm-ToniE@web.de\n" -"POT-Creation-Date: 2025-01-05 14:34+0100\n" +"POT-Creation-Date: 2025-01-29 15:02+0100\n" "PO-Revision-Date: 2019-04-05 14:25+0000\n" "Last-Translator: Matheus Gomes, 2023\n" "Language-Team: Portuguese (Brazil) (https://app.transifex.com/jungle-bus/teams/97874/pt_BR/)\n" @@ -391,17 +391,14 @@ msgid "'network' is not set" msgstr "A etiqueta \"network\" não está definida" #, perl-format -msgid "'colour' has unknown value '%s'. Add '#' as first character." -msgstr "A etiqueta \"colour\" possui um valor inválido: \"%s\". Adicione \"#\" no início." +msgid "'%s' has unknown value '%s'. Add '#' as first character." +msgstr "" #, perl-format msgid "" -"'colour' has unknown value '%s'. Choose one of the 140 well defined HTML/CSS" -" colour names or the HTML Hex colour codes '#...' or '#......'." +"'%s' has unknown value '%s'. Choose one of the 140 well defined HTML/CSS " +"colour names or the HTML Hex colour codes '#...' or '#......'." msgstr "" -"A etiqueta \"colour\" possui um valor inválido: \"%s\". Escolha um dos 140 " -"nomes de cores em HTML ou utilize um código hexadecimal (ex.: \"#AAA\", " -"\"#ABCDEF\")." msgid "'network:long' is long form" msgstr "" @@ -423,6 +420,12 @@ msgid "" " public transport 'route_master' and 'route' are used." msgstr "" +#, perl-format +msgid "" +"The tag 'public_transport' (='%s') is not defined for 'route_master' and " +"'route' relations. Do you mean 'public_transport:version'='2'?" +msgstr "" + #, perl-format msgid "The tag '%s' has an empty value." msgstr "" @@ -1216,11 +1219,11 @@ msgstr "" " branco" #, perl-format -msgid "'colour' of Route is not set but 'colour' of Route-Master is set: %s" +msgid "'%s' of Route is not set but '%s' of Route-Master is set: %s" msgstr "" #, perl-format -msgid "'colour' of Route is set but 'colour' of Route-Master is not set: %s" +msgid "'%s' of Route is set but '%s' of Route-Master is not set: %s" msgstr "" #, perl-format diff --git a/po/ptna.pot b/po/ptna.pot index 76a264c..3ce00a9 100644 --- a/po/ptna.pot +++ b/po/ptna.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ptna 2.0.2\n" "Report-Msgid-Bugs-To: osm-ToniE@web.de\n" -"POT-Creation-Date: 2025-01-28 17:37+0100\n" +"POT-Creation-Date: 2025-01-29 15:02+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -375,12 +375,12 @@ msgid "'network' is not set" msgstr "" #, perl-format -msgid "'colour' has unknown value '%s'. Add '#' as first character." +msgid "'%s' has unknown value '%s'. Add '#' as first character." msgstr "" #, perl-format msgid "" -"'colour' has unknown value '%s'. Choose one of the 140 well defined HTML/CSS " +"'%s' has unknown value '%s'. Choose one of the 140 well defined HTML/CSS " "colour names or the HTML Hex colour codes '#...' or '#......'." msgstr "" @@ -1151,11 +1151,11 @@ msgid "" msgstr "" #, perl-format -msgid "'colour' of Route is not set but 'colour' of Route-Master is set: %s" +msgid "'%s' of Route is not set but '%s' of Route-Master is set: %s" msgstr "" #, perl-format -msgid "'colour' of Route is set but 'colour' of Route-Master is not set: %s" +msgid "'%s' of Route is set but '%s' of Route-Master is not set: %s" msgstr "" #, perl-format diff --git a/po/sr.po b/po/sr.po index 76fc210..27621ca 100644 --- a/po/sr.po +++ b/po/sr.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: ptna 2.0.2\n" "Report-Msgid-Bugs-To: osm-ToniE@web.de\n" -"POT-Creation-Date: 2025-01-05 14:34+0100\n" +"POT-Creation-Date: 2025-01-29 15:02+0100\n" "PO-Revision-Date: 2019-04-05 14:25+0000\n" "Last-Translator: Branko Kokanovic , 2022\n" "Language-Team: Serbian (https://app.transifex.com/jungle-bus/teams/97874/sr/)\n" @@ -415,17 +415,14 @@ msgid "'network' is not set" msgstr "’network’ ознака није постављена" #, perl-format -msgid "'colour' has unknown value '%s'. Add '#' as first character." -msgstr "’colour’ има непознату вредност ’%s’. Додајте ’#’ као први знак." +msgid "'%s' has unknown value '%s'. Add '#' as first character." +msgstr "" #, perl-format msgid "" -"'colour' has unknown value '%s'. Choose one of the 140 well defined HTML/CSS" -" colour names or the HTML Hex colour codes '#...' or '#......'." +"'%s' has unknown value '%s'. Choose one of the 140 well defined HTML/CSS " +"colour names or the HTML Hex colour codes '#...' or '#......'." msgstr "" -"’colour’ има непознату вредност ’%s’. Одаберите једно од 140 утврђена " -"HTML/CSS имена боја или унесите HTML хексадецималну шифру боје ’#...’ или " -"’#......’ ." msgid "'network:long' is long form" msgstr "’network:long’ је дугачког облика" @@ -449,6 +446,12 @@ msgstr "" "Ознака ’line’ (=’%s’) је резервисана за означавање везано за ’power’ = " "’line’. За јавне превозе, користе се ’route_master’ и ’route’." +#, perl-format +msgid "" +"The tag 'public_transport' (='%s') is not defined for 'route_master' and " +"'route' relations. Do you mean 'public_transport:version'='2'?" +msgstr "" + #, perl-format msgid "The tag '%s' has an empty value." msgstr "" @@ -1350,16 +1353,12 @@ msgstr "" "'%s' = '%s' укључује и раздвајач ';' (тачка-зарез) са околним белинама" #, perl-format -msgid "'colour' of Route is not set but 'colour' of Route-Master is set: %s" +msgid "'%s' of Route is not set but '%s' of Route-Master is set: %s" msgstr "" -"'colour' (боја) вредност руте није стављена, али је постављена 'colour' " -"ознака мастер руте: %s" #, perl-format -msgid "'colour' of Route is set but 'colour' of Route-Master is not set: %s" +msgid "'%s' of Route is set but '%s' of Route-Master is not set: %s" msgstr "" -"'colour' (боја) вредност руте је постављена, али 'colour' ознака мастер руте" -" није: %s" #, perl-format msgid "" diff --git a/test/read-routes-data.expect b/test/read-routes-data.expect index e2dd0ca..602c6c4 100644 --- a/test/read-routes-data.expect +++ b/test/read-routes-data.expect @@ -110,7 +110,7 @@

2.3 External Link without alias: https://ptna.openstreetmap.de

2.4 OSM-Wiki Link with alias: München

2.5 OSM-Wiki Link without alias: München

-010 201 301 302 401 402 501 502 601 602 603 604 605 606 800 900 901 902 903 904 910 911 912 913 914 915 916 917 918 919 998;999

+010 201 301 302 401 402 501 502 601 602 603 604  605  606 800 900 901 902 903 904 910 911 912 913 914 915 916 917 918 919 998;999

simple text in a paragraph @@ -342,8 +342,8 @@ text inside table is now supported Missing route for 'ref'='603' and 'route'='bus' 604Comment: comment; From: from; To: to Missing route for 'ref'='604' and 'route'='bus' - 605Comment: comment; From: from; To: to; Operator: operator - Bus 605: from => torouteRelation -390962Route without Way(s)
PTv2 route: there are no 'public_transport' = 'stop_position' and no 'public_transport' = 'platform''network' = 'network'
'operator' = 'operator' +  605 Comment: comment; From: from; To: to; Operator: operator + Bus 605: from => torouteRelation -997872Route without Way(s)
PTv2 route: there are no 'public_transport' = 'stop_position' and no 'public_transport' = 'platform''network' = 'network'
'operator' = 'operator' 606Operator: operator Missing route for 'ref'='606' and 'route'='bus' 700 @@ -397,7 +397,7 @@ text inside table is now supported ⇅Network (network=)⇅Number⇅Relations - network1Relation '605' -39096 + network1Relation '605' -99787 diff --git a/test/read-routes-data.osm b/test/read-routes-data.osm index ebd0efc..d803161 100644 --- a/test/read-routes-data.osm +++ b/test/read-routes-data.osm @@ -2,7 +2,7 @@ - + @@ -12,5 +12,7 @@ + +