diff options
94 files changed, 20480 insertions, 5606 deletions
diff --git a/navit/attr_def.h b/navit/attr_def.h index 3b0a59243..421696419 100644 --- a/navit/attr_def.h +++ b/navit/attr_def.h @@ -196,11 +196,11 @@ ATTR(autozoom_max) ATTR2(0x00027500,type_rel_abs_begin) /* These attributes are int that can either hold relative * * or absolute values. A relative value is indicated by * - * adding 0x60000000. * - * * + * adding 0x60000000. * + * * * The range of valid absolute values is -0x40000000 to * - * 0x40000000, the range of relative values is from * - * -0x20000000 to 0x20000000. */ + * 0x40000000, the range of relative values is from * + * -0x20000000 to 0x20000000. */ ATTR(h) ATTR(w) ATTR(x) @@ -394,6 +394,8 @@ ATTR(street_name_systematic_nat) ATTR(street_name_systematic_int) ATTR(street_destination) ATTR(exit_to) +ATTR(street_destination_forward) +ATTR(street_destination_backward) ATTR2(0x0003ffff,type_string_end) ATTR2(0x00040000,type_special_begin) ATTR(order) diff --git a/navit/item.h b/navit/item.h index 341d4406d..00cc2f47e 100644 --- a/navit/item.h +++ b/navit/item.h @@ -52,7 +52,7 @@ extern int default_flags[]; #define item_is_district(item) ((item).type >= type_district_label && (item).type <= type_district_label_1e7) #define item_is_poly_place(item) ((item).type >= type_poly_place1 && (item).type <= type_poly_place6) #define item_is_point(item) ((item).type < type_line) -#define item_is_custom_poi(item) ((item).type >= type_poi_customg && (item).type < type_line) +#define item_is_custom_poi(item) ((item).type >= type_poi_customo && (item).type < type_line) #define item_is_street(item) (((item).type >= type_street_nopass && (item).type <= type_roundabout) \ || (item).type == type_street_service \ || ((item).type >= type_street_pedestrian && (item).type <= type_track_grass) \ diff --git a/navit/item_def.h b/navit/item_def.h index 1796c7c54..0ce616ace 100644 --- a/navit/item_def.h +++ b/navit/item_def.h @@ -350,15 +350,15 @@ ITEM(poi_hindu) ITEM(poi_buddhist) ITEM(poi_bahai) ITEM(found_item) -ITEM2(0x7fffffe0,poi_customg) -ITEM(poi_customh) -ITEM(poi_customi) -ITEM(poi_customj) -ITEM(poi_customk) -ITEM(poi_customl) -ITEM(poi_customm) -ITEM(poi_customn) -ITEM(poi_customo) +ITEM(nav_merge_left) +ITEM(nav_merge_right) +ITEM(nav_turnaround_left) +ITEM(nav_turnaround_right) +ITEM(nav_exit_left) +ITEM(nav_exit_right) +ITEM(nav_keep_left) +ITEM(nav_keep_right) +ITEM2(0x7fffffe8,poi_customo) ITEM(poi_customp) ITEM(poi_customq) ITEM(poi_customr) diff --git a/navit/maptool/osm.c b/navit/maptool/osm.c index 6d765eccc..804321d4e 100644 --- a/navit/maptool/osm.c +++ b/navit/maptool/osm.c @@ -1163,7 +1163,7 @@ osm_add_tag(char *k, char *v) attr_strings_save(attr_string_population, v); level=5; } - if (! strcmp(k,"ref")) { + if ((! strcmp(k,"ref")) || (! strcmp(k,"destination:ref"))) { if (in_way) attr_strings_save(attr_string_street_name_systematic, v); /* for exit number of highway_exit poi */ diff --git a/navit/navigation.c b/navit/navigation.c index 6d96dd6ee..3c2d4d578 100644 --- a/navit/navigation.c +++ b/navit/navigation.c @@ -1,6 +1,44 @@ +/* some changes in navigation.c + * + * + * + * some relate to (partially or in whole) + * #1265 from mvglaslow + * #1271 from jandegr + * #1274 from jandegr + * #1174 from arnaud le meur + * #1082 from robotaxi + * #921 from psoding + * #795 from user:ps333 + * #694 from user:nop + * #660 from user:polarbear_n + * + * and an incomplete list of more navigation.c related tickets + * #1190 + * #1160 + * #1161 + * #1095 + * #1087 + * #880 + * #870 + * (#519) + * + */ + +/* KNOWN ISSUES + * + * + * in navigation_itm_new() : If a way splits in 2, exit_to info ends up on + * both continuations of the ramp, sometimes leading to wrong guidance + * The case where a ramp itself splits in 2 is already covered by ignoring exit_to info + * in such cases. + * + * + */ + /** * Navit, a modular navigation system. - * Copyright (C) 2005-2008 Navit Team + * Copyright (C) 2005-2015 Navit Team * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -41,26 +79,92 @@ #include "plugin.h" #include "navit_nls.h" #include "util.h" +#include "linguistics.h" /* #define DEBUG */ static int roundabout_extra_length=50; +/* TODO: find out if this is being used elsewhere and, if so, move this definition somewhere more generic */ +static int invalid_angle = 361; + +/** Minimum absolute delta for a turn. + * Maneuvers whose absolute delta is less than this will be considered straight */ +static int min_turn_limit = 25; + +/* FIXME: revisit these limits. IMHO (mvglasow): + * + * 0 degrees = perfect straight road + * 90 degrees = perfect turn + * 180 degrees = perfect U turn + * + * Then, by interpolation: + * 45 degrees = perfect "light turn" + * 135 degrees = perfect "sharp turn" + * + * This also agrees with the angles depicted in the maneuver icons. + * + * Thresholds should be roughly halfway between them. + * 25 degrees for min_turn_limit is probably OK (would be 22.5 by the above definition), + * but maybe the rest should be somewhat closer to 67.5-117.5-157.5 instead of 45-105-165. + * + * robotaxi: + * suggested limits derived from 'simple turn rules' in bugfix/enhancement #1095: + * 25-45-110-165. + * taken over from here: 25 (straight limit) and 165 (u-turn-limit used for very strong turn) + */ + +/** Minimum absolute delta for a turn of "normal" strength (which is always just announced as "turn left/right" even when strength is required). + * Maneuvers whose absolute delta is less than this will be announced as "turn easily left/right" when strength is required. */ +static int turn_2_limit = 45; + +/** Minimum absolute delta for a sharp turn. + * Maneuvers whose absolute delta is equal to or greater than this will be announced as "turn sharply left/right" when strength is required. */ +static int sharp_turn_limit = 110; + +/** Minimum absolute delta for a U turn. + * Maneuvers whose absolute delta is less than this (but at least {@code min_turn_limit}) will always be announced as turns. + * Note that, depending on other conditions, even maneuvers whose delta exceeds the threshold may still be announced as (sharp) turns. */ +static int u_turn_limit = 165; + +enum gender {unknown, masculine, feminine, neuter}; struct suffix { char *fullname; char *abbrev; - int sex; + int gender; } suffixes[]= { - {"weg",NULL,1}, - {"platz","pl.",1}, - {"ring",NULL,1}, - {"allee",NULL,2}, - {"gasse",NULL,2}, - {"straße","str.",2}, - {"strasse",NULL,2}, + {"weg", NULL, masculine}, +/* {"platz", "pl.", masculine}, collides with Lithuanian "plentas" (which is more frequent) */ + {"platz", NULL, masculine}, + {"ring", NULL, masculine}, + {"bogen", NULL, masculine}, + {"allee", NULL, feminine}, + {"gasse", NULL, feminine}, + {"straße", "str.", feminine}, + + /* some for the dutch lang. */ + {"straat", NULL, neuter}, +/* {"weg", NULL, neuter}, doubles-up with German */ + {"baan", NULL, neuter}, + {"laan", NULL, neuter}, + {"wegel", NULL, neuter}, + + /* some for the english lang. */ + {"street", NULL, masculine}, + {"drive", NULL, masculine}, + + /* some for Lithuanian, as per http://wiki.openstreetmap.org/wiki/WikiProject_Lithuania */ + {"gatvė", "g.", feminine}, + {"plentas", "pl.", masculine}, + {"prospektas", "pr.", masculine}, + {"alėja", "al.", feminine}, + {"skersgatvis", "skg.", masculine}, + {"aikštė", "a.", feminine}, + }; + struct navigation { NAVIT_OBJECT struct route *route; @@ -92,24 +196,165 @@ struct navigation { int distances[]={1,2,3,4,5,10,25,50,75,100,150,200,250,300,400,500,750,-1}; +/* Allowed values for navigation_maneuver.merge_or_exit + * The numeric values are chosen in such a way that they can be interpreted as flags: + * 1=merge, 2=exit, 4=interchange, 8=right, 16=left + * Identifiers were chosen over flags to enforce certain rules + * (merge/exit/interchange and left/right are mutually exclusive, left/right requires merge or exit). */ + +/** Not merging into or exiting from a motorway_like road */ +#define mex_none 0 + +/** Merging into a motorway-like road, direction undefined. + * This value is not intended to be set directly but can be used for + * comparisons, e.g. {@code merge_or_exit & mex_merge}. */ +#define mex_merge 1 + +/** Exiting from a motorway-like road, direction undefined. + * This should only be used for ramps leading to a non-motorway road. + * For interchanges, use {@code mex_interchange} instead. + * This value is not intended to be set directly but can be used for + * comparisons, e.g. {@code merge_or_exit & mex_exit}. */ +#define mex_exit 2 + +/** Motorway-like road splits in two. + * This should be used for all cases in which ramps lead to another motorway-like road. */ +#define mex_interchange 4 + +/** Merging into a motorway-like road to the right (coming from the left) */ +#define mex_merge_right 9 + +/** Exiting from a motorway-like road to the right. + * See {@code mex_exit} for usage. */ +#define mex_exit_right 10 + +/** Merging into a motorway-like road to the left (coming from the right) */ +#define mex_merge_left 17 + +/** Exiting from a motorway-like road to the left. + * See {@code mex_exit} for usage. */ +#define mex_exit_left 18 + +/** + * @brief Holds information about a navigation maneuver. + * + * This structure is populated when a navigation maneuver is first analyzed. Its members contain all information + * needed to decide whether or not to announce the maneuver, what type of maneuver it is and the information that + * was used to determine the former two. + */ +struct navigation_maneuver { + enum item_type type; /**< The type of maneuver to perform. Any {@code nav_*} item is permitted here, with one exception: + merge or exit maneuvers are indicated by the {@code merge_or_exit} member. The {@code item_type} + for such maneuvers should be a turn instruction in cases where the maneuver is ambiguous, or + {@code nav_none} for cases in which we would expect the driver to perform this maneuver even + without being instructed to do so. **/ + int delta; /**< Bearing difference (the angle the driver has to steer) for the maneuver */ + int merge_or_exit; /**< Whether we are merging into or exiting from a motorway_like road or we are at an interchange */ + int is_complex_t_junction; /**< Whether we are coming from the "stem" of a T junction whose "bar" is a dual-carriageway road and + crossing the opposite lane of the "bar" first (i.e. turning left in countries that drive on the + right, or turning right in countries that drive on the left). For these maneuvers + {@code num_options} is 1 (which means we normally wouldn't announce the maneuver) but drivers + would expect an announcement in such cases. */ + int num_options; /**< Number of permitted candidate ways, i.e. ways which we may enter (based on access flags of the + way but without considering turn restrictions). Permitted candidate ways include the route. */ + int num_new_motorways; /**< Number of permitted candidate ways that are motorway-like. + Numbers greater then one should be interpreted as "more than one", not as a precise number. */ + int num_other_ways; /**< Number of permitted candidate ways that are neither ramps nor motorway-like */ + int old_cat; /**< Maneuver category of the way leading to the maneuver */ + int new_cat; /**< Maneuver category of the selected way after the maneuver */ + int max_cat; /**< Highest maneuver category of any permitted candidate way other than the route */ + int num_similar_ways; /**< Number of candidate ways (including the route) that have a {@code maneuver_category()} similar + to {@code old_cat}. See {@code maneuver_required2()} for definition of "similar". */ + int left; /**< Minimum bearing delta of any candidate way left of the route, -180 for none */ + int right; /**< Minimum bearing delta of any candidate way right of the route, 180 for none */ + int is_unambiguous; /**< Whether the maneuver is unambiguous. A maneuver is unambiguous if, despite + multiple candidate way being available, we can reasonable expect the driver to + continue on the route without being told to do so. This is typically the case when + the route stays on the main road and goes straight, while all other candidate ways + are minor roads and involve a significant turn. */ + int is_same_street; /**< Whether the street keeps its name after the maneuver. */ +}; + +/** + * @brief Holds information about a command for a navigation maneuver. + * + * An instance of this structure is generated for each navigation maneuver that is to be announced. + */ struct navigation_command { - struct navigation_itm *itm; - struct navigation_command *next; - struct navigation_command *prev; - int delta; - int roundabout_delta; + struct navigation_itm *itm; /**< The navigation item following the maneuver */ + struct navigation_command *next; /**< next command in the list */ + struct navigation_command *prev; /**< previous command in the list */ + int delta; /**< bearing change at maneuver */ + int roundabout_delta; /**< if we are leaving a roundabout, effective bearing change (between entry and exit) with some corrections applied */ + int length; /**< if the maneuver is a roundabout, distance between entry and exit (plus penalty), else 0 */ + struct navigation_maneuver *maneuver; /**< Details on the maneuver to perform */ +}; + +/* + * @brief Holds a way that one could possibly drive from a navigation item + * + */ +struct navigation_way { + struct navigation_way *next; /**< Pointer to a linked-list of all navigation_ways from this navigation item */ + short dir; /**< The direction -1 or 1 of the way */ + short angle2; /**< The bearing at the start or the way (0 = north, 90 =east etc.) */ + int flags; /**< The flags of the way */ + struct item item; /**< The item of the way */ + char *name; /**< The street name ({@code street_name} attribute) */ + char *name_systematic; /**< The road number ({@code street_name_systematic} attribute, OSM: {@code ref}) */ + char *exit_ref; /**< Exit_ref if found on the first node of the way*/ + char *exit_label; /**< Exit_label if found on the first node of the way*/ + struct street_destination *destination; /**< The destination this way leads to (OSM: {@code destination}) */ +}; + +struct navigation_itm { + struct navigation_way way; + int angle_end; /**< The bearing at the end of {@code way} */ + struct coord start,end; + int time; int length; + int speed; + int dest_time; + int dest_length; + int told; /**< Indicates if this item's announcement has been told earlier and should not be told again*/ + int streetname_told; /**< Indicates if this item's streetname has been told in speech navigation*/ + int dest_count; + struct navigation_itm *next; + struct navigation_itm *prev; }; + +/** + * @brief A linked list containing the destination of the road + * + * Holds the destination info from the road, that is the place + * you drive to if you keep following the road as found on + * traffic sign's (ex. Paris, Senlis ...) + */ +struct street_destination { + struct street_destination *next; + char *destination; + int rank; +}; + + + static void navigation_flush(struct navigation *this_); /** * @brief Calculates the delta between two angles + * + * The return value is to be interpreted as follows: + * <ul> + * <li>-179..-1: {@code angle2} is left of {@code angle1}</li> + * <li>0: Both angles are identical</li> + * <li>1..179: {@code angle2} is right of {@code angle1}</li> + * <li>180: {@code angle1} is opposite of {@code angle2}</li> + * </ul> * @param angle1 The first angle * @param angle2 The second angle - * @return The difference between the angles: -179..-1=angle2 is left of angle1,0=same,1..179=angle2 is right of angle1,180=angle1 is opposite of angle2 + * @return The difference between the angles, see description */ - static int angle_delta(int angle1, int angle2) { @@ -139,6 +384,297 @@ angle_opposite(int angle) return ((angle+180)%360); } + +/** + * @brief Checks if two navigation items are on the same street + * + * This function checks if two navigation items are on the same street. It returns + * true if either their name or their "systematic name" (e.g. "A6" or "B256") are the + * same. + * + * @param old_name The name of the first item to be checked + * @param old_name_systematic The systematic name of the first item to be checked + * @param new_name The name of the second item to be checked + * @param new_name_systematic The systematic name of the second item to be checked + * @return True if both old and new are on the same street + */ +static int +is_same_street2(char *old_name, char *old_name_systematic, char *new_name, char *new_name_systematic) +{ + if (old_name && new_name && !strcmp(old_name, new_name)) { + dbg(lvl_debug,"is_same_street: '%s' '%s' vs '%s' '%s' yes (1.)\n", old_name_systematic, new_name_systematic, old_name, new_name); + return 1; + } + if (old_name_systematic && new_name_systematic && !strcmp(old_name_systematic, new_name_systematic)) { + dbg(lvl_debug,"is_same_street: '%s' '%s' vs '%s' '%s' yes (2.)\n", old_name_systematic, new_name_systematic, old_name, new_name); + return 1; + } + dbg(lvl_debug,"is_same_street: '%s' '%s' vs '%s' '%s' no\n", old_name_systematic, new_name_systematic, old_name, new_name); + return 0; +} + + +/** + * @brief Checks if two ways are identical + * + * This function checks if two {@code navigation_way}s are likely to represent the same way on the ground. + * It does this by comparing the {@code name}, {@code name_systematic}, {@code angle2} and {@code item.type} + * members of both ways and returning {@code true} if all of them match. + * + * Names are compared by calling {@code is_same_street()}. + * + * ID attributes (such as OSM IDs) are not used for comparison, which allows the function to handle even + * overlapping maps for the same area created from different versions of OSM data, in which IDs may have + * changed as a result of ways being merged or split. As long as the above attributes match, the ways will + * still be considered equal. + * + * Note that way geometry (other than {@code angle2}) is not compared. If necessary, the caller needs to + * make geometry-related comparisons separately. + */ +static int +is_same_way(struct navigation_way * w1, struct navigation_way * w2) { + if (!is_same_street2(w1->name, w1->name_systematic, w2->name, w2->name_systematic)) + return 0; + if ((w1->angle2 == w2->angle2) && (w1->item.type == w2->item.type)) + return 1; + else + return 0; +} + + +/** + * @brief Frees a list as constructed with split_string_to_list() + * + * @param list the list to be freed + */ +static void +free_list(struct street_destination *list) { + + if (list){ + struct street_destination *clist; + while (list){ + clist = list->next; + g_free(list->destination); + g_free(list); + list = clist; + } + list = NULL; + } +} + +/** + * @brief Splits a string into a list, and sets their initial rank to 0 + * + * The separator to split on can be any character. Preceding whitespace + * characters will be removed. + * + * @param way a navigation_way holding the list to be filled up + * @param raw_string a string to split + * @param sep a char to be used as separator to split the raw_string + * @return the number of entries in the list + */ +static int +split_string_to_list(struct navigation_way *way, char* raw_string, char sep) +{ + + struct street_destination *new_street_destination = NULL; + struct street_destination *next_street_destination_remember = NULL; + char *pos1 = raw_string; + char *pos2; + int count = 0; + + free_list(way->destination); /*in case this is a retry with a different separator.*/ + dbg(lvl_debug,"raw_string=%s split with %c\n",raw_string, sep); + if (strlen(raw_string)>0) + { + count = 1; + while (pos1) + { + new_street_destination = g_new(struct street_destination, 1); + new_street_destination->next = next_street_destination_remember; + next_street_destination_remember = new_street_destination ; + if ((pos2 = strrchr(pos1, sep)) != NULL) + { + *pos2 = '\0' ; + while (isspace(pos2[1])) + pos2++; + new_street_destination->destination = g_strdup(pos2+1); + new_street_destination->rank=0; + dbg(lvl_debug,"splitted_off_string=%s\n",new_street_destination->destination); + count++; + } + else + { + while (isspace(pos1[0])) + pos1++; + new_street_destination->destination = g_strdup(pos1); + new_street_destination->rank=0; + pos1 = NULL; + dbg(lvl_debug,"head_of_string=%s\n",new_street_destination->destination); + } + way->destination = next_street_destination_remember; + } + } + return count; +} + + + +/** + * @brief Returns the first destination with a rank higher than zero. + * + * If all items in the list have a zero rank, the first one will be returned. + */ +static struct street_destination * +get_bestranked(struct street_destination *street_destination) +{ + struct street_destination *selected_street_destination; + + selected_street_destination = street_destination; + while (selected_street_destination) + { + if (selected_street_destination->rank > 0) + return selected_street_destination; + selected_street_destination = selected_street_destination->next; + } + return street_destination; +} + +/** + * @brief Assigns a high rank to a matching destination in the next + * command having destination info, and reset existing ranks to zero + * + * @param street destination to be given a high rank + * @param command + * @return 1 if successful, zero otherwise + */ +static int +set_highrank(struct street_destination *street_destination, struct navigation_command *command) +{ + struct street_destination *future_street_destination = NULL; + struct navigation_command *next_command; + char* destination_string; + int success = 0; + destination_string = street_destination->destination; + + if (command->next) + { + next_command=command->next; + while (next_command) + { + if (next_command->itm->way.destination) + break; + if (!next_command->next) + break; + next_command=next_command->next; + } + if (next_command->itm->way.destination) + future_street_destination = next_command->itm->way.destination; + else future_street_destination = NULL; + } + + while (future_street_destination) + { + if ((strcmp(destination_string,future_street_destination->destination)==0)) + { + future_street_destination->rank=99; + success =1; + } + else + future_street_destination->rank=0; + future_street_destination=future_street_destination->next; + } + return success; +} + + +/** @brief Selects the destination-names for the next announcement from the + * destination-names that are registered in the following command items. + * + * The aim of this function is to find the destination-name entry that has the most hits in the following + * command items so that the destination name has a relevance over several announcements. If there is no 'winner' + * the entry is selected that is at top of the destination. + */ +static char* +select_announced_destinations(struct navigation_command *current_command) +{ + struct street_destination *current_destination = NULL; /* the list pointer of the destination_names of the current command. */ + struct street_destination *search_destination = NULL; /* the list pointer of the destination_names of the respective search_command. */ + + struct navigation_command *search_command = NULL; + + #define MAX_LOOPS 10 /* limits the number of next command items to investigate over */ + #define MAX_DESTINATIONS 10 /* limits the number of destination entries to investigate */ + int destination_count[MAX_DESTINATIONS]; /* contains the hits of identical destinations over all */ + /* investigated command items - a 'high score' of destination names */ + int destination_index = 0; + int search_command_counter = 0; + int i, max_hits=0, max_hit_index; + + /* search over every following command for seeking identical destination_names */ + if (current_command->itm->way.destination) + { /* can we investigate over the following commands? */ + if (current_command->next) + { /* loop over every destination of the current command, as far as there are not more than MAX_DESTINATIONS entries. */ + destination_index = 0; /* start with the first destination */ + current_destination = current_command->itm->way.destination; + while (current_destination && (destination_index < MAX_DESTINATIONS)) + { /* initialize the search command */ + search_command = current_command->next; + search_command_counter = 0; + destination_count[destination_index]=0; + while (search_command && (search_command_counter < MAX_LOOPS)) + { + if (search_command->itm && search_command->itm->way.destination) + { /* has the search command any destinations ? */ + search_destination = search_command->itm->way.destination; + while (search_destination) + { /* Search this name in the destination list of the current command. */ + if (0 == strcmp(current_destination->destination, search_destination->destination)) + { /* enter the destination_name in the investigation list*/ + destination_count[destination_index]++; + search_destination = NULL; /* break condition */ + } + else search_destination = search_destination->next; + } + } + search_command_counter++; + search_command = search_command->next; + } + destination_index++; + current_destination = current_destination->next; + } + + /* search for the best candidate */ + max_hits = 0; + max_hit_index = 0; + for (i = 0; i < destination_index; i++) + { + if (destination_count[i] > max_hits) + { + max_hits = destination_count[i]; + max_hit_index = i; + } + } + /* jump to the corresponding destination_name */ + current_destination = current_command->itm->way.destination; + for (i = 0; i < max_hit_index; i++) + { + current_destination = current_destination->next; + } + + dbg(lvl_debug,"%s, max hits =%i\n",current_destination->destination,max_hits); + set_highrank(current_destination,current_command); + } + } + + /* return the best candidate, if there is any.*/ + if (max_hits) + return g_strdup(current_destination->destination); + return g_strdup(current_destination ? get_bestranked(current_destination)->destination:NULL); +} + + int navigation_get_attr(struct navigation *this_, enum attr_type type, struct attr *attr, struct attr_iter *iter) { @@ -154,6 +690,8 @@ navigation_get_attr(struct navigation *this_, enum attr_type type, struct attr * case attr_navigation_speech: case attr_street_name: case attr_street_name_systematic: + case attr_street_destination: + mr=map_rect_new(this_->map, NULL); while ((item=map_rect_get_item(mr))) { if (item->type != type_nav_none && item->type != type_nav_position) { @@ -256,7 +794,10 @@ navigation_get_announce_level(struct navigation *this_, enum item_type type, int int i; if (type < route_item_first || type > route_item_last) + { + dbg(lvl_error," item outside routable range\n"); return -1; + } for (i = 0 ; i < 3 ; i++) { if (dist <= this_->announce[type-route_item_first][i]) return i; @@ -264,36 +805,6 @@ navigation_get_announce_level(struct navigation *this_, enum item_type type, int return i; } - -/** - * @brief Holds a way that one could possibly drive from a navigation item - */ -struct navigation_way { - struct navigation_way *next; /**< Pointer to a linked-list of all navigation_ways from this navigation item */ - short dir; /**< The direction -1 or 1 of the way */ - short angle2; /**< The angle one has to steer to drive from the old item to this street */ - int flags; /**< The flags of the way */ - struct item item; /**< The item of the way */ - char *name1; - char *name2; -}; - -struct navigation_itm { - struct navigation_way way; - int angle_end; - struct coord start,end; - int time; - int length; /**< Length of {@code way} */ - int speed; - int dest_time; - int dest_length; - int told; /**< Indicates if this item's announcement has been told earlier and should not be told again*/ - int streetname_told; /**< Indicates if this item's streetname has been told in speech navigation*/ - int dest_count; - struct navigation_itm *next; - struct navigation_itm *prev; -}; - static int is_way_allowed(struct navigation *nav, struct navigation_way *way, int mode); static int @@ -309,6 +820,15 @@ navigation_get_announce_level_cmd(struct navigation *this_, struct navigation_it } /* 0=N,90=E */ +/** + * @brief Gets the bearing from one point to another + * + * @param c1 The first coordinate + * @param c2 The second coordinate + * @param dir The direction: if it is -1, the bearing from c2 to c1 is returned, else the bearing from c1 to c2 + * + * @return The bearing in degrees, {@code 0 <= result < 360}. + */ static int road_angle(struct coord *c1, struct coord *c2, int dir) { @@ -323,7 +843,7 @@ static const char switch (n) { case 0: /* TRANSLATORS: the following counts refer to streets */ - return _("zeroth"); // Not sure if this exists, neither if it will ever be needed + return _("zeroth"); /* Not sure if this exists, neither if it will ever be needed */ case 1: return _("first"); case 2: @@ -347,7 +867,7 @@ static const char switch (n) { case 0: /* TRANSLATORS: the following counts refer to roundabout exits */ - return _("zeroth exit"); // Not sure if this exists, neither if it will ever be needed + return _("zeroth exit"); /* Not sure if this exists, neither if it will ever be needed */ case 1: return _("first exit"); case 2: @@ -364,6 +884,7 @@ static const char return NULL; } } + static int round_distance(int dist) { @@ -499,69 +1020,70 @@ get_distance(struct navigation *nav, int dist, enum attr_type type, int is_lengt /** - * @brief This calculates the angle with which an item starts or ends + * @brief Initializes a navigation_way * - * This function can be used to get the angle an item (from a route graph map) - * starts or ends with. Note that the angle will point towards the inner of - * the item. + * This function analyzes the underlying map item and sets the entry bearing, names and flags for the way. * - * This is meant to be used with items from a route graph map - * With other items this will probably not be optimal... + * Note that entry bearing is expressed as bearing towards the opposite end of the item. * - * @param w The way which should be calculated - */ + * Note that this function is not suitable for ways on the route (created in {@code navigation_itm_new}) + * as it may return incorrect coordinates for these ways. + * + * @param w The way to initialize. The {@code item}, {@code id_hi}, {@code id_lo} and {@code dir} + * members of this struct must be set prior to calling this function. + */ static void -calculate_angle(struct navigation_way *w) +navigation_way_init(struct navigation_way *w) { struct coord cbuf[2]; - struct item *ritem; // the "real" item + struct item *realitem; struct coord c; struct map_rect *mr; struct attr attr; - w->angle2=361; + w->angle2 = invalid_angle; mr = map_rect_new(w->item.map, NULL); if (!mr) return; - ritem = map_rect_get_item_byid(mr, w->item.id_hi, w->item.id_lo); - if (!ritem) { + realitem = map_rect_get_item_byid(mr, w->item.id_hi, w->item.id_lo); + if (!realitem) { dbg(lvl_warning,"Item from segment not found on map!\n"); map_rect_destroy(mr); return; } - if (ritem->type < type_line || ritem->type >= type_area) { + if (realitem->type < type_line || realitem->type >= type_area) { map_rect_destroy(mr); return; } - if (item_attr_get(ritem, attr_flags, &attr)) + if (item_attr_get(realitem, attr_flags, &attr)) w->flags=attr.u.num; else w->flags=0; - if (item_attr_get(ritem, attr_street_name, &attr)) - w->name1=map_convert_string(ritem->map,attr.u.str); + if (item_attr_get(realitem, attr_street_name, &attr)) + w->name=map_convert_string(realitem->map,attr.u.str); else - w->name1=NULL; - if (item_attr_get(ritem, attr_street_name_systematic, &attr)) - w->name2=map_convert_string(ritem->map,attr.u.str); + w->name=NULL; + if (item_attr_get(realitem, attr_street_name_systematic, &attr)) + w->name_systematic=map_convert_string(realitem->map,attr.u.str); else - w->name2=NULL; + w->name_systematic=NULL; if (w->dir < 0) { - if (item_coord_get(ritem, cbuf, 2) != 2) { + if (item_coord_get(realitem, cbuf, 2) != 2) { dbg(lvl_warning,"Using calculate_angle() with a less-than-two-coords-item?\n"); map_rect_destroy(mr); return; } - while (item_coord_get(ritem, &c, 1)) { + while (item_coord_get(realitem, &c, 1)) { cbuf[0] = cbuf[1]; cbuf[1] = c; } } else { - if (item_coord_get(ritem, cbuf, 2) != 2) { + if (item_coord_get(realitem, cbuf, 2) != 2) { dbg(lvl_warning,"Using calculate_angle() with a less-than-two-coords-item?\n"); map_rect_destroy(mr); return; @@ -576,6 +1098,265 @@ calculate_angle(struct navigation_way *w) w->angle2=road_angle(&cbuf[1],&cbuf[0],0); } + +#if 0 +// /home/michael/src/navit/navit/navit/navigation.c:1039:1: warning: ‘navigation_way_get_exit_angle’ defined but not used [-Wunused-function] +/** + * @brief Returns the bearing at the end of a way + * + * @param w The way to examine + * + * @return The bearing, {@code 0 <= bearing < 360}. + */ +static int +navigation_way_get_exit_angle(struct navigation_way *w) { + int ret = invalid_angle; + struct coord cbuf[2]; + struct item *realitem; + struct coord c; + struct map_rect *mr; + + mr = map_rect_new(w->item.map, NULL); + if (!mr) + return ret; + + realitem = map_rect_get_item_byid(mr, w->item.id_hi, w->item.id_lo); + if (!realitem) { + dbg(lvl_warning,"Item from segment not found on map!\n"); + map_rect_destroy(mr); + return ret; + } + + if (realitem->type < type_line || realitem->type >= type_area) { + map_rect_destroy(mr); + return ret; + } + + if (w->dir < 0) { + if (item_coord_get(realitem, cbuf, 2) != 2) { + dbg(lvl_warning,"Using calculate_angle() with a less-than-two-coords-item?\n"); + map_rect_destroy(mr); + return ret; + } + c = cbuf[0]; + cbuf[0] = cbuf[1]; + cbuf[1] = c; + } + else { + if (item_coord_get(realitem, cbuf, 2) != 2) { + dbg(lvl_warning,"Using calculate_angle() with a less-than-two-coords-item?\n"); + map_rect_destroy(mr); + return ret; + } + + while (item_coord_get(realitem, &c, 1)) { + cbuf[0] = cbuf[1]; + cbuf[1] = c; + } + } + + map_rect_destroy(mr); + + ret = road_angle(&cbuf[1],&cbuf[0],0); + + return ret; +} +#endif + + +#if 0 +// /home/michael/src/navit/navit/navit/navigation.c:1110:1: warning: ‘navigation_way_get_angle_at’ defined but not used [-Wunused-function] +/** + * @brief Returns the bearing of a way at a given distance from its start + * + * {@code invalid_angle} will be returned if one of the following errors occurs: + * <ul> + * <li>The item is not found on the map</li> + * <li>The item is not of the correct type</li> + * <li>The item is shorter than {@code distance}</li> + * </ul> + * + * @param pro The projection used by the map + * @param w The way to examine + * @param dist The distance from the start of the way at which to determine bearing + * + * @return The bearing, {@code 0 <= bearing < 360}, or {@code invalid_angle} if an error occurred. + */ +static int +navigation_way_get_angle_at(struct navigation_way *w, enum projection pro, double dist) { + double dist_left = dist; /* distance from last examined point */ + int ret = invalid_angle; + struct coord cbuf[2]; + struct item *realitem; + struct coord c; + struct map_rect *mr; + + mr = map_rect_new(w->item.map, NULL); + if (!mr) + return ret; + + realitem = map_rect_get_item_byid(mr, w->item.id_hi, w->item.id_lo); + if (!realitem) { + dbg(lvl_warning,"Item from segment not found on map!\n"); + map_rect_destroy(mr); + return ret; + } + + if (realitem->type < type_line || realitem->type >= type_area) { + map_rect_destroy(mr); + return ret; + } + + if (item_coord_get(realitem, &cbuf[1], 1) != 1) { + dbg(lvl_warning,"item has no coords\n"); + map_rect_destroy(mr); + return ret; + } + + if (w->dir < 0) { + /* we're going against the direction of the item: + * measure its total length and set distance_left to difference of total length and distance */ + dist_left = 0; + while (item_coord_get(realitem, &c, 1)) { + cbuf[0] = cbuf[1]; + cbuf[1] = c; + dist_left += transform_distance(pro, &cbuf[0], &cbuf[1]); + } + + // FIXME: dist_left is now the complete length - subtract dist + + item_coord_rewind(realitem); + + if (item_coord_get(realitem, &cbuf[1], 1) != 1) { + dbg(lvl_warning,"item has no more coords after rewind\n"); + map_rect_destroy(mr); + return ret; + } + } + + while (item_coord_get(realitem, &c, 1)) { + cbuf[0] = cbuf[1]; + cbuf[1] = c; + dist_left -= transform_distance(pro, &cbuf[0], &cbuf[1]); + if (dist_left <= 0) { + ret = road_angle(&cbuf[0], &cbuf[1], w->dir); + map_rect_destroy(mr); + return ret; + } + } + + map_rect_destroy(mr); + return ret; +} +#endif + + +/** + * @brief Returns the maximum delta between a reference bearing and any segment of a given way, up to a given distance from its start + * + * The return value is the maximum delta (in terms of absolute value), but the sign is preserved. If the maximum delta is encountered + * more than once but with different signs, {@code dir} controls which of the two values is returned: + * <ul> + * <li>+1: Return the first maximum encountered when following the direction of the route</li> + * <li>-1: Return the first maximum encountered when going against the direction of the route</li> + * </ul> + * + * {@code invalid_angle} will be returned if one of the following errors occurs: + * <ul> + * <li>The item is not found on the map</li> + * <li>The item is not of the correct type</li> + * <li>The item has fewer than 2 points</li> + * <li>{@code dist} is zero</li> + * </ul> + * + * If {@code dist} exceeds the length of the way, the entire way is examined. + * + * @param pro The projection used by the map + * @param w The way to examine + * @param angle The reference bearing + * @param dist The distance from the start of the way at which to determine bearing + * @param dir Controls how to handle when the same delta is encountered multiple times but with different signs, + * permissible values are either -1 or +1 + * + * @return The delta, {@code -180 < delta <= 180}, or {@code invalid_angle} if an error occurred. + */ +static int +navigation_way_get_max_delta(struct navigation_way *w, enum projection pro, int angle, double dist, int dir) { + double dist_left = dist; /* distance from last examined point */ + int ret = invalid_angle; + int tmp_delta; + int eff_dir = dir * w->dir; /* effective direction: +1 to examine section from start of way, -1 from end of way */ + struct coord cbuf[2]; + struct item *realitem; + struct coord c; + struct map_rect *mr; + + mr = map_rect_new(w->item.map, NULL); + if (!mr) + return ret; + + realitem = map_rect_get_item_byid(mr, w->item.id_hi, w->item.id_lo); + if (!realitem) { + dbg(lvl_warning,"Item from segment not found on map!\n"); + map_rect_destroy(mr); + return ret; + } + + if (realitem->type < type_line || realitem->type >= type_area) { + map_rect_destroy(mr); + return ret; + } + + if (item_coord_get(realitem, &cbuf[1], 1) != 1) { + dbg(lvl_warning,"item has no coords\n"); + map_rect_destroy(mr); + return ret; + } + + if (eff_dir < 0) { + /* we're going against the direction of the item: + * measure its total length and set dist_left to difference of total length and distance */ + dist_left = 0; + while (item_coord_get(realitem, &c, 1)) { + cbuf[0] = cbuf[1]; + cbuf[1] = c; + dist_left += transform_distance(pro, &cbuf[0], &cbuf[1]); + } + + /* if dist is less that the distance of the way, make dist_left the distance from the other end + * else set it to zero (so we'll examine the whole way) */ + if (dist_left > dist) + dist_left -= dist; + else + dist_left = 0; + + item_coord_rewind(realitem); + + if (item_coord_get(realitem, &cbuf[1], 1) != 1) { + dbg(lvl_warning,"item has no more coords after rewind\n"); + map_rect_destroy(mr); + return ret; + } + } + + while (item_coord_get(realitem, &c, 1)) { + if ((eff_dir > 0) && (dist_left <= 0)) + break; + cbuf[0] = cbuf[1]; + cbuf[1] = c; + dist_left -= transform_distance(pro, &cbuf[0], &cbuf[1]); + if ((eff_dir < 0) && (dist_left > 0)) + continue; + tmp_delta = angle_delta(angle, road_angle(&cbuf[0], &cbuf[1], w->dir)); + if ((ret == invalid_angle) || (abs(ret) < abs(tmp_delta)) || ((abs(ret) == abs(tmp_delta)) && (eff_dir < 0))) + ret = tmp_delta; + } + + map_rect_destroy(mr); + return ret; +} + + /** * @brief Returns the time (in seconds) one will drive between two navigation items * @@ -623,8 +1404,8 @@ navigation_itm_ways_clear(struct navigation_itm *itm) c = itm->way.next; while (c) { n = c->next; - map_convert_free(c->name1); - map_convert_free(c->name2); + map_convert_free(c->name); + map_convert_free(c->name_systematic); g_free(c); c = n; } @@ -645,23 +1426,25 @@ static void navigation_itm_ways_update(struct navigation_itm *itm, struct map *graph_map) { struct map_selection coord_sel; - struct map_rect *g_rect; // Contains a map rectangle from the route graph's map + struct map_rect *g_rect; /* Contains a map rectangle from the route graph's map */ struct item *i,*sitem; struct attr sitem_attr,direction_attr; - struct navigation_way *w,*l; + struct navigation_way *w, *l, *h; + + dbg(lvl_debug, "entering for item: %s %s %s\n", item_to_name(itm->way.item.type), itm->way.name_systematic, itm->way.name); navigation_itm_ways_clear(itm); - // These values cause the code in route.c to get us only the route graph point and connected segments + /* These values cause the code in route.c to get us only the route graph point and connected segments */ coord_sel.next = NULL; coord_sel.u.c_rect.lu = itm->start; coord_sel.u.c_rect.rl = itm->start; - // the selection's order is ignored + /* the selection's order is ignored */ g_rect = map_rect_new(graph_map, &coord_sel); i = map_rect_get_item(g_rect); - if (!i || i->type != type_rg_point) { // probably offroad? + if (!i || i->type != type_rg_point) { /* probably offroad? */ map_rect_destroy(g_rect); return ; } @@ -697,11 +1480,24 @@ navigation_itm_ways_update(struct navigation_itm *itm, struct map *graph_map) } l = w; - w = g_new(struct navigation_way, 1); + w = g_new0(struct navigation_way, 1); w->dir = direction_attr.u.num; w->item = *sitem; w->next = l; - calculate_angle(w); + navigation_way_init(w); /* calculate and set w->angle2 */ + + dbg(lvl_debug, "- retrieved way: %s %s %s\n", item_to_name(w->item.type), w->name_systematic, w->name); + + /* check if w is already in the list */ + h = l; + while (h) { + if (is_same_way(w, h)) { + g_free(w); + w = l; + dbg(lvl_debug, " - way is already in list, discarding\n"); + } + h = h->next; + } } map_rect_destroy(g_rect); @@ -709,6 +1505,17 @@ navigation_itm_ways_update(struct navigation_itm *itm, struct map *graph_map) itm->way.next = w; } +/** + * @brief Destroys navigation items associated with a navigation object. + * + * This function destroys all or some of the {@code navigation_itm} instances associated with + * {@code this_}, starting with the first one. Data structures associated with the items will + * also be freed. + * + * @param this_ The navigation object whose command instances are to be destroyed + * @param end The first navigation item to keep. If it is NULL or not found in the list, all items + * will be destroyed. + */ static void navigation_destroy_itms_cmds(struct navigation *this_, struct navigation_itm *end) { @@ -730,10 +1537,16 @@ navigation_destroy_itms_cmds(struct navigation *this_, struct navigation_itm *en if (cmd->next) { cmd->next->prev = NULL; } + if (cmd->maneuver) + g_free(cmd->maneuver); g_free(cmd); } - map_convert_free(itm->way.name1); - map_convert_free(itm->way.name2); + + map_convert_free(itm->way.name); + map_convert_free(itm->way.name_systematic); + map_convert_free(itm->way.exit_ref); + map_convert_free(itm->way.exit_label); + free_list(itm->way.destination); navigation_itm_ways_clear(itm); g_free(itm); } @@ -769,127 +1582,204 @@ navigation_itm_update(struct navigation_itm *itm, struct item *ritem) } /** - * @brief This check if an item is part of a roundabout + * @brief Creates and adds a new navigation_itm to a linked list of such * - * @param itm The item to be checked - * @return True if the item is part of a roundabout - */ -static int -check_roundabout(struct navigation_itm *itm, struct map *graph_map) -{ - struct map_selection coord_sel; - struct map_rect *g_rect; // Contains a map rectangle from the route graph's map - struct item *i,*sitem; - struct attr sitem_attr,flags_attr; - - // These values cause the code in route.c to get us only the route graph point and connected segments - coord_sel.next = NULL; - coord_sel.u.c_rect.lu = itm->start; - coord_sel.u.c_rect.rl = itm->start; - // the selection's order is ignored - - g_rect = map_rect_new(graph_map, &coord_sel); - - i = map_rect_get_item(g_rect); - if (!i || i->type != type_rg_point) { // probably offroad? - map_rect_destroy(g_rect); - return 0; - } - - while (1) { - i = map_rect_get_item(g_rect); - - if (!i) { - break; - } - - if (i->type != type_rg_segment) { - continue; - } - - if (!item_attr_get(i,attr_street_item,&sitem_attr)) { - continue; - } - - sitem = sitem_attr.u.item; - if (item_is_equal(itm->way.item,*sitem)) { - if (item_attr_get(i,attr_flags,&flags_attr) && (flags_attr.u.num & AF_ROUNDABOUT)) { - map_rect_destroy(g_rect); - return 1; - } - } - } - - map_rect_destroy(g_rect); - return 0; -} - + * routeitem has an attr. streetitem, but that is only and id and a map, + * allowing to fetch the actual streetitem, that will live under the same name. + * + * @param this_ the navigation object + * @param routeitem the routeitem from which to create a navigation item + * @return the new navigation_itm (used nowhere) + */ static struct navigation_itm * -navigation_itm_new(struct navigation *this_, struct item *ritem) +navigation_itm_new(struct navigation *this_, struct item *routeitem) { struct navigation_itm *ret=g_new0(struct navigation_itm, 1); int i=0; - struct item *sitem; + struct item *streetitem; struct map *graph_map = NULL; struct attr street_item,direction,route_attr; struct map_rect *mr; struct attr attr; struct coord c[5]; + struct coord exitcoord; - if (ritem) { + if (routeitem) { ret->streetname_told=0; - if (! item_attr_get(ritem, attr_street_item, &street_item)) { + if (! item_attr_get(routeitem, attr_street_item, &street_item)) { dbg(lvl_warning, "no street item\n"); g_free(ret); ret = NULL; return ret; } - if (item_attr_get(ritem, attr_direction, &direction)) + + if (item_attr_get(routeitem, attr_direction, &direction)) ret->way.dir=direction.u.num; else ret->way.dir=0; - sitem=street_item.u.item; - ret->way.item=*sitem; - item_hash_insert(this_->hash, sitem, ret); - mr=map_rect_new(sitem->map, NULL); - if (! (sitem=map_rect_get_item_byid(mr, sitem->id_hi, sitem->id_lo))) { + streetitem=street_item.u.item; + ret->way.item=*streetitem; + item_hash_insert(this_->hash, streetitem, ret); + + mr=map_rect_new(streetitem->map, NULL); + + struct map *tmap = streetitem->map; + + if (! (streetitem=map_rect_get_item_byid(mr, streetitem->id_hi, streetitem->id_lo))) { g_free(ret); map_rect_destroy(mr); return NULL; } - if (item_attr_get(sitem, attr_street_name, &attr)) - ret->way.name1=map_convert_string(sitem->map,attr.u.str); - if (item_attr_get(sitem, attr_street_name_systematic, &attr)) - ret->way.name2=map_convert_string(sitem->map,attr.u.str); - navigation_itm_update(ret, ritem); - while (item_coord_get(ritem, &c[i], 1)) { - dbg(lvl_debug, "coord %d 0x%x 0x%x\n", i, c[i].x ,c[i].y); + if (item_attr_get(streetitem, attr_flags, &attr)) + ret->way.flags=attr.u.num; + + if (item_attr_get(streetitem, attr_street_name, &attr)) + ret->way.name=map_convert_string(streetitem->map,attr.u.str); - if (i < 4) + if (item_attr_get(streetitem, attr_street_name_systematic, &attr)) + ret->way.name_systematic=map_convert_string(streetitem->map,attr.u.str); + + if (ret->way.flags && (ret->way.flags & AF_ONEWAY)) + { + if (item_attr_get(streetitem, attr_street_destination, &attr)) + { + char *destination_raw; + destination_raw=map_convert_string(streetitem->map,attr.u.str); + dbg(lvl_debug,"destination_raw =%s\n",destination_raw); + split_string_to_list(&(ret->way),destination_raw, ';'); + g_free(destination_raw); + } + } + else + { + if (ret->way.dir == 1) + { + if (item_attr_get(streetitem, attr_street_destination_forward, &attr)) + { + char *destination_raw; + destination_raw=map_convert_string(streetitem->map,attr.u.str); + dbg(lvl_debug,"destination_raw forward =%s\n",destination_raw); + split_string_to_list(&(ret->way),destination_raw, ';'); + g_free(destination_raw); + } + + } + if (ret->way.dir == -1) + { + if (item_attr_get(streetitem, attr_street_destination_backward, &attr)) + { + char *destination_raw; + destination_raw=map_convert_string(streetitem->map,attr.u.str); + dbg(lvl_debug,"destination_raw backward =%s\n",destination_raw); + split_string_to_list(&(ret->way),destination_raw, ';'); + g_free(destination_raw); + } + } + } + + navigation_itm_update(ret, routeitem); + + + while (item_coord_get(routeitem, &c[i], 1)) + { + dbg(lvl_debug, "coord %d 0x%x 0x%x\n", i, c[i].x ,c[i].y); + if (i < 4) i++; - else { + else + { c[2]=c[3]; c[3]=c[4]; } } - dbg(lvl_debug,"count=%d\n", i); - i--; - - ret->way.angle2=road_angle(&c[0], &c[1], 0); - ret->angle_end=road_angle(&c[i-1], &c[i], 0); + i--; + if (i>=1) + { + ret->way.angle2=road_angle(&c[0], &c[1], 0); + ret->angle_end=road_angle(&c[i-1], &c[i], 0); + } ret->start=c[0]; ret->end=c[i]; - item_attr_get(ritem, attr_route, &route_attr); - graph_map = route_get_graph_map(route_attr.u.route); - if (check_roundabout(ret, graph_map)) { - ret->way.flags |= AF_ROUNDABOUT; + /* If we have a ramp, check the map for higway_exit info, + * but only on the first node of the ramp. + * We are doing the same for motorway-like roads because some + * interchanges use motorway types for the links between two + * motorways. + * Ramps with nodes in reverse order and oneway=-1 are not + * specifically handled, but no occurence known so far either. + * If present, obtain exit_ref, exit_label and exit_to + * from the map. + */ + if ( (streetitem->type == type_ramp) + || (streetitem->type == type_highway_land) + || (streetitem->type == type_highway_city) + || (streetitem->type == type_street_n_lanes)) { + struct map_selection mselexit; + struct item *rampitem; + dbg(lvl_debug,"test ramp\n"); + mselexit.next = NULL; + mselexit.u.c_rect.lu = c[0] ; + mselexit.u.c_rect.rl = c[0] ; + mselexit.range = item_range_all; + mselexit.order = 18; + + map_rect_destroy(mr); + mr = map_rect_new (tmap, &mselexit); + + while ((rampitem=map_rect_get_item(mr))) + { + if (rampitem->type == type_highway_exit && item_coord_get(rampitem, &exitcoord, 1) + && exitcoord.x == c[0].x && exitcoord.y == c[0].y) + { + while (item_attr_get(rampitem, attr_any, &attr)) + { + if (attr.type && attr.type == attr_label) + { + dbg(lvl_debug,"exit_label=%s\n",attr.u.str); + ret->way.exit_label= map_convert_string(streetitem->map,attr.u.str); + } + if (attr.type == attr_ref) + { + dbg(lvl_debug,"exit_ref=%s\n",attr.u.str); + ret->way.exit_ref= map_convert_string(streetitem->map,attr.u.str); + } + if (attr.type == attr_exit_to) + { + /* use exit_to as a fall back in case : + * - there is no regular destination info + * - we are not coming from a ramp already + */ + if (attr.u.str + && !ret->way.destination + && (ret->way.item.type == type_ramp) + && (this_->last) + && (!(this_->last->way.item.type == type_ramp))) { + char *destination_raw; + destination_raw=map_convert_string(streetitem->map,attr.u.str); + dbg(lvl_debug,"destination_raw from exit_to =%s\n",destination_raw); + if ((split_string_to_list(&(ret->way),destination_raw, ';')) < 2) + /* + * if a first try did not result in an actual splitting + * retry with ',' as a separator because in France a bad + * mapping practice exists to separate exit_to with ',' + * instead of ';' + */ + (split_string_to_list(&(ret->way),destination_raw, ',')); + g_free(destination_raw); + } + } + } + } + } } - dbg(lvl_debug,"i=%d start %d end %d '%s' '%s'\n", i, ret->way.angle2, ret->angle_end, ret->way.name1, ret->way.name2); + if(item_attr_get(routeitem, attr_route, &route_attr)) + graph_map = route_get_graph_map(route_attr.u.route); + + dbg(lvl_debug,"i=%d start %d end %d '%s' \n", i, ret->way.angle2, ret->angle_end, ret->way.name_systematic); map_rect_destroy(mr); } else { if (this_->last) @@ -952,7 +1842,7 @@ count_possible_turns(struct navigation *nav, struct navigation_itm *from, struct curr = curr->next; } - if (!curr) { // from does not lead to to? + if (!curr) { /* from does not lead to to? */ return -1; } @@ -1003,109 +1893,6 @@ calculate_dest_distance(struct navigation *this_, int incr) dbg(lvl_debug,"len %d time %d\n", len, time); } -/** - * @brief Checks if two navigation items are on the same street - * - * This function checks if two navigation items are on the same street. It returns - * true if either their name or their "systematic name" (e.g. "A6" or "B256") are the - * same. - * - * @param old The first item to be checked - * @param new The second item to be checked - * @return True if both old and new are on the same street - */ -static int -is_same_street2(char *old_name1, char *old_name2, char *new_name1, char *new_name2) -{ - if (old_name1 && new_name1 && !strcmp(old_name1, new_name1)) { - dbg(lvl_debug,"is_same_street: '%s' '%s' vs '%s' '%s' yes (1.)\n", old_name2, new_name2, old_name1, new_name1); - return 1; - } - if (old_name2 && new_name2 && !strcmp(old_name2, new_name2)) { - dbg(lvl_debug,"is_same_street: '%s' '%s' vs '%s' '%s' yes (2.)\n", old_name2, new_name2, old_name1, new_name1); - return 1; - } - dbg(lvl_debug,"is_same_street: '%s' '%s' vs '%s' '%s' no\n", old_name2, new_name2, old_name1, new_name1); - return 0; -} - -#if 0 -/** - * @brief Checks if two navigation items are on the same street - * - * This function checks if two navigation items are on the same street. It returns - * true if the first part of their "systematic name" is equal. If the "systematic name" is - * for example "A352/E3" (a german highway which at the same time is part of the international - * E-road network), it would only search for "A352" in the second item's systematic name. - * - * @param old The first item to be checked - * @param new The second item to be checked - * @return True if the "systematic name" of both items matches. See description. - */ -static int -is_same_street_systematic(struct navigation_itm *old, struct navigation_itm *new) -{ - int slashold,slashnew; - if (!old->name2 || !new->name2) - return 1; - slashold=strcspn(old->name2, "/"); - slashnew=strcspn(new->name2, "/"); - if (slashold != slashnew || strncmp(old->name2, new->name2, slashold)) - return 0; - return 1; -} - - -/** - * @brief Check if there are multiple possibilities to drive from old - * - * This function checks, if there are multiple streets connected to the exit of "old". - * Sometimes it happens that an item on a map is just segmented, without any other streets - * being connected there, and it is not useful if navit creates a maneuver there. - * - * @param new The navigation item we're driving to - * @return True if there are multiple streets - */ -static int -maneuver_multiple_streets(struct navigation_itm *new) -{ - if (new->way.next) { - return 1; - } else { - return 0; - } -} - - -/** - * @brief Check if the new item is entered "straight" - * - * This function checks if the new item is entered "straight" from the old item, i.e. if there - * is no other street one could take from the old item on with less steering. - * - * @param new The navigation item we're driving to - * @param diff The absolute angle one needs to steer to drive to this item - * @return True if the new item is entered "straight" - */ -static int -maneuver_straight(struct navigation_itm *new, int diff) -{ - int curr_diff; - struct navigation_way *w; - - w = new->way.next; - dbg(lvl_debug,"diff=%d\n", diff); - while (w) { - curr_diff=abs(angle_delta(new->prev->angle_end, w->angle2)); - dbg(lvl_debug,"curr_diff=%d\n", curr_diff); - if (curr_diff < diff) { - return 0; - } - w = w->next; - } - return 1; -} -#endif static int maneuver_category(enum item_type type) { @@ -1143,8 +1930,8 @@ static int maneuver_category(enum item_type type) default: return 0; } - - + + } /** @@ -1154,36 +1941,65 @@ static int maneuver_category(enum item_type type) * access and one-way restrictions of the way against the settings in {@code nav->vehicleprofile}. * Turn restrictions are not taken into account. * + * @param nav The navigation object + * @param way The way to examine + * @param mode If nonzero, oneway restrictions will be taken into account. If zero, only the vehicle type + * will be taken into account. + * * @return True if entry is permitted, false otherwise. If {@code nav->vehicleprofile} is null, true is returned. */ + + /* (jandegr) this gets called from within show_maneuver with mode=3 for roundabouts + * and with mode=4 from within count_possible_turns() for the use with + * 'take the manieth road to the left/right' + * However over here mode is ignored, so the 'manieth' road excludes unallowed oneway's, + * but IMHO it should count all drivable roads. For roundabouts it seems to be ok. + * + */ + static int is_way_allowed(struct navigation *nav, struct navigation_way *way, int mode) { - if (!nav->vehicleprofile) + if (!nav->vehicleprofile || !way->flags) return 1; - return !way->flags || ((way->flags & (way->dir >= 0 ? nav->vehicleprofile->flags_forward_mask : nav->vehicleprofile->flags_reverse_mask)) == nav->vehicleprofile->flags); + if (mode) + return ((way->flags & (way->dir >= 0 ? nav->vehicleprofile->flags_forward_mask : nav->vehicleprofile->flags_reverse_mask)) == nav->vehicleprofile->flags); + else + return ((way->flags & nav->vehicleprofile->flags) == nav->vehicleprofile->flags); } /** * @brief Checks whether a way has motorway-like characteristics * * Motorway-like means one of the following: - * <ul> - * <li> - * item type is {@code highway_land} or {@code highway_city} (OSM: {@code highway=motorway}) - * </li> - * <li> - * item type is {@code street_n_lanes} (OSM: {@code highway=trunk}) and way is one-way - * </li> - * </ul> + * + * item type is highway_land or highway_city (OSM: highway=motorway) + * item type is street_n_lanes (OSM: highway=trunk) and way is one-way + * {@code extended} is true and item type is either ramp or street_service * * @param way The way to examine + * @param extended Whether to consider ramps and service roads to be motorway-like * @return True for motorway-like, false otherwise */ static int -is_motorway_like(struct navigation_way *way) +is_motorway_like(struct navigation_way *way, int extended) { - if ((way->item.type == type_highway_land) || (way->item.type == type_highway_city) || ((way->item.type == type_street_n_lanes) && (way->flags & AF_ONEWAYMASK))) + if ((way->item.type == type_highway_land) || (way->item.type == type_highway_city) || ((way->item.type == type_street_n_lanes) && (way->flags & AF_ONEWAYMASK))) + return 1; + if ((extended) && ((way->item.type == type_ramp) || (way->item.type == type_street_service))) + return 1; + return 0; +} + +/** + * @brief Checks whether a way is a ramp + * + * @param way The way to be examined + * @return True for ramp, false otherwise + */ +static int +is_ramp(struct navigation_way *way) { + if (way->item.type == type_ramp) return 1; return 0; } @@ -1191,36 +2007,70 @@ is_motorway_like(struct navigation_way *way) /** * @brief Checks if navit has to create a maneuver to drive from old to new * - * This function checks if it has to create a "maneuver" - i.e. guide the user - to drive + * This function checks if it has to create a "maneuver" - i.e. guide the user - to drive * from "old" to "new". * * @param old The old navigation item, where we're coming from * @param new The new navigation item, where we're going to - * @param delta The angle the user has to steer to navigate from old to new - * @param reason A text string explaining how the return value resulted + * @param maneuver Pointer to a buffer that will receive a pointer to a {@code struct navigation_maneuver} + * in which detailed information on the maneuver will be stored. The buffer may receive a null pointer + * for some cases that do not require a maneuver. If a non-null pointer is returned, the caller is responsible + * for freeing up the buffer once it is no longer needed. * @return True if navit should guide the user, false otherwise */ static int -maneuver_required2(struct navigation *nav, struct navigation_itm *old, struct navigation_itm *new, int *delta, char **reason) +maneuver_required2 (struct navigation *nav, struct navigation_itm *old, struct navigation_itm *new, struct navigation_maneuver **maneuver) { - int ret=0,d,dw,dlim,dc; - char *r=NULL; - int cat,ncat,wcat,maxcat,left=-180,right=180,is_unambiguous=0,is_same_street; - int curve_limit=25; /* any angle less than this is considered straight */ + struct navigation_maneuver m; /* if the function returns true, this will be passed in the maneuver argument */ + struct navigation_itm *ni; /* temporary navigation item used for comparisons that examine previous or subsequent maneuvers */ + int ret=0; + int dw; /* temporary bearing difference between old and w (way being examined) */ + int dlim; /* if no other ways are within +/- dlim, the maneuver is unambiguous */ + int dc; /* if new and another way are within +/-min_turn_limit and on the same side, bearing difference for the other way; else d */ + char *r=NULL; /* human-legible reason for announcing or not announcing the maneuver */ + struct navigation_way *w; /* temporary way to examine */ + struct navigation_way *through_segment2 = NULL; /* off-route segment of through road at complex T junction */ + int wcat; int junction_limit = 100; /* maximum distance between two carriageways at a junction */ - int num_similar = 0; /* number of ways in a category similar to current one */ - int num_options = 0; /* number of permitted ways */ - int num_new_motorways = 0; /* number of motorway-like ways */ - int num_other = 0; /* number of ways which are neither motorway-like nor ramps */ - - dbg(lvl_debug,"enter %p %p %p\n",old, new, delta); - d=angle_delta(old->angle_end, new->way.angle2); - if (!new->way.next) { - /* No announcement necessary */ + int motorways_left = 0, motorways_right = 0; /* number of motorway-like roads left or right of new->way */ + int coming_from_motorway = 0; /* when the maneuver changes from one ramp to another, + * whether the last non-ramp road was motorway-like */ + int route_leaves_motorway = 0; /* when the maneuver changes from a motorway-like road to a ramp, + * whether a subsequent maneuver leaves the motorway (changing direction + * is considered leaving the motorway) */ + + *maneuver = NULL; + + m.type = type_nav_none; + m.delta = angle_delta(old->angle_end, new->way.angle2); + m.merge_or_exit = mex_none; + m.is_complex_t_junction = 0; + m.num_options = 0; + m.num_new_motorways = 0; + m.num_other_ways = 0; + m.num_similar_ways = 0; + m.old_cat = maneuver_category(old->way.item.type); + m.new_cat = maneuver_category(new->way.item.type); + m.max_cat = -1; + m.left = -180; + m.right = 180; + m.is_unambiguous = 1; + /* Check whether the street keeps its name */ + m.is_same_street = is_same_street2(old->way.name, old->way.name_systematic, new->way.name, new->way.name_systematic); + + dc = m.delta; + + dbg(lvl_debug,"enter %p %p %p\n",old, new, maneuver); +#if 0 + dbg(lvl_debug, "old=%s %s, new=%s %s, angle old=%d, angle new=%d, d=%i\n ", old->way.name, old->way.name_systematic, new->way.name, new->way.name_systematic, old->angle_end, new->way.angle2, d); +#endif + if (!new->way.next || (new->way.next && (new->way.next->angle2 == new->way.angle2) && !new->way.next->next)) { + /* No announcement necessary (with extra magic to eliminate duplicate ways) */ r="no: Only one possibility"; } else if (!new->way.next->next && new->way.next->item.type == type_ramp && !is_way_allowed(nav,new->way.next,1)) { /* If the other way is only a ramp and it is one-way in the wrong direction, no announcement necessary */ - r="no: Only ramp"; + r="no: Only ramp and unallowed direction "; + ret=0; } if (! r) { /* Announce exit from roundabout, but not entry or staying in it */ @@ -1235,140 +2085,216 @@ maneuver_required2(struct navigation *nav, struct navigation_itm *old, struct na r="no: staying in roundabout"; } } - cat=maneuver_category(old->way.item.type); if (!r) { /* Analyze all options (including new->way). * Anything that iterates over the whole set of options should be done here. This avoids * looping over the entire set of ways multiple times, which aims to improve performance * and predictability (because the same filter is applied to the ways being analyzed). */ - struct navigation_way *w = &(new->way); + w = &(new->way); int through_segments = 0; - dc=d; - maxcat=-1; - /* Check whether the street keeps its name */ - is_same_street=is_same_street2(old->way.name1, old->way.name2, new->way.name1, new->way.name2); while (w) { - if (is_way_allowed(nav,w,1)) { - num_options++; - /* ways of similar category */ - if (maneuver_category(w->item.type) == cat) { - // TODO: decide if a maneuver_category difference of 1 is still similar - num_similar++; - } - /* motorway-like ways */ - if (is_motorway_like(w)) { - num_new_motorways++; - } else if (w->item.type != type_ramp) { - num_other++; - } - if (w != &(new->way)) { - dw=angle_delta(old->angle_end, w->angle2); - if (dw < 0) { - if (dw > left) - left=dw; - if (dw > -curve_limit && d < 0 && d > -curve_limit) - dc=dw; - } else { - if (dw < right) - right=dw; - if (dw < curve_limit && d > 0 && d < curve_limit) - dc=dw; + /* in case of overlapping ways, avoid counting the way on the route twice */ + if ((w->angle2 != new->way.angle2) || (w == &(new->way))) { + dw=angle_delta(old->angle_end, w->angle2); + if (is_way_allowed(nav,w,1)) { + dbg(lvl_debug, "- Examining allowed way: %s %s %s, delta=%i\n", item_to_name(w->item.type), w->name_systematic, w->name, dw); + m.num_options++; + /* ways of similar category */ + if (maneuver_category(w->item.type) == m.old_cat) { + /* TODO: considering a maneuver_category difference of 1 to be similar, e.g. + * if (abs(maneuver_category(w->item.type) - m.old_cat) <= 1) + * will improve things in some cases but also introduce some junk maneuvers, + * e.g. at complex junctions. If we relax the maneuver_category requirement, + * we may need some extra requirements. */ + m.num_similar_ways++; } - wcat=maneuver_category(w->item.type); - /* If any other street has the same name, we can't use the same name criterion. - * Exceptions apply if we're coming from a motorway-like road and: - * - the other road is motorway-like (a motorway might split up temporarily) or - * - the other road is a ramp (they are sometimes tagged with the name of the motorway) - * The second one is really a workaround for bad tagging practice in OSM. Since entering - * a ramp always creates a maneuver, we don't expect the workaround to have any unwanted - * side effects. - */ - if (is_same_street && is_same_street2(old->way.name1, old->way.name2, w->name1, w->name2) && (!is_motorway_like(&(old->way)) || (!is_motorway_like(w) && w->item.type != type_ramp)) && is_way_allowed(nav,w,2)) - is_same_street=0; - /* Mark if the street has a higher or the same category */ - if (wcat > maxcat) - maxcat=wcat; - } /* if w != new->way */ - } /* if is_way_allowed */ - //if ((w->flags & AF_ONEWAYMASK) && is_same_street2(new->way.name1, new->way.name2, w->name1, w->name2)) - if (is_same_street2(new->way.name1, new->way.name2, w->name1, w->name2)) - // FIXME: for some reason new->way has no flags set (at least in my test case), so we can't test for oneway - /* count through_segments (even if they are not allowed) to check if we are at a complex T junction */ - through_segments++; - w = w->next; - } - if (num_options <= 1) { - if ((abs(d) >= curve_limit) && (through_segments == 2)) { - // FIXME: maybe there are cases with more than 2 through_segments...? - /* If we have to make a considerable turn (curve_limit or more), - * check whether we are approaching a complex T junction from the "stem" - * (which would need an announcement). - * Complex means that the through road is a dual-carriageway road. - * To find this out, we need to analyze the previous maneuvers. - */ - int hist_through_segments = 0; - int hist_dist = old->length; /* distance between previous and current maneuver */ - struct navigation_itm *ni = old; - while (ni && (hist_through_segments == 0) && (hist_dist <= junction_limit)) { - struct navigation_way *w = ni->way.next; - while (w) { - if ((w->flags & AF_ONEWAYMASK) && (is_same_street2(new->way.name1, new->way.name2, w->name1, w->name2))) - hist_through_segments++; - w = w->next; + /* motorway-like ways */ + if ((m.num_new_motorways < 2) && is_motorway_like(w, 0)) { + /* Count all motorway-like segments: + * - always count new + * - if new or w have an exit_ref or exit_label, count w + * - if old, new and w have the same name_systematic, do not count w + * - if one of old, new and w has no name_systematic, count w + * This is for handling temporary splits (e.g. at toll booths), which should + * be counted as one motorway for the purpose of navigation. On the other hand, + * occasionally a motorway may split at an interchange with both segments + * retaining the name, in which case we want to count both motorways. */ + if ((w == &(new->way)) + || new->way.exit_ref + || new->way.exit_label + || w->exit_ref + || w->exit_label + || !old->way.name_systematic + || !new->way.name_systematic + || !w->name_systematic + || strcmp(old->way.name_systematic, new->way.name_systematic) + || strcmp(old->way.name_systematic, w->name_systematic)) + m.num_new_motorways++; + } else if (!is_motorway_like(w, 1)) { + m.num_other_ways++; + } + if (w != &(new->way)) { + /* if we're exiting from a motorway, check which side of the ramp the motorway is on */ + if (is_motorway_like(w, 0) && is_motorway_like(&(old->way), 0) && new->way.item.type == type_ramp) { + if (dw < m.delta) + motorways_left++; + else + motorways_right++; + } + + if (dw < m.delta) { + if (dw > m.left) + m.left=dw; + } else { + if (dw < m.right) + m.right=dw; + } + + /* If almost-straight ways are present, the maneuver is ambiguous. We are counting only ways having + * a nonzero maneuver category (street_0 or higher), excluding ramps, service roads and anything closed + * to motorized traffic. Exceptions apply when the new way itself has a maneuver category of 0. + * Note that this is in addition for the dlim calculations we do further below, as they fail to + * catch some ambiguous cases for very low deltas. */ + if ((dw > -min_turn_limit) && (dw < min_turn_limit) && ((maneuver_category(w->item.type) != 0) || (maneuver_category(new->way.item.type) == 0))) + m.is_unambiguous = 0; + + if (dw < 0) { + if (dw > -min_turn_limit && m.delta < 0 && m.delta > -min_turn_limit) + dc=dw; + } else { + if (dw < min_turn_limit && m.delta > 0 && m.delta < min_turn_limit) + dc=dw; + } + wcat=maneuver_category(w->item.type); + /* If any other street has the same name, we can't use the same name criterion. + * Exceptions apply if we're coming from a motorway-like road and: + * - the other road is motorway-like (a motorway might split up temporarily) or + * - the other road is a ramp or service road (they are sometimes tagged with the name of the motorway) + * The second one is really a workaround for bad tagging practice in OSM. Since entering + * a ramp always creates a maneuver, we don't expect the workaround to have any unwanted + * side effects. + */ + if (m.is_same_street && is_same_street2(old->way.name, old->way.name_systematic, w->name, w->name_systematic) && (!is_motorway_like(&(old->way), 0) || (!is_motorway_like(w, 0) && w->item.type != type_ramp)) && is_way_allowed(nav,w,2)) + //if (m.is_same_street && is_same_street2(old->way.name, old->way.name_systematic, w->name, w->name_systematic) && (!is_motorway_like(&(old->way), 0) || !is_motorway_like(w, 1)) && is_way_allowed(nav,w,2)) + m.is_same_street=0; + /* If the route category changes to a lower one but another road has the same route category as old, + * it is not clear which of the two the driver would perceive as the "same street", hence reset is_same_street */ + /* Mark if the street has a higher or the same category */ + if (wcat > m.max_cat) + m.max_cat=wcat; + } /* if w != new->way */ + /* if is_way_allowed */ + } else { + /* If we're merging onto a motorway, check which side of the ramp the motorway is on. + * This requires examining the candidate ways which are NOT allowed. */ + if (is_motorway_like(w, 0) && is_motorway_like(&(new->way), 0) && old->way.item.type == type_ramp) { + if (dw < 0) + motorways_left++; + else + motorways_right++; + } + /* if !is_way_allowed */ + } /* if is_way_allowed || !is_way_allowed */ + if (w->flags & AF_ONEWAYMASK) { + /* count through_segments (even if they are not allowed) to check if we are at a complex T junction */ + if (is_same_street2(new->way.name, new->way.name_systematic, w->name, w->name_systematic)) + /* count segments belonging to the same street */ + through_segments++; + else if ((!through_segment2 && (abs(angle_delta(angle_opposite(w->angle2), new->way.angle2)) < min_turn_limit)) + || (through_segment2 && (abs(angle_delta(angle_opposite(w->angle2), new->way.angle2)) < abs(angle_delta(angle_opposite(through_segment2->angle2), new->way.angle2))))) { + /* also count near-straight continuations of new (the through road may change names at the junction) */ + if (!through_segment2) + through_segments++; + through_segment2 = w; } - ni = ni->prev; - if (ni) - hist_dist += ni->length; } - if (hist_through_segments == 2) - // FIXME: see above for number of through_segments - ret=1; - r="yes: turning into dual-carriageway through-road of T junction"; + } /* if w is not a duplicate of way->next */ + w = w->next; + } /* while w */ + if ((abs(m.delta) >= min_turn_limit) && (through_segments >= 2)) { + /* If we have to make a considerable turn (min_turn_limit or more), + * check whether we are approaching a complex T junction from the "stem" + * (which would need an announcement). + * Complex means that the through road is a dual-carriageway road. + * This is the case only if at least 2 segments (including new) are one-way + * (regardless of direction) and have the same name as new or through_segment2. + * More than 2 such segments are possible e.g. where two physically separated + * lanes join. + * To find out if there is another carriageway, we need to analyze the previous + * maneuvers. + */ + int hist_through_segments = 0; + int hist_dist = old->length; /* distance between previous and current maneuver */ + ni = old; + while (ni && (hist_through_segments == 0) && (hist_dist <= junction_limit)) { + // TODO: shouldn't the condition be (hist_through_segments < 2) to catch through segments that are slightly offset?? + struct navigation_way *w = ni->way.next; + while (w) { + if (is_same_street2(new->way.name, new->way.name_systematic, w->name, w->name_systematic) + || (through_segment2 && is_same_street2(through_segment2->name, through_segment2->name_systematic, w->name, w->name_systematic))) + hist_through_segments++; + w = w->next; + } + ni = ni->prev; + if (ni) + hist_dist += ni->length; + } + if (hist_through_segments >= 2) { + /* Require at least 2 segments (there may be more than two in cases such as + * local-express lane systems or separate cycleways) */ + ret=1; + m.is_complex_t_junction = 1; + r="yes: turning into multi-carriageway through-road of T junction"; } } } - if (!r && abs(d) > 75) { + if (!r && abs(m.delta) > 75) { /* always make an announcement if you have to make a sharp turn */ r="yes: delta over 75"; ret=1; - } else if (!r && abs(d) >= curve_limit) { - if ((cat >= maneuver_category(type_street_2_city)) && (num_similar > 1)) { + } else if (!r && abs(m.delta) >= min_turn_limit) { + if ((m.new_cat >= maneuver_category(type_street_2_city)) && (m.num_similar_ways > 1)) { /* When coming from street_2_* or higher category road, check if * - we have multiple options of the same category and - * - we have to make a considerable turn (at least curve_limit) + * - we have to make a considerable turn (at least min_turn_limit) * If both is the case, ANNOUNCE. */ ret=1; - r="yes: more than one similar road and delta >= curve_limit"; + r="yes: more than one similar road and delta >= min_turn_limit"; } } - if ((!r) && (num_options <= 1)) + if ((!r) && (m.num_options <= 1)) r="no: only one option permitted"; if (!r) { - if (is_motorway_like(&(old->way)) && (num_other == 0) && (num_new_motorways > 1)) { + if (is_motorway_like(&(old->way), 0) && (m.num_other_ways == 0) && (m.num_new_motorways > 1) && ((m.left > -90) || (m.right < 90))) { /* If we are at a motorway interchange, ANNOUNCE * We are assuming a motorway interchange when old way and at least * two possible ways are motorway-like and allowed. + * Additionally we require one way (other than the new way) within +/-90°. + * This prevents the rule from essentially announcing "don't do the U turn" + * at the beginning of a single-carriageway section, which is occasionally + * found on motorways. * If any of the possible ways is neither motorway-like nor a ramp, * we are probably on a trunk road with level crossings and not * at a motorway interchange. */ - // FIXME: motorway junctions could have service roads r="yes: motorway interchange (multiple motorways)"; + m.merge_or_exit = mex_interchange; ret=1; - } else if (is_motorway_like(&(old->way)) && (num_other == 0) && (!is_same_street)) { + } else if (is_motorway_like(&(old->way), 0) && is_motorway_like(&(new->way), 0) && (m.num_other_ways == 0) && (!m.is_same_street)) { /* Another sign that we are at a motorway interchange is if the street name changes */ r="yes: motorway interchange (name changes)"; + m.merge_or_exit = mex_interchange; ret=1; - } else if ((new->way.item.type == type_ramp) && ((num_other == 0) || (abs(d) >= curve_limit)) && ((left > -90) || (right < 90))) { + } else if ((new->way.item.type == type_ramp) && ((m.num_other_ways == 0) || (abs(m.delta) >= min_turn_limit)) && ((m.left > -90) || (m.right < 90))) { /* Motorway ramps can be confusing, therefore we need to lower the bar for announcing a maneuver. * When the new way is a ramp, we check for the following criteria: * - All available ways are either motorway-like or ramps. - * This prevents this rule from firing in non-motorway setings, which is needed to avoid + * This prevents this rule from firing in non-motorway settings, which is needed to avoid * superfluous maneuvers when the minor road of a complex T junction is a ramp. - * - If the above is not met, the maneuver must involve a turn (curve_limit or more) to enter the ramp. + * - If the above is not met, the maneuver must involve a turn (min_turn_limit or more) to enter the ramp. * - Additionally, there must be one way (other than the new way) within +/-90°. * This prevents the rule from essentially announcing "don't do the U turn" where the ramps for * two opposite directions merge. @@ -1378,170 +2304,618 @@ maneuver_required2(struct navigation *nav, struct navigation_itm *old, struct na ret=1; } } - ncat=maneuver_category(new->way.item.type); if (!r) { /* get the delta limit for checking for other streets. It is lower if the street has no other streets of the same or higher category */ - if (ncat < cat) + if (m.new_cat < m.old_cat) dlim=80; else dlim=120; /* if the street is really straight, the others might be closer to straight */ - if (abs(d) < 20) + if (abs(m.delta) < 20) dlim/=2; /* if both old and new way have a category of 0, or if both ways and at least one other way are * in the same category and no other ways are higher, * dlim is 620/256 (roughly 2.5) times the delta of the maneuver */ - if ((maxcat == ncat && maxcat == cat) || (ncat == 0 && cat == 0)) - dlim=abs(d)*620/256; - /* if both old, new and highest other category differ by no more than 1, - * dlim is just higher than the delta (so another way with a delta of exactly -d will be treated as ambiguous) */ - else if (max(max(cat, ncat), maxcat) - min(min(cat, ncat), maxcat) <= 1) - dlim = abs(d) + 1; + if ((m.max_cat == m.new_cat && m.max_cat == m.old_cat) || (m.new_cat == 0 && m.old_cat == 0)) + dlim=abs(m.delta)*620/256; /* if both old and new way are in higher than highest encountered category, * dlim is 128/256 times (i.e. one half) the delta of the maneuver */ - else if (maxcat < ncat && maxcat < cat) - dlim=abs(d)*128/256; + else if (m.max_cat < m.new_cat && m.max_cat < m.old_cat) + dlim=abs(m.delta)*128/256; /* if no other ways are within +/-dlim, the maneuver is unambiguous */ - if (left < -dlim && right > dlim) - is_unambiguous=1; - if (dc != d) { - dbg(lvl_debug,"d %d vs dc %d\n",d,dc); - d-=(dc+d+1)/2; - dbg(lvl_debug,"result %d\n",d); - is_unambiguous=0; - } - if (!is_same_street && is_unambiguous < 1) { + if (m.left >= -dlim || m.right <= dlim) + m.is_unambiguous = 0; + /* if another way is within +/-min_turn_limit and on the same side as new, the maneuver is ambiguous */ + if (dc != m.delta) { + dbg(lvl_debug, "m.delta %d vs dc %d\n", m.delta, dc); + m.is_unambiguous=0; + } + if (!m.is_same_street && m.is_unambiguous < 1) { /* FIXME: why < 1? */ ret=1; r="yes: different street and ambiguous"; } else r="no: same street or unambiguous"; #ifdef DEBUG - r=g_strdup_printf("%s: d %d left %d right %d dlim=%d cat old:%d new:%d max:%d unambiguous=%d same_street=%d", ret==1?"yes":"no", d, left, right, dlim, cat, ncat, maxcat, is_unambiguous, is_same_street); + r=g_strdup_printf("%s: d %d left %d right %d dlim=%d cat old:%d new:%d max:%d unambiguous=%d same_street=%d", ret==1?"yes":"no", m.delta, m.left, m.right, dlim, m.old_cat, m.new_cat, m.max_cat, m.is_unambiguous, m.is_same_street); #endif } - *delta=d; - if (reason) - *reason=r; - if (r) - dbg(lvl_debug, "%s %s -> %s %s: %s\n", old->way.name2, old->way.name1, new->way.name2, new->way.name1, r); - return ret; - -#if 0 - if (new->item.type == old->item.type || (new->item.type != type_ramp && old->item.type != type_ramp)) { - if (is_same_street2(old, new)) { - if (! entering_straight(new, abs(*delta))) { - dbg(lvl_debug, "maneuver_required: Not driving straight: yes\n"); - if (reason) - *reason="yes: Not driving straight"; - return 1; + if (m.merge_or_exit == mex_none) { + if (old->way.item.type == type_ramp && is_motorway_like(&(new->way), 0)) { + if (motorways_left) + m.merge_or_exit = mex_merge_left; + else if (motorways_right) + m.merge_or_exit = mex_merge_right; + /* if there are no motorways on either side, we are not merging + * (more likely the start of a motorway) */ + + if (m.merge_or_exit != mex_none) { + ret=1; + if (!r) + r = "yes: merging onto motorway-like road"; } - - if (check_multiple_streets(new)) { - if (entering_straight(new,abs(*delta)*2)) { - if (reason) - *reason="no: delta < ext_limit for same name"; - return 0; + } else if (is_motorway_like(&(old->way), 1) && (new->way.item.type == type_ramp)) { + /* Detect interchanges - if: + * - we're entering a ramp, + * - we're coming from a motorway-like road (directly or via ramps), + * - the route is taking us onto another motorway-like road and + * - none of the ways in between connects to any non-motorway roads, + * set m.merge_or_exit = mex_interchange. + * The last condition is to prevent direction changes (i.e. exit motorway and take + * access ramp for opposite direction) from being misinterpreted as interchanges. */ + ni = old; + coming_from_motorway = 1; + while (coming_from_motorway && ni && (ni->way.item.type == type_ramp)) { + w = &(ni->way); + while (coming_from_motorway && w) { + coming_from_motorway = is_motorway_like(w, 1); + w = w->next; } - if (reason) - *reason="yes: delta > ext_limit for same name"; - return 1; - } else { - dbg(lvl_debug, "maneuver_required: Staying on the same street: no\n"); - if (reason) - *reason="no: Staying on same street"; - return 0; + ni = ni->prev; + } + if (ni && coming_from_motorway) + coming_from_motorway = is_motorway_like(&(ni->way), 0); + ni = new->next; + route_leaves_motorway = !coming_from_motorway; + while (!route_leaves_motorway && ni && (ni->way.item.type == type_ramp)) { + w = &(ni->way); + while (!route_leaves_motorway && w) { + route_leaves_motorway = !is_motorway_like(w, 1); + w = w->next; + } + ni = ni->next; + } + if (ni && !route_leaves_motorway && is_motorway_like(&(ni->way), 0)) + m.merge_or_exit = mex_interchange; + else if (is_motorway_like(&(old->way), 0) || (coming_from_motorway && new->way.exit_ref)) { + if (motorways_left && (m.left > -90)) + m.merge_or_exit = mex_exit_right; + else if (motorways_right && (m.right < 90)) + m.merge_or_exit = mex_exit_left; + /* if there are no motorways within +/-90 degrees on either side, this is not an exit + * (more likely the end of a motorway) */ + } + + if (is_motorway_like(&(old->way), 0) && (m.merge_or_exit != mex_none)) { + ret=1; + if (!r) + r = "yes: leaving motorway-like road"; } } - } else - dbg(lvl_debug, "maneuver_required: old or new is ramp\n"); -#if 0 - if (old->item.type == type_ramp && (new->item.type == type_highway_city || new->item.type == type_highway_land)) { - dbg(lvl_debug, "no_maneuver_required: old is ramp new is highway\n"); - if (reason) - *reason="no: old is ramp new is highway"; - return 0; - } -#endif -#if 0 - if (old->crossings_end == 2) { - dbg(lvl_debug, "maneuver_required: only 2 connections: no\n"); - return 0; } -#endif - dbg(lvl_debug,"delta=%d-%d=%d\n", new->way.angle2, old->angle_end, *delta); - if ((new->item.type == type_highway_land || new->item.type == type_highway_city || old->item.type == type_highway_land || old->item.type == type_highway_city) && (!is_same_street_systematic(old, new) || (old->name2 != NULL && new->name2 == NULL))) { - dbg(lvl_debug, "maneuver_required: highway changed name\n"); - if (reason) - *reason="yes: highway changed name"; - return 1; + + if (ret) { + *maneuver = g_new(struct navigation_maneuver, 1); + memcpy(*maneuver, &m, sizeof(struct navigation_maneuver)); } - if (abs(*delta) < straight_limit) { - if (! entering_straight(new,abs(*delta))) { - if (reason) - *reason="yes: not straight"; - dbg(lvl_debug, "maneuver_required: not driving straight: yes\n"); - return 1; - } + if (r) + dbg(lvl_debug, "%s %s %s -> %s %s %s: %s, delta=%i, merge_or_exit=%i\n", item_to_name(old->way.item.type), old->way.name_systematic, old->way.name, item_to_name(new->way.item.type), new->way.name_systematic, new->way.name, r, m.delta, m.merge_or_exit); + return ret; +} - dbg(lvl_debug, "maneuver_required: delta(%d) < %d: no\n", *delta, straight_limit); - if (reason) - *reason="no: delta < limit"; - return 0; +/** + * @brief Adjusts a bearing delta to point in the same direction as a reference delta. + * + * Calculated delta results are constrained to -180 <= delta <= +180 degrees. Some heuristics, however, require values outside + * that range, e.g. -190 rather than 170 degrees. Given a reference with approximately correct orientation, this function corrects + * that delta to match the reference as closely as possible. This is done by adding or subtracting 360 degrees as needed. + * + * @param delta The delta to adjust. {@code abs(delta)} must be no greater than 180. + * @param reference The reference delta. {@code abs(reference)} must be no greater then 180. + * @return The adjusted delta, which is numerically within +/-180 degrees of the reference. If {@code delta} or {@code reference} + * are outside of their specified range, the result is undefined. + */ +int adjust_delta(int delta, int reference) { + if ((delta >= 0) && (delta - reference) > 180) { + dbg(lvl_debug,"adjusting delta from %d to %d\n", delta, delta - 360); + return delta - 360; } - if (abs(*delta) < ext_straight_limit) { - if (entering_straight(new,abs(*delta)*2)) { - if (reason) - *reason="no: delta < ext_limit"; - return 0; - } + else if ((delta <= 0) && (reference - delta) > 180) { + dbg(lvl_debug,"adjusting delta from %d to %d\n", delta, delta + 360); + return delta + 360; } + else + return delta; +} - if (! check_multiple_streets(new)) { - dbg(lvl_debug, "maneuver_required: only one possibility: no\n"); - if (reason) - *reason="no: only one possibility"; - return 0; - } +/** + * @brief Analyzes a roundabout and sets maneuver information + * + * Exit from a roundabout requires a somewhat complex analysis of the ways involved in order to: + * <ul> + * <li>Calculate effective bearing change (between entry and exit) and store it in {@code cmd->roundabout_delta}</li> + * <li>Set {@code cmd->maneuver->type} to {@code nav_roundabout_{r|l}{1..8}}, based on bearing change</li> + * <li>Set {@code cmd->length}</li> + * </ul> + * + * Bearing change must be as close as possible to how drivers would perceive it. + * Builds prior to r2017 used the difference between the last way before and the first way after the roundabout, + * which tends to overestimate the angle when the ways leading towards and/or away from the roundabout split into + * separate carriageways in a Y-shape. This is referred to as {@code delta1} here. + * + * In r2017 a different approach was introduced, which essentially distorts the roads so they enter and leave + * the roundabout at a 90 degree angle. (To make calculations simpler, tangents of the roundabout at the entry + * and exit points are used, with one of them reversed in direction, instead of the approach roads.) + * However, this approach tends to underestimate the angle when the distance between approach roads is large. + * This is referred to as {@code delta2} here. + * + * Combining {@code delta1} and {@code delta2}, calculating error estimates for each and using a weighted average between the + * two delta estimates gives better results in many cases but fails for certain road layouts - namely, when corresponding + * approach roads are connected by more than one roundabout segment, or when additional ways connect to an approach road. + * These cases break error calculation and thus weight distribution. + * + * Project HighFive introduces a new approach, which compares bearings of ways leading towards and away from the + * roundabout not immediately at entry and exit but at a certain distance from the roundabout, which is roughly proportional + * to the circumference of the roundabout. Circumference is estimated using the arithmetic mean value of {@code delta1} and + * {@code delta2}. This approach has produced the best results in tests. In code it is referred to as {@code delta3}. + * + * @param this_ The navigation object + * @param cmd A {@code struct navigation_cmd}, whose {@code delta} and {@code maneuver} members must be set prior to calling + * this function + * @param itm The navigation item for the maneuver to exit the roundabout + */ +void navigation_analyze_roundabout(struct navigation *this_, struct navigation_command *cmd, struct navigation_itm *itm) { + enum item_type r = type_none, l = type_none; + int len = 0; /* length of roundabout segment */ + int roundabout_length; /* estimated total length of roundabout */ + int angle = 0; + int entry_tangent; /* tangent of the roundabout at entry point, against direction of route */ + int exit_tangent; /* tangent of the roundabout at exit point, in direction of route */ + int entry_road_angle, exit_road_angle; /* angles before and after approach segments */ + struct navigation_itm *itm2; /* items before itm to examine, up to first roundabout segment on route */ + struct navigation_itm *itm3; /* items before itm2 and after itm to examine */ + struct navigation_way *w; /* continuation of the roundabout after we leave it */ + struct navigation_way *w2; /* segment of the roundabout leading to the point at which we enter it */ + int dtsir = 0; /* delta to stay in roundabout */ + int d, dmax = 0; /* when examining deltas of roundabout approaches, current and maximum encountered */ + int delta1, delta2, delta3; /* for roundabout delta calculated with different approaches */ + int dist_left; /* when examining ways around the roundabout to a certain threshold, the distance we have left to go */ + int central_angle; /* approximate central angle for the roundabout arc that is part of the route */ + int abort; /* whether a (complex) criterion for aborting a loop has been met */ + + /* Find continuation of roundabout after the exit. Don't simply use itm->way.next here, it will break + * if a node in the roundabout is shared by more than one way */ + w = itm->way.next; + while (w && !(w->flags & AF_ROUNDABOUT)) + w = w->next; + if (w) { + /* When exiting a roundabout, w should never be null, thus this + * code will always be executed. Checking for the condition anyway ensures + * that botched map data (roundabout ending with nowhere else to go) will not + * cause a crash. For the same reason we're using dtsir with a default value of 0. + */ - dbg(lvl_debug, "maneuver_required: delta=%d: yes\n", *delta); - if (reason) - *reason="yes: delta >= limit"; - return 1; -#endif + dtsir = angle_delta(itm->prev->angle_end, w->angle2); + dbg(lvl_debug,"delta to stay in roundabout %d\n", dtsir); + + exit_tangent = angle_median(itm->prev->angle_end, w->angle2); + dbg(lvl_debug,"exit %d median from %d, %d\n", exit_tangent, itm->prev->angle_end, w->angle2); + + /* Move back to where we enter the roundabout, calculate length in roundabout */ + itm2=itm; + while (itm2->prev && (itm2->prev->way.flags & AF_ROUNDABOUT)) { + itm2=itm2->prev; + len+=itm2->length; + angle=itm2->angle_end; + } + + /* Find the segment of the roundabout leading up to the point at which we enter it. Again, don't simply + * use itm2->way.next here, it will break if a node in the roundabout is shared by more than one way */ + w2 = itm2->way.next; + while (w2 && !(w2->flags & AF_ROUNDABOUT)) + w2 = w2->next; + + /* Calculate entry angle */ + if (itm2 && w2) { + entry_tangent = angle_median(angle_opposite(itm2->way.angle2), w2->angle2); + dbg(lvl_debug, "entry %d median from %d (%d), %d\n", entry_tangent, angle_opposite(itm2->way.angle2), itm2->way.angle2, itm2->way.next->angle2); + } else { + entry_tangent = angle_opposite(angle); + } /* endif itm2 && w2 */ + dbg(lvl_debug, "entry %d exit %d\n", entry_tangent, exit_tangent); + + delta2 = angle_delta(entry_tangent, exit_tangent); + dbg(lvl_debug, "delta2 %d\n", delta2); + + if (itm2->prev) { + /* If there are V-shaped approach segments and we are turning around or making a sharp turn, + * delta1 may point in the wrong direction, thus we need adjust_delta() to correct this. */ + delta1 = adjust_delta(angle_delta(itm2->prev->angle_end, itm->way.angle2), delta2); + + /* Now try to figure out the error range for delta1. Errors are caused by turns in the approach segments + * just before the roundabout. We use the last segment before the approach as a reference. + * We assume the approach to begin when one of the following is true: + * - a way turns into a ramp + * - a way turns into a one-way road + * - a certain distance from the roundabout, proportional to its circumference, is exceeded + * Simply comparing bearings at these points may cause confusion with certain road layouts (namely + * S-shaped dual-carriageway roads), hence we examine the entire approach segment and take the largest + * delta (relative to the end of the approach segment) which we encounter. + * This is done for both ends of the roundabout. + */ + + /* Approximate roundabout circumference based on len and approximate central angle of route segment. + * The central angle is approximated using the unweighted average of delta1 and delta2, + * which is somewhat crude but sufficient for our purposes. */ + central_angle = abs((delta1 + delta2) / 2 + ((cmd->delta < dtsir) ? 180 : -180)); + roundabout_length = len * 360 / central_angle; + dbg(lvl_debug,"roundabout_length = %dm (for central_angle = %d degrees)\n", roundabout_length, central_angle); + + /* in the case of separate carriageways, approach roads become hard to identify, thus we keep a cap on distance. + * Currently this is at most half the length of the roundabout, which has worked well in tests but can be tweaked + * to further improve results. */ + dist_left = roundabout_length / 2; + dbg(lvl_debug,"examining roads for up to %dm\n", dist_left); + + /* examine items before roundabout */ + itm3 = itm2->prev; /* last segment before roundabout */ + abort = 0; + while (itm3->prev) { + if ((itm3->next && is_ramp(&(itm3->next->way)) && !is_ramp(&(itm3->way))) || !(itm3->way.flags & AF_ONEWAYMASK)) { + dbg(lvl_debug,"items before roundabout: break because ramp or oneway ends, %dm left\n", dist_left); + dist_left = 0; /* to make sure we don't examine the following way in depth */ + break; + } + if (dist_left <= itm3->length) { + dbg(lvl_debug,"items before roundabout: maximum distance reached, %dm left, item length %dm\n", dist_left, itm3->length); + break; + } + d = navigation_way_get_max_delta(&(itm3->way), map_projection(this_->map), itm2->prev->angle_end, dist_left, -1); + if ((d != invalid_angle) && (abs(d) > abs(dmax))) + dmax = d; + w2 = itm3->way.next; + while (w2) { + /* Stop examining ways at a turn maneuver (more than one way allowed and route does not follow straightest path) */ + if (is_way_allowed(this_, w2, 0) + && (abs(angle_delta(angle_opposite(w2->angle2), itm3->way.angle2)) <= abs(angle_delta(itm3->prev->angle_end, itm3->way.angle2)))) { + /* FIXME: comparing angles probably does not work well for near-equal angles */ + abort = 1; + break; + } + w2 = w2->next; + } + if (abort) { + dbg(lvl_debug,"items before roundabout: break because of potential turn maneuver, %dm left\n", dist_left); + dist_left = itm3->length; + break; + } + dist_left -= itm3->length; + itm3 = itm3->prev; + } + if (dist_left == 0) { + d = angle_delta(itm2->prev->angle_end, itm3->angle_end); + } else if (dist_left < itm3->length) { + d = navigation_way_get_max_delta(&(itm3->way), map_projection(this_->map), itm2->prev->angle_end, dist_left, -1); + } else { + /* not enough objects in navigation map, use most distant one + * - or dist_left == itm3->length, this saves a few CPU cycles over the above */ + d = angle_delta(itm2->prev->angle_end, itm3->way.angle2); + } + if ((d != invalid_angle) && (abs(d) > abs(dmax))) + dmax = d; + entry_road_angle = (itm2->prev->angle_end + dmax) % 360; + dbg(lvl_debug,"entry_road_angle %d (%d + %d)\n", entry_road_angle, itm2->prev->angle_end, dmax); + + /* examine items after roundabout */ + dmax = 0; + dist_left = roundabout_length / 2; + itm3 = itm; /* first segment after roundabout */ + abort = 0; + while (itm3->next) { + if ((itm3->prev && is_ramp(&(itm3->prev->way)) && !is_ramp(&(itm3->way))) || !(itm3->way.flags & AF_ONEWAYMASK)) { + dbg(lvl_debug,"items after roundabout: break because ramp or oneway ends, %dm left\n", dist_left); + dist_left = 0; /* to make sure we don't examine the following way in depth */ + break; + } + if (dist_left <= itm3->length) { + dbg(lvl_debug,"items after roundabout: maximum distance reached, %dm left, item length %dm\n", dist_left, itm3->length); + break; + } + d = navigation_way_get_max_delta(&(itm3->way), map_projection(this_->map), itm->way.angle2, dist_left, 1); + if ((d != invalid_angle) && (abs(d) > abs(dmax))) + dmax = d; + w2 = itm3->next->way.next; + while (w2) { + /* Stop examining ways at a turn maneuver (more than one way allowed and route does not follow straightest path) */ + if (is_way_allowed(this_, w2, 0) + && (abs(angle_delta(itm3->angle_end, w2->angle2)) <= abs(angle_delta(itm3->angle_end, itm3->next->way.angle2)))) { + /* FIXME: comparing angles probably does not work well for near-equal angles */ + abort = 1; + break; + } + w2 = w2->next; + } + if (abort) { + dbg(lvl_debug,"items after roundabout: break because of potential turn maneuver, %dm left\n", dist_left); + dist_left = itm3->length; + break; + } + dist_left -= itm3->length; + itm3 = itm3->next; + } + if (dist_left == 0) { + d = angle_delta(itm->way.angle2, itm3->way.angle2); + } else if (dist_left < itm3->length) { + d = navigation_way_get_max_delta(&(itm3->way), map_projection(this_->map), itm->way.angle2, dist_left, 1); + } else { + /* not enough objects in navigation map, use most distant one + * - or dist_left == itm3->length, this saves a few CPU cycles over the above */ + d = angle_delta(itm->way.angle2, itm3->angle_end); + } + if ((d != invalid_angle) && (abs(d) > abs(dmax))) + dmax = d; + + exit_road_angle = (itm->way.angle2 + dmax) % 360; + dbg(lvl_debug,"exit_road_angle %d (%d + %d)\n", exit_road_angle, itm->way.angle2, dmax); + + dbg(lvl_debug,"delta1 %d\n", delta1); + + delta3 = adjust_delta(angle_delta(entry_road_angle, exit_road_angle), delta2); + dbg(lvl_debug,"delta3 %d\n", delta3); + + cmd->roundabout_delta = delta3; + dbg(lvl_debug,"roundabout_delta %d\n", cmd->roundabout_delta); + } else { + /* we don't know where we entered the roundabout, so we can't calculate delta1 */ + cmd->roundabout_delta = delta2; + } /* endif itm2->prev */ + cmd->length=len+roundabout_extra_length; + } /* if w */ + + /* set cmd->maneuver->type */ + switch (((180 + 22) - cmd->roundabout_delta) / 45) { + case 0: + case 1: + r = type_nav_roundabout_r1; + l = type_nav_roundabout_l7; + break; + case 2: + r = type_nav_roundabout_r2; + l = type_nav_roundabout_l6; + break; + case 3: + r = type_nav_roundabout_r3; + l = type_nav_roundabout_l5; + break; + case 4: + r = type_nav_roundabout_r4; + l = type_nav_roundabout_l4; + break; + case 5: + r = type_nav_roundabout_r5; + l = type_nav_roundabout_l3; + break; + case 6: + r = type_nav_roundabout_r6; + l = type_nav_roundabout_l2; + break; + case 7: + r = type_nav_roundabout_r7; + l = type_nav_roundabout_l1; + break; + case 8: + r = type_nav_roundabout_r8; + l = type_nav_roundabout_l8; + break; + } + dbg(lvl_debug,"delta %d\n", cmd->delta); + /* if delta to leave the roundabout (cmd->delta) is less than delta to stay in roundabout (dtsir), + * we're exiting to the left, so we're probably in a clockwise roundabout, and vice versa */ + if (cmd->delta < dtsir) + cmd->maneuver->type = l; + else + cmd->maneuver->type = r; + dbg(lvl_debug,"type %s\n", item_to_name(cmd->maneuver->type)); } + +/** + * @brief Creates a new {@code struct navigation_command} for a maneuver. + * + * This function creates a new command and inserts it into the command list of {@code this_}. + * It also parses {@code maneuver} and sets its {@code type} appropriately so that other + * functions can rely on that. + * + * @param this_ The navigation object + * @param itm The navigation item following the maneuver + * @param maneuver The {@code struct navigation_maneuver} returned by {@code maneuver_required2()}. For the destination, + * initialize a zeroed-out {@code struct navigation_maneuver} and set its {@code type} member to {@code type_nav_destination} + * prior to calling this function. + * + * @return The new command + */ static struct navigation_command * -command_new(struct navigation *this_, struct navigation_itm *itm, int delta) +command_new(struct navigation *this_, struct navigation_itm *itm, struct navigation_maneuver *maneuver) { struct navigation_command *ret=g_new0(struct navigation_command, 1); - dbg(lvl_debug,"enter this_=%p itm=%p delta=%d\n", this_, itm, delta); - ret->delta=delta; + struct navigation_way *w; /* the way in which to turn. */ + int more_ways_for_strength = 0; /* Counts the number of ways of the current node that turn + to the same direction as the route way. Strengthening criterion. */ + int turn_no_of_route_way = 0; /* The number of the route way of all ways that turn to the same direction. + Count direction from abs(0 degree) up to abs(180 degree). Strengthening criterion. */ + + dbg(lvl_debug,"enter this_=%p itm=%p maneuver=%p delta=%d\n", this_, itm, maneuver, maneuver->delta); + ret->maneuver = maneuver; + ret->delta=maneuver->delta; ret->itm=itm; - if (itm && itm->prev && itm->way.next && itm->prev->way.next && !(itm->way.flags & AF_ROUNDABOUT) && (itm->prev->way.flags & AF_ROUNDABOUT)) { - int len=0; - int angle=0; - int entry_angle; - struct navigation_itm *itm2=itm->prev; - int exit_angle=angle_median(itm->prev->angle_end, itm->way.next->angle2); - dbg(lvl_debug,"exit %d median from %d,%d\n", exit_angle,itm->prev->angle_end, itm->way.next->angle2); - while (itm2 && (itm2->way.flags & AF_ROUNDABOUT)) { - len+=itm2->length; - angle=itm2->angle_end; - itm2=itm2->prev; - } - if (itm2 && itm2->next && itm2->next->way.next) { - itm2=itm2->next; - entry_angle=angle_median(angle_opposite(itm2->way.angle2), itm2->way.next->angle2); - dbg(lvl_debug,"entry %d median from %d(%d),%d\n", entry_angle,angle_opposite(itm2->way.angle2), itm2->way.angle2, itm2->way.next->angle2); + + /* Possible maneuver types: + * nav_none (default, change wherever we encounter it – unless the maneuver is a merge, which has only merge_or_exit) + * nav_straight (set below) + * nav_keep_{left|right} (set below) + * nav_{right|left}_{1..3} (set below) + * nav_turnaround (TODO: when we have a U turn without known direction? Needs full implementation!) + * nav_turnaround_{left|right} (set below) + * nav_roundabout_{r|l}{1..8} (set below, special handling) + * nav_exit_{left|right} (do not set here) + * nav_merge_{left|right} (do not set here) + * nav_destination (if this is set, leave it) + * nav_position (do not set here) + */ + + if (ret->maneuver->type != type_nav_destination) { + /* FIXME: this will not catch cases in which entry and exit share the same node and we just *touch* the roundabout */ + if (itm && itm->prev && !(itm->way.flags & AF_ROUNDABOUT) && (itm->prev->way.flags & AF_ROUNDABOUT)) { + navigation_analyze_roundabout(this_, ret, itm); } else { - entry_angle=angle_opposite(angle); + /* non-roundabout turn --> */ + + /* set ret->maneuver->type */ + if (abs(ret->delta) >= min_turn_limit) { + + /* Strengthening criterion: If there are more ways in the same direction, in which the vehicle can turn, + the announcement shall be more precise. I.e. the strengthening is dependent on which of the possible ways + the route turn shall be. So, with the selection of one of the possible ways a certain turn angle pattern + becomes active. + Second criterion: the turn angle of the route way defines the strengthening of the announcement according + to the pattern. */ + w = itm->next->way.next; + + if (angle_delta(itm->next->way.angle2,itm->angle_end) < 0) { /* next turns or bends left */ + while (w) { + if (angle_delta(w->angle2,itm->angle_end) < -min_turn_limit) { + more_ways_for_strength++; /* there is an additional way that also turns left. + Note: the route turn is not contained + Left means more than min_turn_limit, less is straight on */ + if (angle_delta(w->angle2,itm->angle_end) < ret->delta) + turn_no_of_route_way++; /* this way is on the left side of the route way */ + } + w = w->next; + } + } else { /* next turns or bends right. Same investigation, but mirrored. */ + while (w) { + if (angle_delta(w->angle2,itm->angle_end) > min_turn_limit) { + more_ways_for_strength++; + if (angle_delta(w->angle2,itm->angle_end) > ret->delta) + turn_no_of_route_way++; /* this way is on the right side of the route way */ + } + w = w->next; + } + } + + + // Investigate the strengthening of announcement. + switch (more_ways_for_strength) { + case 0: + // Only one possibility to turn to this direction + if (ret->delta < -sharp_turn_limit) { + ret->maneuver->type = type_nav_left_3; /* strongly left */ + } else if (ret->delta <= 0) { + ret->maneuver->type = type_nav_left_2; /* normally left */ + } else if (ret->delta <= sharp_turn_limit) { + ret->maneuver->type = type_nav_right_2;/* normally right */ + } else { + ret->maneuver->type = type_nav_right_3;/* strongly right */ + } + break; + case 1: + /* One additional possibility to turn to the same direction */ + if (turn_no_of_route_way == 0) { + // the route is less strong to turn + if (ret->delta < -turn_2_limit) { + ret->maneuver->type = type_nav_left_2; /* normally left */ + } else if (ret->delta <= 0) { + ret->maneuver->type = type_nav_left_1; /* easily left */ + } else if (ret->delta <= turn_2_limit) { + ret->maneuver->type = type_nav_right_1; /* easily right */ + } else { + ret->maneuver->type = type_nav_right_2; /* normally right */ + } + } else { + if (ret->delta < -sharp_turn_limit) { + ret->maneuver->type = type_nav_left_3; /* strongly left */ + } else if (ret->delta <= 0) { + ret->maneuver->type = type_nav_left_2; /* normally left */ + } else if (ret->delta <= sharp_turn_limit) { + ret->maneuver->type = type_nav_right_2; /* normally right */ + } else { + ret->maneuver->type = type_nav_right_3; /* strongly right */ + } + } + break; + default: + /* Two or more additional possibilities to turn to the same direction. */ + if (turn_no_of_route_way == 0) { + if (ret->delta < -turn_2_limit) { + ret->maneuver->type = type_nav_left_2; /* normally left */ + } else if (ret->delta <= 0) { + ret->maneuver->type = type_nav_left_1; /* easily left */ + } else if (ret->delta <= turn_2_limit) { + ret->maneuver->type = type_nav_right_1; /* easily right */ + } else { + ret->maneuver->type = type_nav_right_2; /* normally right */ + } + } + else if (turn_no_of_route_way == 1) { + if (ret->delta < -sharp_turn_limit) { + ret->maneuver->type = type_nav_left_3; /* strongly left */ + } else if (ret->delta <= 0) { + ret->maneuver->type = type_nav_left_2; /* normally left */ + } else if (ret->delta <= sharp_turn_limit) { + ret->maneuver->type = type_nav_right_2; /* normally right */ + } else { + ret->maneuver->type = type_nav_right_3; /* strongly right */ + } + } + else if (turn_no_of_route_way > 1) { + // if the route is the strongest of all possible turns here + if (ret->delta < -u_turn_limit) { + ret->maneuver->type = type_nav_turnaround_left; /* turn around left */ + } else if (ret->delta < -sharp_turn_limit) { + ret->maneuver->type = type_nav_left_3; /* strongly left */ + } else if (ret->delta <= 0) { + ret->maneuver->type = type_nav_left_2; /* normally left */ + } else if (ret->delta <= sharp_turn_limit) { + ret->maneuver->type = type_nav_right_2; /* normally right */ + } else if (ret->delta <= u_turn_limit) { + ret->maneuver->type = type_nav_right_3; /* strongly right */ + } else { + ret->maneuver->type = type_nav_turnaround_right; /* turn around right */ + } + } + break; + } + } else { + /* if the route goes straight: + * If there's another way on one side of the route within 2 * min_turn_limit (not both - the expression below is a logical XOR), + * the maneuver is "keep left" or "keep right", else it is "go straight". + * Note that neighbors are not necessarily straight. + * The boundary may need some tweaking, (2 * min_turn_limit) may not be ideal but it's a first shot which ensures that other straight ways + * will always fulfill the neighbor criteria. */ + int has_left_neighbor = (ret->maneuver->left - ret->delta > 2 * -min_turn_limit); + int has_right_neighbor = (ret->maneuver->right - ret->delta < 2 * min_turn_limit); + if (!(has_left_neighbor) != !(has_right_neighbor)) { + if (has_left_neighbor) + ret->maneuver->type = type_nav_keep_right; + else + ret->maneuver->type = type_nav_keep_left; + } else + ret->maneuver->type = type_nav_straight; + } /* endif ret->delta */ } - dbg(lvl_debug,"entry %d exit %d\n", entry_angle, exit_angle); - ret->roundabout_delta=angle_delta(entry_angle, exit_angle); - ret->length=len+roundabout_extra_length; } + if (this_->cmd_last) { this_->cmd_last->next=ret; ret->prev = this_->cmd_last; @@ -1553,25 +2927,34 @@ command_new(struct navigation *this_, struct navigation_itm *itm, int delta) return ret; } + +/** + * @brief Creates turn instructions where needed + * + * @param this_ The navigation object for which to create turn instructions + * @param route Not used + */ static void make_maneuvers(struct navigation *this_, struct route *route) { struct navigation_itm *itm, *last=NULL, *last_itm=NULL; - int delta; + struct navigation_maneuver *maneuver; itm=this_->first; this_->cmd_last=NULL; this_->cmd_first=NULL; while (itm) { if (last) { - if (maneuver_required2(this_, last_itm, itm,&delta,NULL)) { - command_new(this_, itm, delta); + if (maneuver_required2(this_, last_itm, itm, &maneuver)) { + command_new(this_, itm, maneuver); } } else last=itm; last_itm=itm; itm=itm->next; } - command_new(this_, last_itm, 0); + maneuver = g_new0(struct navigation_maneuver, 1); + maneuver->type = type_nav_destination; + command_new(this_, last_itm, maneuver); } static int @@ -1584,6 +2967,8 @@ contains_suffix(char *name, char *suffix) return !navit_utf8_strcasecmp(name+strlen(name)-strlen(suffix), suffix); } + + static char * replace_suffix(char *name, char *search, char *replace) { @@ -1598,86 +2983,132 @@ replace_suffix(char *name, char *search, char *replace) return ret; } + + +/** + * @brief Creates a text description for the destination of a maneuver, which can be used in announcements. + * + * @param nav The navigation object + * @param cmd The {@code navigation_command} for which to generate an announcement + * @param next The current navigation item. In speech mode this should be set to the navigation + * item starting at the vehicle's current position; in route description mode this should be set to + * the {@code navigation_item} associated with the previous {@code navigation_command} + * @param prefix A space will be added as a prefix to the string returned, or a null string for no prefix + */ static char * -navigation_item_destination(struct navigation *nav, struct navigation_itm *itm, struct navigation_itm *next, char *prefix) +navigation_item_destination(struct navigation *nav, struct navigation_command *cmd, struct navigation_itm *next, char *prefix) { - char *ret=NULL,*name1,*sep,*name2; - char *n1,*n2; - int i,sex; - int vocabulary1=65535; - int vocabulary2=65535; + char *ret = NULL, *name1 = NULL, *sep = "", *name2 = ""; + char *name = NULL, *name_systematic=NULL; + int i, gender = unknown; + int vocabulary1=1; + int vocabulary2=1; struct attr attr; + struct navigation_itm *itm = cmd->itm; + struct navigation_itm *itm_pre = NULL; + struct navigation_itm *itm_post = NULL; if (! prefix) prefix=""; + /* check the configuration of navit.xml */ if (nav->speech && speech_get_attr(nav->speech, attr_vocabulary_name, &attr, NULL)) - vocabulary1=attr.u.num; + vocabulary1=attr.u.num; /* shall the street name be announced? */ if (nav->speech && speech_get_attr(nav->speech, attr_vocabulary_name_systematic, &attr, NULL)) - vocabulary2=attr.u.num; - n1=itm->way.name1; - n2=itm->way.name2; - if (!vocabulary1) - n1=NULL; - if (!vocabulary2) - n2=NULL; - if(!n1 && !n2 && itm->way.item.type == type_ramp && vocabulary2) { - dbg(lvl_debug,">> Next is ramp %x current is %x \n", itm->way.item.type, next->way.item.type); - - if(next->way.item.type == type_ramp) - return NULL; - if(itm->way.item.type == type_highway_city || itm->way.item.type == type_highway_land ) - return g_strdup_printf("%s%s",prefix,_("exit")); /* %FIXME Can this even be reached? */ - else - return g_strdup_printf("%s%s",prefix,_("into the ramp")); - - } - if (!n1 && !n2) - return NULL; - if (n1) { - sex=-1; - name1=NULL; - for (i = 0 ; i < sizeof(suffixes)/sizeof(suffixes[0]) ; i++) { - if (contains_suffix(n1,suffixes[i].fullname)) { - sex=suffixes[i].sex; - name1=g_strdup(n1); + vocabulary2=attr.u.num; /* shall the systematic name be announced? */ + + /* On motorway links don't announce the name of the ramp as this is done by name_systematic and the street_destination. */ + if (vocabulary1 && (itm->way.item.type != type_ramp)) + name=itm->way.name; + + if (vocabulary2) + name_systematic=itm->way.name_systematic; + + if (name) { + name1 = g_strdup(name); + for (i = 0; i < sizeof(suffixes)/sizeof(suffixes[0]); i++) { + if (contains_suffix(name, suffixes[i].fullname)) { + gender = suffixes[i].gender; + g_free(name1); + name1 = g_strdup(name); break; } - if (contains_suffix(n1,suffixes[i].abbrev)) { - sex=suffixes[i].sex; - name1=replace_suffix(n1, suffixes[i].abbrev, suffixes[i].fullname); + if (contains_suffix(name, suffixes[i].abbrev)) { + gender = suffixes[i].gender; + g_free(name1); + name1 = replace_suffix(name, suffixes[i].abbrev, suffixes[i].fullname); break; } } - if (n2) { - name2=n2; + if (name_systematic) { + name2 = name_systematic; sep=" "; - } else { - name2=""; - sep=""; } - switch (sex) { - case -1: + } else + name1 = g_strdup(""); + + if (cmd->maneuver && cmd->maneuver->type && (cmd->maneuver->merge_or_exit & mex_merge)) { + if (name_systematic) + /* TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name */ + ret = g_strdup_printf(_("%1$sonto the %2$s%3$s%4$s"), prefix, name_systematic, sep, name1); + else if (name) + switch (gender) { + case unknown: + /* TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name */ + ret = g_strdup_printf(_("%1$sonto %2$s"), prefix, name1); + break; + case masculine: + /* TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included */ + ret=g_strdup_printf(_("%1$sonto %2$s|masculine form"), prefix, name1); + break; + case feminine: + /* TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included */ + ret=g_strdup_printf(_("%1$sonto %2$s|feminine form"), prefix, name1); + break; + case neuter: + /* TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included */ + ret=g_strdup_printf(_("%1$sonto %2$s|neuter form"), prefix, name1); + break; + } + else ret = g_strdup(""); + } else if (!name && !name_systematic && itm->way.item.type == type_ramp && (!cmd->maneuver || (cmd->maneuver->merge_or_exit != mex_interchange))) { + itm_pre = itm->prev; + while (itm_pre && (itm_pre->way.item.type == type_ramp)) + itm_pre = itm_pre->prev; + itm_post = itm->next; + while (itm_post && (itm_post->way.item.type == type_ramp) && (!cmd->next || (itm_post != cmd->next->itm))) + itm_post = itm_post->next; + if (((itm_post) && is_motorway_like(&(itm_post->way), 0)) + && ((itm_pre) && !is_motorway_like(&(itm_pre->way), 0))) + /* TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. */ + ret = g_strdup_printf("%s%s",prefix,_("onto the motorway ramp")); /* This is only announced when there is no additional info about the ramp and the ramp leads to a motorway. */ + else + ret = g_strdup(""); + } else if (!name && !name_systematic) + ret = g_strdup(""); + else if (name) { + switch (gender) { + case unknown: /* TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name */ - ret=g_strdup_printf(_("%sinto the street %s%s%s"),prefix,n1, sep, name2); + ret=g_strdup_printf(_("%sinto %s%s%s"), prefix, name, sep, name2); break; - case 1: - /* TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included */ - ret=g_strdup_printf(_("%sinto the %s%s%s|male form"),prefix,name1, sep, name2); + case masculine: + /* TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included */ + ret=g_strdup_printf(_("%sinto %s%s%s|masculine form"), prefix, name1, sep, name2); break; - case 2: - /* TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included */ - ret=g_strdup_printf(_("%sinto the %s%s%s|female form"),prefix,name1, sep, name2); + case feminine: + /* TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included */ + ret=g_strdup_printf(_("%sinto %s%s%s|feminine form"), prefix, name1, sep, name2); break; - case 3: - /* TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included */ - ret=g_strdup_printf(_("%sinto the %s%s%s|neutral form"),prefix,name1, sep, name2); + case neuter: + /* TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included */ + ret=g_strdup_printf(_("%sinto %s%s%s|neuter form"), prefix, name1, sep, name2); break; } - g_free(name1); } else /* TRANSLATORS: gives the name of the next road to turn into (into the E17) */ - ret=g_strdup_printf(_("%sinto the %s"),prefix,n2); + ret=g_strdup_printf(_("%sinto the %s"),prefix,name_systematic); + g_free(name1); name1=ret; while (name1 && *name1) { switch (*name1) { @@ -1689,213 +3120,457 @@ navigation_item_destination(struct navigation *nav, struct navigation_itm *itm, break; default: name1++; + break; } } return ret; } + +/** + * @brief Formats the exit ref and name for display and speech output + * + * This function takes the navigation command for a motorway maneuver (exit or interchange) and + * returns a string describing the exit. + * + * If the exit has a name and ref and the name is different from {@code street_destination_announce}, + * a string of the form "ref name" is returned. If only one of the two is different from NULL, it + * is returned unchanged. + * + * If the name matches {@code street_destination_announce}, it is always treated as if it were NULL. + * This prevents redundancy in announcements. + * + * No checks are done that the maneuver actually has the appropriate merge_or_exit flags set. The + * caller is responsible for performing such checks prior to calling this function. + * + * @param this_ The navigation command + * @param street_destination_announce The name of the street following the maneuver. This argument + * may be NULL, in which case the exit name will not be suppressed. + */ +static char * +navigation_cmd_get_exit_announce(struct navigation_command *this_, char *street_destination_announce) { + char * ret = NULL; + char *folded_exit_label=NULL; + char *folded_street_destination_announce=NULL; + + if (this_->itm->way.exit_label) { + folded_exit_label = linguistics_casefold(this_->itm->way.exit_label); + if (street_destination_announce) + folded_street_destination_announce = linguistics_casefold(street_destination_announce); + else + folded_street_destination_announce = g_strdup(""); + + if (!strstr(folded_street_destination_announce, folded_exit_label)) { /* No redundancy? */ + if (this_->itm->way.exit_ref) + ret = g_strdup_printf("%1$s %2$s", this_->itm->way.exit_ref, this_->itm->way.exit_label); + else + ret = g_strdup_printf("%1$s", this_->itm->way.exit_label); + } else if (this_->itm->way.exit_ref) + ret = g_strdup_printf("%1$s", this_->itm->way.exit_ref); + + } else { + if (this_->itm->way.exit_ref) + ret = g_strdup_printf("%1$s", this_->itm->way.exit_ref); + } + + g_free(folded_exit_label); + g_free(folded_street_destination_announce); + + return ret; +} + + +/** + * @brief Creates turn by turn guidance sentences for the speech and for the route description + * + * @param nav The navigation object + * @param itm The current navigation item, which is used to determine the distance to the next + * maneuver. In speech mode this should be set to the navigation item starting at the vehicle's + * current position; in route description mode this should be set to the {@code navigation_item} + * associated with the previous {@code navigation_command} + * @param cmd The {@code navigation_command} for which to generate an announcement + * @param type The type of announcements to generate. Set to {@code attr_navigation_long_exact} + * to avoid rounding distances, or to {@code attr_navigation_speech} to avoid announcing street + * names more than once + * @param connect Whether this is the second of two connected announcements, as in "turn left + * in..., then turn right" + */ static char * show_maneuver(struct navigation *nav, struct navigation_itm *itm, struct navigation_command *cmd, enum attr_type type, int connect) { - /* TRANSLATORS: right, as in 'Turn right' */ - const char *dir=_("right"),*strength=""; + int distance=itm->dest_length-cmd->itm->dest_length; - char *d,*ret=NULL; - int delta=cmd->delta; + char *d=NULL,*ret=NULL; + char *street_destination_announce=NULL; int level; - int strength_needed; - int skip_roads; + int skip_roads = 0; int count_roundabout; struct navigation_itm *cur; - struct navigation_way *w; - - if (connect) { - level = -2; // level = -2 means "connect to another maneuver via 'then ...'" - } else { - level=1; - } - - w = itm->next->way.next; - strength_needed = 0; - if (angle_delta(itm->next->way.angle2,itm->angle_end) < 0) { - while (w) { - if (angle_delta(w->angle2,itm->angle_end) < 0) { - strength_needed = 1; - break; - } - w = w->next; - } - } else { - while (w) { - if (angle_delta(w->angle2,itm->angle_end) > 0) { - strength_needed = 1; - break; - } - w = w->next; - } - } + int tellstreetname = 0; + char * at = NULL; /* Motorway junction name */ + char * direction = NULL; /* The direction-dependent part of the maneuver */ + char *destination = NULL; + char *street_destination = NULL; + char * instruction = NULL; + char * strength = NULL; /* Strength of the turn */ + + if (connect) + level = -2; /* level = -2 means "connect to another maneuver via 'then ...'" */ + else + level = 1; - if (delta < 0) { - /* TRANSLATORS: left, as in 'Turn left' */ - dir=_("left"); - delta=-delta; - } - if (strength_needed) { - if (delta < 45) { - /* TRANSLATORS: Don't forget the ending space */ - strength=_("easily "); - } else if (delta < 105) { - strength=""; - } else if (delta < 165) { - /* TRANSLATORS: Don't forget the ending space */ - strength=_("strongly "); - } else if (delta < 180) { - /* TRANSLATORS: Don't forget the ending space */ - strength=_("really strongly "); - } else { - dbg(lvl_debug,"delta=%d\n", delta); - /* TRANSLATORS: Don't forget the ending space */ - strength=_("unknown "); - } - } - if (type != attr_navigation_long_exact) + if (type != attr_navigation_long_exact) distance=round_distance(distance); - if (type == attr_navigation_speech) { - if (nav->turn_around && nav->turn_around == nav->turn_around_limit) { + if (type == attr_navigation_speech) + { + if (nav->turn_around && nav->turn_around == nav->turn_around_limit) + { navigation_set_turnaround(nav, nav->turn_around_count+1); return g_strdup(_("When possible, please turn around")); } navigation_set_turnaround(nav, 0); - if (!connect) { + if (!connect) level=navigation_get_announce_level_cmd(nav, itm, cmd, distance-cmd->length); - } dbg(lvl_debug,"distance=%d level=%d type=0x%x\n", distance, level, itm->way.item.type); } - if (cmd->itm->prev->way.flags & AF_ROUNDABOUT) { + + street_destination=select_announced_destinations(cmd); + if (street_destination) + /* TRANSLATORS: the argument is the destination to follow */ + street_destination_announce=g_strdup_printf(_("towards %s"),street_destination); + else street_destination_announce=g_strdup(""); + g_free(street_destination); + + if (cmd->itm->prev->way.flags & AF_ROUNDABOUT) + { cur = cmd->itm->prev; count_roundabout = 0; - while (cur && (cur->way.flags & AF_ROUNDABOUT)) { - if (cur->next->way.next && is_way_allowed(nav,cur->next->way.next,3)) { // If the next segment has no exit or the exit isn't allowed, don't count it + while (cur && (cur->way.flags & AF_ROUNDABOUT)) + { + if (cur->next->way.next && is_way_allowed(nav,cur->next->way.next,3)) + /* If the next segment has no exit or the exit isn't allowed, don't count it */ count_roundabout++; - } cur = cur->prev; } - switch (level) { - case 2: - return g_strdup(_("Enter the roundabout soon")); - case 1: - d = get_distance(nav, distance, type, 0); - /* TRANSLATORS: %s is the distance to the roundabout */ - ret = g_strdup_printf(_("Enter the roundabout %s"), d); - g_free(d); - return ret; - case -2: - return g_strdup_printf(_("then leave the roundabout at the %s"), get_exit_count_str(count_roundabout)); - case 0: - return g_strdup_printf(_("Leave the roundabout at the %s"), get_exit_count_str(count_roundabout)); + switch (level) + { + case 3: + d=get_distance(nav, distance, type, 1); + return g_strdup_printf(_("Follow the road for the next %s"), d); + case 2: + return g_strdup(_("Enter the roundabout soon")); + case 1: + d = get_distance(nav, distance, type, 0); + /* TRANSLATORS: %s is the distance to the roundabout */ + ret = g_strdup_printf(_("Enter the roundabout %s"), d); + g_free(d); + return ret; + case -2: + /* TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow */ + return g_strdup_printf(_("then leave the roundabout at the %1$s %2$s"), get_exit_count_str(count_roundabout),street_destination_announce); + case 0: + /* TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow */ + return g_strdup_printf(_("Leave the roundabout at the %1$s %2$s"), get_exit_count_str(count_roundabout),street_destination_announce); } } - switch(level) { - case 3: - d=get_distance(nav, distance, type, 1); - ret=g_strdup_printf(_("Follow the road for the next %s"), d); - g_free(d); - return ret; - case 2: - d=g_strdup(_("soon")); - break; - case 1: - d=get_distance(nav, distance, attr_navigation_short, 0); - break; - case 0: - skip_roads = count_possible_turns(nav,cmd->prev?cmd->prev->itm:nav->first,cmd->itm,cmd->delta); - if (skip_roads > 0 && cmd->itm->next) { - if (get_count_str(skip_roads+1)) { - /* TRANSLATORS: First argument is the how manieth street to take, second the direction */ - ret = g_strdup_printf(_("Take the %1$s road to the %2$s"), get_count_str(skip_roads+1), dir); - return ret; - } else { - d = g_strdup_printf(_("after %i roads"), skip_roads); + if (cmd->maneuver && cmd->maneuver->type) + { + if (cmd->itm->next) + { + if(type == attr_navigation_speech) + { /* In voice mode */ + /* In Voice Mode only tell the street name in level 1 or in level 0 if level 1 was skipped */ + if (level == 1) + { /* we are close to the intersection */ + cmd->itm->streetname_told = 1; /* remember to be checked when we turn */ + tellstreetname = 1; /* Ok, so we tell the name of the street */ + } + if (level == 0) + { + if(cmd->itm->streetname_told == 0) /* we are right at the intersection */ + tellstreetname = 1; + else + cmd->itm->streetname_told = 0; /* reset just in case we come to the same street again */ + } + } - } else { - d=g_strdup(_("now")); + else + tellstreetname = 1; } - break; - case -2: - skip_roads = count_possible_turns(nav,cmd->prev->itm,cmd->itm,cmd->delta); - if (skip_roads > 0) { - /* TRANSLATORS: First argument is the how manieth street to take, second the direction */ - if (get_count_str(skip_roads+1)) { - ret = g_strdup_printf(_("then take the %1$s road to the %2$s"), get_count_str(skip_roads+1), dir); - return ret; - } else { - d = g_strdup_printf(_("after %i roads"), skip_roads); - } - } else { - d = g_strdup(""); + + switch (level) + { + case 2 : + d=g_strdup(_("soon")); + break; + case 1 : + d=get_distance(nav, distance, attr_navigation_short, 0); + break; + case 0 : + d=g_strdup(_("now")); + break; + case -2 : + d=g_strdup(_("then")); + break; + default : + d = g_strdup(""); + break; } - break; - default: - d=g_strdup(_("error")); - } - if (cmd->itm->next) { - int tellstreetname = 0; - char *destination = NULL; - - if(type == attr_navigation_speech) { // In voice mode - // In Voice Mode only tell the street name in level 1 or in level 0 if level 1 - // was skipped - if (level == 1) { // we are close to the intersection - cmd->itm->streetname_told = 1; // remeber to be checked when we turn - tellstreetname = 1; // Ok so we tell the name of the street - } + if (tellstreetname) + destination=navigation_item_destination(nav, cmd, itm, " "); + else destination = g_strdup(""); - if (level == 0) { - if(cmd->itm->streetname_told == 0) // we are right at the intersection - tellstreetname = 1; - else - cmd->itm->streetname_told = 0; // reset just in case we come to the same street again + if (!(cmd->maneuver->merge_or_exit == mex_none )) + { + char *exit_announce=NULL; + + /* interchange or exit announcement shall be a long distance information only. + But if so, exit_label shall not be announced in case it is a substring + of destination info to avoid redundancy and not let the sentence become too long. + Otherwise, if there is no additional destination info, just say it at level 1. */ + if ((level == 2) || ((level == 1) && (!street_destination_announce && !destination)) || (type != attr_navigation_speech)) { + exit_announce = navigation_cmd_get_exit_announce(cmd, street_destination_announce); } - } - else - tellstreetname = 1; + switch (cmd->maneuver->merge_or_exit) + { + case mex_merge_left: + case mex_merge_right: + if (cmd->maneuver->merge_or_exit == mex_merge_right) { + if (level == -2) + /* TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. */ + instruction = g_strdup_printf(_("then merge%1$s|right"), d); + else + /* TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. */ + instruction = g_strdup_printf(_("Merge %1$s%2$s|right"), d, destination); + } else { + if (level == -2) + /* TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. */ + instruction = g_strdup_printf(_("then merge%1$s|left"), d); + else + /* TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. */ + instruction = g_strdup_printf(_("Merge %1$s%2$s|left"), d, destination); + } + break; + case mex_exit_left: + case mex_exit_right: + direction = (cmd->maneuver->merge_or_exit == mex_exit_left) ? + g_strdup(_("on your left")) : + g_strdup(_("on your right")); + if (exit_announce) + /* TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance */ + instruction = g_strdup_printf(_("Take exit %1$s %2$s %3$s"), exit_announce, direction, d); + else + /* TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination */ + instruction = g_strdup_printf(_("Take the exit %1$s %2$s%3$s"), direction, d, destination); - if(nav->tell_street_name && tellstreetname) - destination=navigation_item_destination(nav, cmd->itm, itm, " "); + break; + } - if (level != -2) { - /* TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' */ - ret=g_strdup_printf(_("Turn %1$s%2$s %3$s%4$s"), strength, dir, d, destination ? destination:""); - } else { - /* TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination */ - ret=g_strdup_printf(_("then turn %1$s%2$s %3$s%4$s"), strength, dir, d, destination ? destination:""); + if (!instruction && exit_announce) { + /* TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" */ + at = g_strdup_printf(" %1$s %2$s", cmd->maneuver->merge_or_exit == mex_interchange ? (_("at interchange")) : (_( "at exit")), + exit_announce ? exit_announce : ""); + } + g_free(exit_announce); } - g_free(destination); - } else { - if (!connect) { - ret=g_strdup_printf(_("You have reached your destination %s"), d); - } else { - ret=g_strdup(_("then you have reached your destination.")); + if (!instruction) { + if (!at) + at = g_strdup(""); + switch (cmd->maneuver->type) { + case type_nav_straight : + if (level == -2) + /* TRANSLATORS: the arg. is where to do the maneuver */ + instruction = g_strdup_printf(_("then continue straight%1$s"), at); + else + /* TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination */ + instruction = g_strdup_printf(_("Continue straight %1$s%2$s%3$s"), d, at, destination); + break; + case type_nav_keep_right : + if (level == -2) + /* TRANSLATORS: the arg. is where to do the maneuver */ + instruction = g_strdup_printf(_("then keep right%1$s"), at); + else + /* TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination */ + instruction = g_strdup_printf(_("Keep right %1$s%2$s%3$s"), d, at, destination); + break; + case type_nav_keep_left : + if (level == -2) + /* TRANSLATORS: the arg. is where to do the maneuver */ + instruction = g_strdup_printf(_("then keep left%1$s"), at); + else + /* TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination */ + instruction = g_strdup_printf(_("Keep left %1$s%2$s%3$s"), d, at, destination); + break; + case type_nav_right_1 : + case type_nav_right_2 : + case type_nav_right_3 : + case type_nav_left_1 : + case type_nav_left_2 : + case type_nav_left_3 : + /* generic turn case */ + switch (cmd->maneuver->type) { + case type_nav_right_1 : + case type_nav_right_2 : + case type_nav_right_3 : + /* TRANSLATORS: "right" as in "turn right" */ + direction = g_strdup(_("right")); + if (level==-2 || level == 0) + skip_roads = count_possible_turns(nav,cmd->prev ? cmd->prev->itm : nav->first,cmd->itm,90); + break; + case type_nav_left_1 : + case type_nav_left_2 : + case type_nav_left_3 : + /* TRANSLATORS: "left" as in "turn left" */ + direction = g_strdup(_("left")); + if (level==-2 || level == 0) + skip_roads = count_possible_turns(nav,cmd->prev ? cmd->prev->itm : nav->first,cmd->itm,-90); + break; + default: + direction = g_strdup(""); + break; + } + switch (cmd->maneuver->type) { + case type_nav_right_1 : + case type_nav_left_1 : + /* TRANSLATORS: as in "turn easily right" */ + strength = g_strdup(_("easily ")); + break; + case type_nav_right_3 : + case type_nav_left_3 : + /* TRANSLATORS: as in "turn strongly right" */ + strength = g_strdup(_("strongly ")); + break; + default: + strength = g_strdup(""); + break; + } + if (skip_roads) { + if (skip_roads < 6) + instruction = g_strdup_printf(_("Take the %1$s road to the %2$s"), get_count_str(skip_roads+1), direction); + /*and preserve skip_roads to signal we already have an instruction*/ + else { + g_free(d); + d=g_strdup_printf(_("after %i roads"),skip_roads); + skip_roads = 0; /*signal an instruction still has to be created*/ + } + } + if (!skip_roads) /* cave: no else - may come from 'if (skip_roads)' above ! */ + /* TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination */ + instruction = g_strdup_printf(_("Turn %1$s%2$s %3$s%4$s"), strength, direction, d, destination); + break; + case type_nav_turnaround_left: + if (level == -2) + /* TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. */ + instruction = g_strdup(_("then make a U-turn|left")); + else + /* TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. */ + instruction = g_strdup_printf(_("Make a U-turn %1$s|left"), d); + break; + case type_nav_turnaround_right: + if (level == -2) + /* TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. */ + instruction = g_strdup(_("then make a U-turn|right")); + else + /* TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. */ + instruction = g_strdup_printf(_("Make a U-turn %1$s|right"), d); + break; + case type_nav_none: + /*An empty placeholder that we can use in the future for + * some motorway commands that are now suppressed but we + * can in some cases make it say here : + * 'follow destination blabla' without any further driving instructions, + * in cases where relevant destination info is available. + * Even if there is no driving command to be announced, in some cases + * there is an overhead roadsign in preparation of an upcoming road-split, + * and then we can give usefull info to the driver. + * + * UNTESTED ! + * + */ + instruction = g_strdup(_("follow")); + break; + case type_nav_destination: + /* the old code used to clear the route destination when this was the only + * instruction left. Was that usefull ? + * Should be tested with the old code what happens if the driver + * 'overshoots' the destination and the route destination is already cleared. + * I suppose it will now keep guiding the user to destination untill another one + * is set or a 'stop navigation' action is done using the gui. + */ + if (level == -2) + instruction=g_strdup(_("then you have reached your destination.")); + else + /* TRANSLATORS: the arg. is distance */ + instruction=g_strdup_printf(_("You have reached your destination %s"), d); + break; + default: + dbg(lvl_error,"unhandled instruction\n"); + break; + } } - if (type == attr_navigation_speech && (nav->flags & 1)) - route_set_destination(nav->route, NULL, 0); - } + switch (level) + { + case 3: + d=get_distance(nav, distance, type, 1); + ret=g_strdup_printf(_("Follow the road for the next %s"), d); + break; + case 2: + if (at) /* 'at' contains interchange or exit information that shall not be combined with street_destination_announce */ + ret= g_strdup_printf(("%1$s %2$s"),instruction,""); + else + ret= g_strdup_printf(("%1$s %2$s"),instruction,street_destination_announce); + break; + case 1: + ret= g_strdup_printf(("%1$s %2$s"),instruction,street_destination_announce); + break; + case -2: + ret= g_strdup_printf(("%1$s %2$s"),instruction,street_destination_announce); + break; + case 0: + ret= g_strdup_printf(("%1$s %2$s"),instruction,street_destination_announce); + break; + default : + ret= g_strdup_printf(("%1$s %2$s"),instruction,street_destination_announce); + dbg(lvl_error,"unevaluated speech level\n"); + break; + } + + g_free(at); g_free(d); + g_free(destination); + g_free(direction); + g_free(instruction); + g_free(street_destination_announce); + g_free(strength); return ret; + } + /** * @brief Creates announcements for maneuvers, plus maneuvers immediately following the next maneuver * - * This function does create an announcement for the current maneuver and for maneuvers - * immediately following that maneuver, if these are too close and we're in speech navigation. + * This function creates an announcement for the current maneuver and for maneuvers + * immediately following that maneuver, if these are very close and we're in speech navigation. + * The actual announcements are created by calling {@code show_maneuver()}. + * + * @param nav The navigation object + * @param itm The current navigation item, which is used to determine the distance to the next + * maneuver. In speech mode this should be set to the navigation item starting at the vehicle's + * current position; in route description mode this should be set to the {@code navigation_item} + * associated with the previous {@code navigation_command} + * @param cmd The {@code navigation_command} for which to generate an announcement + * @param type The type of announcements to generate. If set to {@code attr_navigation_speech}, + * maneuvers will be grouped ("turn left, then turn right") if we are close to the first maneuver + * and the second maneuver is within a short distance from the first. This parameter is passed to + * {@code show_maneuver()}, where it is evaluated again. See {@code show_maneuver()} for details. * * @return An announcement that should be made */ @@ -1909,13 +3584,13 @@ show_next_maneuvers(struct navigation *nav, struct navigation_itm *itm, struct n char *ret,*old,*buf,*next; if (type != attr_navigation_speech) { - return show_maneuver(nav, itm, cmd, type, 0); // We accumulate maneuvers only in speech navigation + return show_maneuver(nav, itm, cmd, type, 0); /* We accumulate maneuvers only in speech navigation */ } level=navigation_get_announce_level(nav, itm->way.item.type, distance-cmd->length); if (level > 1) { - return show_maneuver(nav, itm, cmd, type, 0); // We accumulate maneuvers only if they are close + return show_maneuver(nav, itm, cmd, type, 0); /* We accumulate maneuvers only if they are close */ } if (cmd->itm->told) { @@ -1930,8 +3605,8 @@ show_next_maneuvers(struct navigation *nav, struct navigation_itm *itm, struct n prev = cmd; i = 0; while (cur && cur->itm) { - // We don't merge more than 3 announcements... - if (i > 1) { // if you change this, please also change the value below, that is used to terminate the loop + /* We don't merge more than 3 announcements... */ + if (i > 1) { /* if you change this, please also change the value below, that is used to terminate the loop */ break; } @@ -1942,13 +3617,13 @@ show_next_maneuvers(struct navigation *nav, struct navigation_itm *itm, struct n speech_time = -1; g_free(next); - if (speech_time == -1) { // user didn't set cps - speech_time = 30; // assume 3 seconds + if (speech_time == -1) { /* user didn't set cps */ + speech_time = 30; /* assume 3 seconds */ } time = navigation_time(prev->itm,cur->itm->prev); - if (time >= (speech_time + 30)) { // 3 seconds for understanding what has been said + if (time >= (speech_time + 30)) { /* 3 seconds for understanding what has been said */ break; } @@ -1959,12 +3634,12 @@ show_next_maneuvers(struct navigation *nav, struct navigation_itm *itm, struct n if (nav->speech && speech_estimate_duration(nav->speech,ret) > time2nav) { g_free(ret); ret = old; - i = 2; // This will terminate the loop + i = 2; /* This will terminate the loop */ } else { g_free(old); } - // If the two maneuvers are *really* close, we shouldn't tell the second one again, because TTS won't be fast enough + /* If the two maneuvers are *really* close, we shouldn't tell the second one again, because TTS won't be fast enough */ if (time <= speech_time) { cur->itm->told = 1; } @@ -2209,13 +3884,16 @@ navigation_map_item_coord_rewind(void *priv_data) this->ccount=0; } + static int navigation_map_item_attr_get(void *priv_data, enum attr_type attr_type, struct attr *attr) { struct map_rect_priv *this_=priv_data; struct navigation_command *cmd=this_->cmd; + struct navigation_maneuver *maneuver = NULL; struct navigation_itm *itm=this_->itm; struct navigation_itm *prev=itm->prev; + char *exit_announce=NULL; attr->type=attr_type; if (this_->str) { @@ -2225,8 +3903,10 @@ navigation_map_item_attr_get(void *priv_data, enum attr_type attr_type, struct a if (cmd) { if (cmd->itm != itm) - cmd=NULL; + cmd=NULL; } + if (cmd && cmd->maneuver) + maneuver = cmd->maneuver; switch(attr_type) { case attr_level: if (cmd) { @@ -2287,16 +3967,46 @@ navigation_map_item_attr_get(void *priv_data, enum attr_type attr_type, struct a this_->attr_next=attr_street_name; return 1; case attr_street_name: - attr->u.str=itm->way.name1; + attr->u.str=itm->way.name; this_->attr_next=attr_street_name_systematic; - if (attr->u.str) - return 1; + if (attr->u.str){ + return 1;} return 0; case attr_street_name_systematic: - attr->u.str=itm->way.name2; + attr->u.str=itm->way.name_systematic; + this_->attr_next=attr_street_destination; + if (attr->u.str){ + return 1;} + return 0; + case attr_street_destination: + this_->attr_next=attr_name; + if (cmd && itm->way.destination && itm->way.destination->destination) + this_->str=attr->u.str=select_announced_destinations(cmd); + else attr->u.str=NULL; + if (attr->u.str){ + return 1;} + return 0; + + case attr_name: + /* attr_name returns exit_ref and exit_label if available, + * preceded by the word 'exit' or 'interchange'. + * + * Otherwise it returns street name and name_systematic, if available + * + * FIXME should a new attr. be defined for this, and if yes, which ? + */ this_->attr_next=attr_debug; - if (attr->u.str) - return 1; + attr->u.str=NULL; + exit_announce = navigation_cmd_get_exit_announce(cmd, NULL); + if (exit_announce && maneuver) + /* TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" */ + this_->str=attr->u.str=g_strdup_printf("%s %s", maneuver->merge_or_exit & mex_interchange ? (_("Interchange")) : (_("Exit")), + exit_announce ? exit_announce : ""); + else if (itm->way.name || itm->way.name_systematic) + this_->str=attr->u.str=g_strdup_printf("%s %s", + itm->way.name ? itm->way.name : "",itm->way.name_systematic ? itm->way.name_systematic : ""); + if (attr->u.str){ + return 1;} return 0; case attr_debug: switch(this_->debug_idx) { @@ -2317,13 +4027,13 @@ navigation_map_item_attr_get(void *priv_data, enum attr_type attr_type, struct a case 3: this_->debug_idx++; if (prev) { - this_->str=attr->u.str=g_strdup_printf("prev street_name:%s", prev->way.name1); + this_->str=attr->u.str=g_strdup_printf("prev street_name:%s", prev->way.name); return 1; } case 4: this_->debug_idx++; if (prev) { - this_->str=attr->u.str=g_strdup_printf("prev street_name_systematic:%s", prev->way.name2); + this_->str=attr->u.str=g_strdup_printf("prev street_name_systematic:%s", prev->way.name_systematic); return 1; } case 5: @@ -2349,10 +4059,24 @@ navigation_map_item_attr_get(void *priv_data, enum attr_type attr_type, struct a case 8: this_->debug_idx++; if (prev) { - int delta=0; - char *reason=NULL; - maneuver_required2(this_->nav, prev, itm, &delta, &reason); - this_->str=attr->u.str=g_strdup_printf("reason:%s",reason); + struct navigation_maneuver *maneuver = NULL; + maneuver_required2(this_->nav, prev, itm, &maneuver); + this_->str=attr->u.str=g_strdup_printf("type: %s, is_complex_t_junction: %d, is_same_street: %d, is_unambiguous: %d, merge_or_exit: %d, old_cat: %d, new_cat: %d, max_cat: %d, num_options: %d, num_similar_ways: %d, num_new_motorways: %d, num_other_ways: %d, left: %d, right: %d, delta: %d", + item_to_name(maneuver->type), + maneuver->is_complex_t_junction, + maneuver->is_same_street, + maneuver->is_unambiguous, + maneuver->merge_or_exit, + maneuver->old_cat, + maneuver->new_cat, + maneuver->max_cat, + maneuver->num_options, + maneuver->num_similar_ways, + maneuver->num_new_motorways, + maneuver->num_other_ways, + maneuver->left, + maneuver->right, + maneuver->delta); return 1; } @@ -2423,11 +4147,30 @@ navigation_map_rect_destroy(struct map_rect_priv *priv) g_free(priv); } +/** + * @brief Gets the next item from the navigation map. + * + * This function returns an item from a map rectangle on the navigation map and advances the item pointer, + * so that at the next call the next item will be returned. + * + * The {@code type} member of the result, which indicates the type of maneuver, is generally copied over from + * {@code maneuver->type}, though some exceptions apply: The first item in the map will have a type of + * {@code nav_position} and the last one will have a type of {@code nav_destination}. + * If {@code maneuver->merge_or_exit} indicates a merge or exit, the result will be of the corresponding + * merge or exit type. + * + * Earlier versions of Navit had the entire logic for setting the maneuver type in this function, but this has + * been moved to {@code command_new()} so that other functions can use the same results. + * + * @param priv The {@code struct map_rect_priv} of the map rect on the navigation map from which an item + * is to be retrieved. + * + * @return The item, or NULL if there are no more items in the map rectangle + */ static struct item * navigation_map_get_item(struct map_rect_priv *priv) { struct item *ret=&priv->item; - int delta; if (!priv->itm_next) return NULL; priv->itm=priv->itm_next; @@ -2446,75 +4189,32 @@ navigation_map_get_item(struct map_rect_priv *priv) priv->cmd_itm_next=priv->cmd->itm; priv->cmd_next=priv->cmd->next; if (priv->cmd_itm_next && !priv->cmd_itm_next->next) - ret->type=type_nav_destination; - else { - if (priv->itm && priv->itm->prev && !(priv->itm->way.flags & AF_ROUNDABOUT) && (priv->itm->prev->way.flags & AF_ROUNDABOUT)) { - enum item_type r=type_none,l=type_none; - switch (((180+22)-priv->cmd->roundabout_delta)/45) { - case 0: - case 1: - r=type_nav_roundabout_r1; - l=type_nav_roundabout_l7; - break; - case 2: - r=type_nav_roundabout_r2; - l=type_nav_roundabout_l6; - break; - case 3: - r=type_nav_roundabout_r3; - l=type_nav_roundabout_l5; - break; - case 4: - r=type_nav_roundabout_r4; - l=type_nav_roundabout_l4; - break; - case 5: - r=type_nav_roundabout_r5; - l=type_nav_roundabout_l3; - break; - case 6: - r=type_nav_roundabout_r6; - l=type_nav_roundabout_l2; - break; - case 7: - r=type_nav_roundabout_r7; - l=type_nav_roundabout_l1; - break; - case 8: - r=type_nav_roundabout_r8; - l=type_nav_roundabout_l8; - break; - } - dbg(lvl_debug,"delta %d\n",priv->cmd->delta); - if (priv->cmd->delta < 0) - ret->type=l; - else - ret->type=r; - } else { - delta=priv->cmd->delta; - if (delta < 0) { - delta=-delta; - if (delta < 45) - ret->type=type_nav_left_1; - else if (delta < 105) - ret->type=type_nav_left_2; - else if (delta < 165) - ret->type=type_nav_left_3; - else - ret->type=type_none; - } else { - if (delta < 45) - ret->type=type_nav_right_1; - else if (delta < 105) - ret->type=type_nav_right_2; - else if (delta < 165) - ret->type=type_nav_right_3; - else - ret->type=type_none; - } + ret->type=type_nav_destination; /* FIXME: do we need to set that here? The generic case should catch that now... */ + else if (priv->cmd->maneuver && ((priv->cmd->maneuver->type != type_nav_none) || (priv->cmd->maneuver->merge_or_exit & (mex_merge | mex_exit)))) { + /* if maneuver type or merge_or_exit is set, use these values */ + /* FIXME: make decision to use merge_or_exit context-dependent */ + switch (priv->cmd->maneuver->merge_or_exit) { + case mex_merge_left: + ret->type=type_nav_merge_left; + break; + case mex_merge_right: + ret->type=type_nav_merge_right; + break; + case mex_exit_left: + ret->type=type_nav_exit_left; + break; + case mex_exit_right: + ret->type=type_nav_exit_right; + break; + default: + /* exit or merge without a direction should never happen, + * mex_intersection results in a regular instruction, + * thus all these are handled by the default case, + * which is to return the type field */ + ret->type = priv->cmd->maneuver->type; } - } - } + } /* else if priv->cmd->maneuver ... */ + } /* if priv->cmd->itm == priv->itm */ navigation_map_item_coord_rewind(priv); navigation_map_item_attr_rewind(priv); @@ -2523,6 +4223,25 @@ navigation_map_get_item(struct map_rect_priv *priv) return ret; } +/** + * @brief Gets the item with the specified ID from the navigation map. + * + * This function returns the item with the ID specified in the arguments from a map rectangle on the + * navigation map. + * + * Internally the function calls {@code navigation_map_get_item()}, thus the same logic applies for the + * data of the item that is returned. See {@code navigation_map_get_item()} for details. + * + * The item pointer of the map rectangle will be moved so that a subsequent call to {@code navigation_map_get_item()} + * will return the next item following the one returned by this function. + * + * @param priv The {@code struct map_rect_priv} of the map rect on the navigation map from which an item + * is to be retrieved. + * @param id_hi The high part of the ID + * @param id_lo The low part of the ID + * + * @return The item, or NULL if an item with the ID specified was not found in the map rectangle + */ static struct item * navigation_map_get_item_byid(struct map_rect_priv *priv, int id_hi, int id_lo) { diff --git a/navit/navit_shipped.xml b/navit/navit_shipped.xml index b20547bfd..e6945ea4a 100644 --- a/navit/navit_shipped.xml +++ b/navit/navit_shipped.xml @@ -184,434 +184,124 @@ Waypoint</text></img> <tracking cdf_histsize="0"/> <vehicleprofile name="car" route_depth="4:25%,8:40000,18:10000" flags="0x4000000" flags_forward_mask="0x4000002" flags_reverse_mask="0x4000001" maxspeed_handling="0" route_mode="0" static_speed="5" static_distance="25"> - <roadprofile item_types="street_0,street_1_city,living_street,street_service,track_gravelled,track_unpaved,street_parking_lane" speed="10" route_weight="10"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="street_2_city,track_paved" speed="30" route_weight="30"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="street_3_city" speed="40" route_weight="40"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="street_4_city" speed="50" route_weight="50"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="highway_city" speed="80" route_weight="80"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="street_1_land" speed="60" route_weight="60"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="street_2_land" speed="65" route_weight="65"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="street_3_land" speed="70" route_weight="70"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="street_4_land" speed="80" route_weight="80"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="street_n_lanes" speed="120" route_weight="120"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="highway_land" speed="120" route_weight="120"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="ramp" speed="40" route_weight="40"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> + <roadprofile item_types="street_0,street_1_city,living_street,street_service,track_gravelled,track_unpaved,street_parking_lane" speed="10" route_weight="10" /> + <roadprofile item_types="street_2_city,track_paved" speed="30" route_weight="30" /> + <roadprofile item_types="street_3_city" speed="40" route_weight="40" /> + <roadprofile item_types="street_4_city" speed="50" route_weight="50" /> + <roadprofile item_types="highway_city" speed="80" route_weight="80" /> + <roadprofile item_types="street_1_land" speed="60" route_weight="60" /> + <roadprofile item_types="street_2_land" speed="65" route_weight="65" /> + <roadprofile item_types="street_3_land" speed="70" route_weight="70" /> + <roadprofile item_types="street_4_land" speed="80" route_weight="80" /> + <roadprofile item_types="street_n_lanes" speed="120" route_weight="120" /> + <roadprofile item_types="highway_land" speed="120" route_weight="120" /> + <roadprofile item_types="ramp" speed="40" route_weight="40" /> + <!--roundabout does not apply to OSMaps --> <roadprofile item_types="roundabout" speed="10" route_weight="10"/> <roadprofile item_types="ferry" speed="40" route_weight="40"/> - <profile_option name="shortest"> - <roadprofile item_types="street_0,street_1_city,living_street,street_service,track_gravelled,track_unpaved,street_parking_lane,street_2_city,track_paved,street_3_city,street_4_city,highway_city,street_1_land,street_2_land,street_3_land,street_4_land,street_n_lanes,highway_land,ramp,roundabout,ferry" route_weight="60" /> - </profile_option> - <profile_option name="avoid_tolls" flags_forward_mask="0x4000402" flags_reverse_mask="0x4000401" /> - <profile_option name="pedantic" route_depth="18:25%,18:40000" /> </vehicleprofile> <vehicleprofile name="car_shortest" flags="0x4000000" flags_forward_mask="0x4000002" flags_reverse_mask="0x4000001" maxspeed_handling="0" route_mode="0" static_speed="5" static_distance="25"> - <roadprofile item_types="street_0,street_1_city,living_street,street_service,track_gravelled,track_unpaved,street_parking_lane" speed="10" route_weight="60"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="street_2_city,track_paved" speed="30" route_weight="60"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="street_3_city" speed="40" route_weight="60"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="street_4_city" speed="50" route_weight="60"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="highway_city" speed="80" route_weight="60"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="street_1_land" speed="60" route_weight="60"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="street_2_land" speed="65" route_weight="60"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="street_3_land" speed="70" route_weight="60"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="street_4_land" speed="80" route_weight="60"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="street_n_lanes" speed="120" route_weight="60"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="highway_land" speed="120" route_weight="60"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="ramp" speed="40" route_weight="60"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> + <roadprofile item_types="street_0,street_1_city,living_street,street_service,track_gravelled,track_unpaved,street_parking_lane" speed="10" route_weight="60" /> + <roadprofile item_types="street_2_city,track_paved" speed="30" route_weight="60" /> + <roadprofile item_types="street_3_city" speed="40" route_weight="60" /> + <roadprofile item_types="street_4_city" speed="50" route_weight="60" /> + <roadprofile item_types="highway_city" speed="80" route_weight="60" /> + <roadprofile item_types="street_1_land" speed="60" route_weight="60" /> + <roadprofile item_types="street_2_land" speed="65" route_weight="60" /> + <roadprofile item_types="street_3_land" speed="70" route_weight="60" /> + <roadprofile item_types="street_4_land" speed="80" route_weight="60" /> + <roadprofile item_types="street_n_lanes" speed="120" route_weight="60" /> + <roadprofile item_types="highway_land" speed="120" route_weight="60" /> + <roadprofile item_types="ramp" speed="40" route_weight="60" /> + <!--roundabout does not apply to OSMaps --> <roadprofile item_types="roundabout" speed="10" route_weight="60"/> <roadprofile item_types="ferry" speed="40" route_weight="60"/> </vehicleprofile> <vehicleprofile name="car_avoid_tolls" flags="0x4000000" flags_forward_mask="0x4000402" flags_reverse_mask="0x4000001" maxspeed_handling="0" route_mode="0" static_speed="5" static_distance="25"> - <roadprofile item_types="street_0,street_1_city,living_street,street_service,track_gravelled,track_unpaved,street_parking_lane" speed="10" route_weight="10"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="street_2_city,track_paved" speed="30" route_weight="30"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="street_3_city" speed="40" route_weight="40"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="street_4_city" speed="50" route_weight="50"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="highway_city" speed="80" route_weight="80"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="street_1_land" speed="60" route_weight="60"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="street_2_land" speed="65" route_weight="65"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="street_3_land" speed="70" route_weight="70"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="street_4_land" speed="80" route_weight="80"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="street_n_lanes" speed="120" route_weight="120"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="highway_land" speed="120" route_weight="120"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="ramp" speed="40" route_weight="40"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> + <roadprofile item_types="street_0,street_1_city,living_street,street_service,track_gravelled,track_unpaved,street_parking_lane" speed="10" route_weight="10"/> + <roadprofile item_types="street_2_city,track_paved" speed="30" route_weight="30"/> + <roadprofile item_types="street_3_city" speed="40" route_weight="40"/> + <roadprofile item_types="street_4_city" speed="50" route_weight="50"/> + <roadprofile item_types="highway_city" speed="80" route_weight="80"/> + <roadprofile item_types="street_1_land" speed="60" route_weight="60"/> + <roadprofile item_types="street_2_land" speed="65" route_weight="65"/> + <roadprofile item_types="street_3_land" speed="70" route_weight="70"/> + <roadprofile item_types="street_4_land" speed="80" route_weight="80"/> + <roadprofile item_types="street_n_lanes" speed="120" route_weight="120"/> + <roadprofile item_types="highway_land" speed="120" route_weight="120"/> + <roadprofile item_types="ramp" speed="40" route_weight="40"/> + <!--roundabout does not apply to OSMaps --> <roadprofile item_types="roundabout" speed="10" route_weight="10"/> <roadprofile item_types="ferry" speed="40" route_weight="40"/> </vehicleprofile> <vehicleprofile name="car_pedantic" route_depth="18:25%,18:40000" flags="0x4000000" flags_forward_mask="0x4000002" flags_reverse_mask="0x4000001" maxspeed_handling="0" route_mode="0" static_speed="5" static_distance="25"> - <roadprofile item_types="street_0,street_1_city,living_street,street_service,track_gravelled,track_unpaved,street_parking_lane" speed="10" route_weight="10"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="street_2_city,track_paved" speed="30" route_weight="30"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="street_3_city" speed="40" route_weight="40"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="street_4_city" speed="50" route_weight="50"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="highway_city" speed="80" route_weight="80"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="street_1_land" speed="60" route_weight="60"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="street_2_land" speed="65" route_weight="65"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="street_3_land" speed="70" route_weight="70"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="street_4_land" speed="80" route_weight="80"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="street_n_lanes" speed="120" route_weight="120"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="highway_land" speed="120" route_weight="120"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="ramp" speed="40" route_weight="40"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> + <roadprofile item_types="street_0,street_1_city,living_street,street_service,track_gravelled,track_unpaved,street_parking_lane" speed="10" route_weight="10"/> + <roadprofile item_types="street_2_city,track_paved" speed="30" route_weight="30"/> + <roadprofile item_types="street_3_city" speed="40" route_weight="40"/> + <roadprofile item_types="street_4_city" speed="50" route_weight="50"/> + <roadprofile item_types="highway_city" speed="80" route_weight="80"/> + <roadprofile item_types="street_1_land" speed="60" route_weight="60"/> + <roadprofile item_types="street_2_land" speed="65" route_weight="65"/> + <roadprofile item_types="street_3_land" speed="70" route_weight="70"/> + <roadprofile item_types="street_4_land" speed="80" route_weight="80"/> + <roadprofile item_types="street_n_lanes" speed="120" route_weight="120"/> + <roadprofile item_types="highway_land" speed="120" route_weight="120"/> + <roadprofile item_types="ramp" speed="40" route_weight="40"/> + <!--roundabout does not apply to OSMaps --> <roadprofile item_types="roundabout" speed="10" route_weight="10"/> <roadprofile item_types="ferry" speed="40" route_weight="40"/> </vehicleprofile> <vehicleprofile name="bike" route_depth="18:25%,18:40000" flags="0x40000000" flags_forward_mask="0x40000000" flags_reverse_mask="0x40000000" maxspeed_handling="1" route_mode="0" static_speed="5" static_distance="25"> - <roadprofile item_types="steps" speed="2" route_weight="5"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="street_pedestrian,footway" speed="5" route_weight="10"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="path,track_ground" speed="12" route_weight="12"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="track_gravelled" speed="17" route_weight="15"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> + <roadprofile item_types="steps" speed="2" route_weight="5" /> + <roadprofile item_types="street_pedestrian,footway" speed="5" route_weight="10" /> + <roadprofile item_types="path,track_ground" speed="12" route_weight="12" /> + <roadprofile item_types="track_gravelled" speed="17" route_weight="15" /> <!-- cycleways, paved tracks, serviceways etc. are the favourite ways --> - <roadprofile item_types="track_paved,cycleway,street_service,street_parking_lane" speed="22" route_weight="20"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> + <roadprofile item_types="track_paved,cycleway,street_service,street_parking_lane" speed="22" route_weight="20" /> <!-- residential, unclassified, living street etc. --> - <roadprofile item_types="street_0,street_1_city,living_street" speed="20" route_weight="15"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> + <roadprofile item_types="street_0,street_1_city,living_street" speed="20" route_weight="15" /> <!-- tertiary and minor roads are acceptable, but should be avoided in favour of tracks and cycleways --> - <roadprofile item_types="street_2_city,street_1_land,street_2_land" speed="22" route_weight="12"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> + <roadprofile item_types="street_2_city,street_1_land,street_2_land" speed="22" route_weight="12" /> <!-- secondary etc. are acceptable when necessary --> - <roadprofile item_types="street_3_city" speed="22" route_weight="10"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> + <roadprofile item_types="street_3_city" speed="22" route_weight="10" /> <!-- primary, trunk etc. should be avoided --> - <roadprofile item_types="street_4_city,ramp" speed="22" route_weight="7"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> + <roadprofile item_types="street_4_city,ramp" speed="22" route_weight="7" /> <!-- Those types do not appear in maptool.c and therefore are not used ATM --> - <roadprofile item_types="street_3_land,street_4_land" speed="20" route_weight="7"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> + <roadprofile item_types="street_3_land,street_4_land" speed="20" route_weight="7" /> + <!--roundabout does not apply to OSMaps --> <roadprofile item_types="roundabout" speed="20" route_weight="10"/> <roadprofile item_types="ferry" speed="40" route_weight="40"/> </vehicleprofile> <vehicleprofile name="pedestrian" route_depth="18:25%,18:10000" flags="0x80000000" flags_forward_mask="0x80000000" flags_reverse_mask="0x80000000" maxspeed_handling="1" route_mode="0" static_speed="3" static_distance="10"> - <roadprofile item_types="footway,bridleway,path,steps" speed="5" route_weight="5"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="hiking_mountain" speed="4" route_weight="4"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="living_street,street_pedestrian" speed="5" route_weight="5"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="track_gravelled,track_unpaved,track_grass,track_ground,hiking" speed="5" route_weight="5"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="track_paved" speed="5" route_weight="5"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="cycleway" speed="5" route_weight="5"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="street_0,street_1_city,street_2_city" speed="5" route_weight="5"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="street_3_city,street_4_city,street_service,street_parking_lane" speed="5" route_weight="5"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="street_1_land,street_2_land" speed="5" route_weight="5"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="street_3_land,street_4_land" speed="5" route_weight="5"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> + <roadprofile item_types="footway,bridleway,path,steps" speed="5" route_weight="5"/> + <roadprofile item_types="hiking_mountain" speed="4" route_weight="4"/> + <roadprofile item_types="living_street,street_pedestrian" speed="5" route_weight="5"/> + <roadprofile item_types="track_gravelled,track_unpaved,track_grass,track_ground,hiking" speed="5" route_weight="5"/> + <roadprofile item_types="track_paved" speed="5" route_weight="5"/> + <roadprofile item_types="cycleway" speed="5" route_weight="5"/> + <roadprofile item_types="street_0,street_1_city,street_2_city" speed="5" route_weight="5"/> + <roadprofile item_types="street_3_city,street_4_city,street_service,street_parking_lane" speed="5" route_weight="5"/> + <roadprofile item_types="street_1_land,street_2_land" speed="5" route_weight="5"/> + <roadprofile item_types="street_3_land,street_4_land" speed="5" route_weight="5"/> + <!--roundabout does not apply to OSMaps --> <roadprofile item_types="roundabout" speed="5" route_weight="5"/> <roadprofile item_types="ferry" speed="40" route_weight="40"/> </vehicleprofile> <vehicleprofile name="horse" route_depth="18:25%,18:40000" flags="0x20000000" flags_forward_mask="0x20000000" flags_reverse_mask="0x20000000" maxspeed_handling="1" route_mode="0" static_speed="3" static_distance="10"> - <roadprofile item_types="bridleway" speed="10" route_weight="10"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="footway,path,steps" speed="5" route_weight="5"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="living_street,street_pedestrian" speed="5" route_weight="4"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="track_gravelled" speed="5" route_weight="5"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="track_paved" speed="5" route_weight="5"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="cycleway" speed="5" route_weight="5"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="street_0,street_1_city,street_2_city" speed="5" route_weight="2"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="street_3_city,street_4_city,street_service,street_parking_lane" speed="5" route_weight="4"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="street_1_land,street_2_land" speed="5" route_weight="2"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="street_3_land,street_4_land" speed="5" route_weight="4"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> + <roadprofile item_types="bridleway" speed="10" route_weight="10"/> + <roadprofile item_types="footway,path,steps" speed="5" route_weight="5"/> + <roadprofile item_types="living_street,street_pedestrian" speed="5" route_weight="4"/> + <roadprofile item_types="track_gravelled" speed="5" route_weight="5"/> + <roadprofile item_types="track_paved" speed="5" route_weight="5"/> + <roadprofile item_types="cycleway" speed="5" route_weight="5"/> + <roadprofile item_types="street_0,street_1_city,street_2_city" speed="5" route_weight="2"/> + <roadprofile item_types="street_3_city,street_4_city,street_service,street_parking_lane" speed="5" route_weight="4"/> + <roadprofile item_types="street_1_land,street_2_land" speed="5" route_weight="2"/> + <roadprofile item_types="street_3_land,street_4_land" speed="5" route_weight="4"/> + <!--roundabout does not apply to OSMaps --> <roadprofile item_types="roundabout" speed="5" route_weight="2"/> <roadprofile item_types="ferry" speed="40" route_weight="40"/> </vehicleprofile> @@ -642,66 +332,19 @@ Waypoint</text></img> static_distance="25" vehicle_width="274" vehicle_height="411" vehicle_length="2134" vehicle_weight="36287" vehicle_axle_weight="15422"> - <roadprofile item_types="street_0,street_1_city,living_street,street_service,track_gravelled,track_unpaved,street_parking_lane" speed="10" route_weight="5"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="street_2_city,track_paved" speed="20" route_weight="20"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="street_3_city" speed="30" route_weight="30"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="street_4_city" speed="40" route_weight="40"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="highway_city" speed="70" route_weight="70"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="street_1_land" speed="50" route_weight="50"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="street_2_land" speed="55" route_weight="55"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="street_3_land" speed="60" route_weight="60"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="street_4_land" speed="70" route_weight="70"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="street_n_lanes" speed="80" route_weight="80"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="highway_land" speed="80" route_weight="80"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> - <roadprofile item_types="ramp" speed="30" route_weight="30"> - <announcement level="0"/> - <announcement level="1"/> - <announcement level="2"/> - </roadprofile> + <roadprofile item_types="street_0,street_1_city,living_street,street_service,track_gravelled,track_unpaved,street_parking_lane" speed="10" route_weight="5" /> + <roadprofile item_types="street_2_city,track_paved" speed="20" route_weight="20"/> + <roadprofile item_types="street_3_city" speed="30" route_weight="30"/> + <roadprofile item_types="street_4_city" speed="40" route_weight="40"/> + <roadprofile item_types="highway_city" speed="70" route_weight="70"/> + <roadprofile item_types="street_1_land" speed="50" route_weight="50"/> + <roadprofile item_types="street_2_land" speed="55" route_weight="55"/> + <roadprofile item_types="street_3_land" speed="60" route_weight="60"/> + <roadprofile item_types="street_4_land" speed="70" route_weight="70"/> + <roadprofile item_types="street_n_lanes" speed="80" route_weight="80"/> + <roadprofile item_types="highway_land" speed="80" route_weight="80"/> + <roadprofile item_types="ramp" speed="30" route_weight="30"/> + <!--roundabout does not apply to OSMaps --> <roadprofile item_types="roundabout" speed="5" route_weight="5"/> <roadprofile item_types="ferry" speed="40" route_weight="40"/> </vehicleprofile> @@ -710,7 +353,7 @@ Waypoint</text></img> <route destination_distance="50"/> <navigation> - <announce type="street_0,street_1_city" level0="25" level1="100" level2="200" unit="m"/> + <announce type="street_0,street_1_city,street_parking_lane" level0="25" level1="100" level2="200" unit="m"/> <announce type="street_2_city,street_3_city,street_4_city,ramp" level0="50" level1="200" level2="500" unit="m"/> <announce type="highway_city,street_1_land,street_2_land,street_3_land,street_4_land" level0="100" level1="400" level2="1000" unit="m"/> <announce type="street_n_lanes,highway_land" level0="300" level1="1000" level2="2000" unit="m"/> @@ -1861,9 +1504,12 @@ Waypoint</text></img> <itemgra item_types="nav_straight" order="0-"> <icon src="nav_straight_bk.svg" w="32" h="32"/> </itemgra> - <itemgra item_types="nav_turnaround" order="0-"> + <itemgra item_types="nav_turnaround_left" order="0-"> <icon src="nav_turnaround_left_bk.svg" w="32" h="32"/> </itemgra> + <itemgra item_types="nav_turnaround_right" order="0-"> + <icon src="nav_turnaround_right_bk.svg" w="32" h="32"/> + </itemgra> <itemgra item_types="nav_roundabout_l1" order="0-"> <icon src="nav_roundabout_l1_bk.svg" w="32" h="32"/> </itemgra> @@ -1912,6 +1558,24 @@ Waypoint</text></img> <itemgra item_types="nav_roundabout_r8" order="0-"> <icon src="nav_roundabout_r8_bk.svg" w="32" h="32"/> </itemgra> + <itemgra item_types="nav_keep_left" order="0-"> + <icon src="nav_keep_left_bk.svg" w="32" h="32"/> + </itemgra> + <itemgra item_types="nav_merge_left" order="0-"> + <icon src="nav_merge_left_bk.svg" w="32" h="32"/> + </itemgra> + <itemgra item_types="nav_keep_right" order="0-"> + <icon src="nav_keep_right_bk.svg" w="32" h="32"/> + </itemgra> + <itemgra item_types="nav_merge_right" order="0-"> + <icon src="nav_merge_right_bk.svg" w="32" h="32"/> + </itemgra> + <itemgra item_types="nav_exit_left" order="0-"> + <icon src="nav_exit_left_bk.svg" w="32" h="32"/> + </itemgra> + <itemgra item_types="nav_exit_right" order="0-"> + <icon src="nav_exit_right_bk.svg" w="32" h="32"/> + </itemgra> <itemgra item_types="route_end" order="0-"> <icon src="nav_destination_bk.svg" w="32" h="32" x="4" y="30"/> </itemgra> @@ -3324,9 +2988,12 @@ Waypoint</text></img> <itemgra item_types="nav_straight" order="0-"> <icon src="nav_straight_bk.svg" w="32" h="32"/> </itemgra> - <itemgra item_types="nav_turnaround" order="0-"> + <itemgra item_types="nav_turnaround_left" order="0-"> <icon src="nav_turnaround_left_bk.svg" w="32" h="32"/> </itemgra> + <itemgra item_types="nav_turnaround_right" order="0-"> + <icon src="nav_turnaround_right_bk.svg" w="32" h="32"/> + </itemgra> <itemgra item_types="nav_roundabout_l1" order="0-"> <icon src="nav_roundabout_l1_bk.svg" w="32" h="32"/> </itemgra> @@ -3375,6 +3042,24 @@ Waypoint</text></img> <itemgra item_types="nav_roundabout_r8" order="0-"> <icon src="nav_roundabout_r8_bk.svg" w="32" h="32"/> </itemgra> + <itemgra item_types="nav_keep_left" order="0-"> + <icon src="nav_keep_left_bk.svg" w="32" h="32"/> + </itemgra> + <itemgra item_types="nav_merge_left" order="0-"> + <icon src="nav_merge_left_bk.svg" w="32" h="32"/> + </itemgra> + <itemgra item_types="nav_keep_right" order="0-"> + <icon src="nav_keep_right_bk.svg" w="32" h="32"/> + </itemgra> + <itemgra item_types="nav_merge_right" order="0-"> + <icon src="nav_merge_right_bk.svg" w="32" h="32"/> + </itemgra> + <itemgra item_types="nav_exit_left" order="0-"> + <icon src="nav_exit_left_bk.svg" w="32" h="32"/> + </itemgra> + <itemgra item_types="nav_exit_right" order="0-"> + <icon src="nav_exit_right_bk.svg" w="32" h="32"/> + </itemgra> <itemgra item_types="route_end" order="0-"> <icon src="nav_destination_wh.svg" w="32" h="32" x="4" y="30"/> </itemgra> @@ -4646,9 +4331,12 @@ Waypoint</text></img> <itemgra item_types="nav_straight" order="0-"> <icon src="nav_straight_bk.png" w="32" h="32" /> </itemgra> - <itemgra item_types="nav_turnaround" order="0-"> + <itemgra item_types="nav_turnaround_left" order="0-"> <icon src="nav_turnaround_left_bk.png" w="32" h="32" /> </itemgra> + <itemgra item_types="nav_turnaround_right" order="0-"> + <icon src="nav_turnaround_right_bk.png" w="32" h="32" /> + </itemgra> <itemgra item_types="nav_roundabout_l1" order="0-"> <icon src="nav_roundabout_l1_bk.png" w="32" h="32" /> </itemgra> @@ -4697,6 +4385,24 @@ Waypoint</text></img> <itemgra item_types="nav_roundabout_r8" order="0-"> <icon src="nav_roundabout_r8_bk.png" w="32" h="32" /> </itemgra> + <itemgra item_types="nav_keep_left" order="0-"> + <icon src="nav_keep_left_bk.png" w="32" h="32"/> + </itemgra> + <itemgra item_types="nav_merge_left" order="0-"> + <icon src="nav_merge_left_bk.png" w="32" h="32"/> + </itemgra> + <itemgra item_types="nav_keep_right" order="0-"> + <icon src="nav_keep_right_bk.png" w="32" h="32"/> + </itemgra> + <itemgra item_types="nav_merge_right" order="0-"> + <icon src="nav_merge_right_bk.png" w="32" h="32"/> + </itemgra> + <itemgra item_types="nav_exit_left" order="0-"> + <icon src="nav_exit_left_bk.png" w="32" h="32"/> + </itemgra> + <itemgra item_types="nav_exit_right" order="0-"> + <icon src="nav_exit_right_bk.png" w="32" h="32"/> + </itemgra> <itemgra item_types="route_end" order="0-"> <icon src="nav_destination_bk.png" w="32" h="32" x="4" y="30"/> </itemgra> @@ -6298,9 +6004,12 @@ Waypoint</text></img> <itemgra item_types="nav_straight" order="0-"> <icon src="nav_straight_bk.svg" w="32" h="32"/> </itemgra> - <itemgra item_types="nav_turnaround" order="0-"> + <itemgra item_types="nav_turnaround_left" order="0-"> <icon src="nav_turnaround_left_bk.svg" w="32" h="32"/> </itemgra> + <itemgra item_types="nav_turnaround_right" order="0-"> + <icon src="nav_turnaround_right_bk.svg" w="32" h="32"/> + </itemgra> <itemgra item_types="nav_roundabout_l1" order="0-"> <icon src="nav_roundabout_l1_bk.svg" w="32" h="32"/> </itemgra> @@ -6349,6 +6058,24 @@ Waypoint</text></img> <itemgra item_types="nav_roundabout_r8" order="0-"> <icon src="nav_roundabout_r8_bk.svg" w="32" h="32"/> </itemgra> + <itemgra item_types="nav_keep_left" order="0-"> + <icon src="nav_keep_left_bk.svg" w="32" h="32"/> + </itemgra> + <itemgra item_types="nav_merge_left" order="0-"> + <icon src="nav_merge_left_bk.svg" w="32" h="32"/> + </itemgra> + <itemgra item_types="nav_keep_right" order="0-"> + <icon src="nav_keep_right_bk.svg" w="32" h="32"/> + </itemgra> + <itemgra item_types="nav_merge_right" order="0-"> + <icon src="nav_merge_right_bk.svg" w="32" h="32"/> + </itemgra> + <itemgra item_types="nav_exit_left" order="0-"> + <icon src="nav_exit_left_bk.svg" w="32" h="32"/> + </itemgra> + <itemgra item_types="nav_exit_right" order="0-"> + <icon src="nav_exit_right_bk.svg" w="32" h="32"/> + </itemgra> <itemgra item_types="route_end" order="0-"> <icon src="nav_destination_bk.svg" w="32" h="32" x="4" y="30"/> </itemgra> diff --git a/navit/transform.c b/navit/transform.c index c708fc42b..76e676906 100644 --- a/navit/transform.c +++ b/navit/transform.c @@ -1368,6 +1368,15 @@ atan2_int(int dx, int dy) } #endif +/** + * @brief Gets the bearing from one point to another + * + * @param c1 The first coordinate + * @param c2 The second coordinate + * @param dir The direction: if it is -1, the bearing from c2 to c1 is returned, else the bearing from c1 to c2 + * + * @return The bearing in degrees, {@code 0 <= result < 360}. + */ int transform_get_angle_delta(struct coord *c1, struct coord *c2, int dir) { diff --git a/navit/xpm/nav_exit_left_bk.svg b/navit/xpm/nav_exit_left_bk.svg new file mode 100644 index 000000000..057e5011d --- /dev/null +++ b/navit/xpm/nav_exit_left_bk.svg @@ -0,0 +1,114 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="64px" + height="64px" + id="svg2" + version="1.1" + inkscape:version="0.48.5 r10040" + sodipodi:docname="nav_exit_right_bk.svg"> + <metadata + id="metadata14"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs12" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1280" + inkscape:window-height="948" + id="namedview10" + showgrid="false" + inkscape:zoom="11.859375" + inkscape:cx="32" + inkscape:cy="32" + inkscape:window-x="0" + inkscape:window-y="24" + inkscape:window-maximized="1" + inkscape:current-layer="svg2" + showguides="true" + inkscape:guide-bbox="true" + inkscape:snap-global="true" + inkscape:snap-bbox="true" + inkscape:object-paths="true" + inkscape:snap-nodes="true"> + <sodipodi:guide + orientation="0,1" + position="0,63" + id="guide2987" /> + <sodipodi:guide + orientation="0,1" + position="0,1" + id="guide2989" /> + <sodipodi:guide + orientation="1,0" + position="1,0" + id="guide2991" /> + <sodipodi:guide + orientation="1,0" + position="63,0" + id="guide2993" /> + <sodipodi:guide + orientation="1,0" + position="32,0" + id="guide3038" /> + <sodipodi:guide + orientation="0,1" + position="0,60.5" + id="guide3040" /> + </sodipodi:namedview> + <g + transform="matrix(-0.00399274,0,0,0.00286166,72.012396,-4.1975012)" + id="g3848" + style="fill:#000000"> + <path + transform="matrix(28.222223,0,0,28.222223,-3.2693192e-4,0)" + inkscape:connector-curvature="0" + id="path3076" + d="m 304.15565,64.35416 17.04892,767.6852 75.15314,0 75.15315,0 -139.64771,-767.6852 z" + style="fill:#000000;stroke:none" + sodipodi:nodetypes="cccccc" /> + <path + transform="matrix(28.222223,0,0,28.222223,-3.2693192e-4,0)" + inkscape:connector-curvature="0" + id="path3078" + d="m 256.04066,64.354161 -134.7887,767.685199 150.30709,0 12.18912,-767.685199 z" + style="fill:#000000;stroke:none" /> + </g> + <g + id="g4" + transform="matrix(-1,0,0,1,59.349255,0)"> + <path + inkscape:connector-curvature="0" + d="M 32,63 32,42 C 32,31 32,31 42,20" + style="fill:none;stroke:#000000;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + id="path6" /> + <path + inkscape:connector-curvature="0" + transform="matrix(2.1213203,2.1213203,-2.1213203,2.1213203,42,20)" + d="M -4,1 0,-7 4,1 C 2,-1 -2,-1 -4,1" + style="fill:#000000;stroke:#000000;stroke-linejoin:round" + id="path8" /> + </g> +</svg> diff --git a/navit/xpm/nav_exit_left_wh.svg b/navit/xpm/nav_exit_left_wh.svg new file mode 100644 index 000000000..8ba55649e --- /dev/null +++ b/navit/xpm/nav_exit_left_wh.svg @@ -0,0 +1,114 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="64px" + height="64px" + id="svg2" + version="1.1" + inkscape:version="0.48.5 r10040" + sodipodi:docname="nav_exit_right_wh.svg"> + <metadata + id="metadata14"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs12" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1280" + inkscape:window-height="948" + id="namedview10" + showgrid="false" + inkscape:zoom="11.859375" + inkscape:cx="33.349144" + inkscape:cy="29.976285" + inkscape:window-x="0" + inkscape:window-y="24" + inkscape:window-maximized="1" + inkscape:current-layer="svg2" + showguides="true" + inkscape:guide-bbox="true" + inkscape:snap-global="true" + inkscape:snap-bbox="true" + inkscape:object-paths="true" + inkscape:snap-nodes="true"> + <sodipodi:guide + orientation="0,1" + position="0,63" + id="guide2987" /> + <sodipodi:guide + orientation="0,1" + position="0,1" + id="guide2989" /> + <sodipodi:guide + orientation="1,0" + position="1,0" + id="guide2991" /> + <sodipodi:guide + orientation="1,0" + position="63,0" + id="guide2993" /> + <sodipodi:guide + orientation="1,0" + position="32,0" + id="guide3038" /> + <sodipodi:guide + orientation="0,1" + position="0,60.5" + id="guide3040" /> + </sodipodi:namedview> + <g + transform="matrix(-0.00399274,0,0,0.00286166,72.012396,-4.1975012)" + id="g3848" + style="fill:#ffffff"> + <path + transform="matrix(28.222223,0,0,28.222223,-3.2693192e-4,0)" + inkscape:connector-curvature="0" + id="path3076" + d="m 304.15565,64.35416 17.04892,767.6852 75.15314,0 75.15315,0 -139.64771,-767.6852 z" + style="fill:#ffffff;stroke:none" + sodipodi:nodetypes="cccccc" /> + <path + transform="matrix(28.222223,0,0,28.222223,-3.2693192e-4,0)" + inkscape:connector-curvature="0" + id="path3078" + d="m 256.04066,64.354161 -134.7887,767.685199 150.30709,0 12.18912,-767.685199 z" + style="fill:#ffffff;stroke:none" /> + </g> + <g + id="g4" + transform="matrix(-1,0,0,1,59.349255,0)"> + <path + inkscape:connector-curvature="0" + d="M 32,63 32,42 C 32,31 32,31 42,20" + style="fill:none;stroke:#ffffff;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + id="path6" /> + <path + inkscape:connector-curvature="0" + transform="matrix(2.1213203,2.1213203,-2.1213203,2.1213203,42,20)" + d="M -4,1 0,-7 4,1 C 2,-1 -2,-1 -4,1" + style="fill:#ffffff;stroke:#ffffff;stroke-linejoin:round" + id="path8" /> + </g> +</svg> diff --git a/navit/xpm/nav_exit_right_bk.svg b/navit/xpm/nav_exit_right_bk.svg new file mode 100644 index 000000000..e5c768501 --- /dev/null +++ b/navit/xpm/nav_exit_right_bk.svg @@ -0,0 +1,113 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="64px" + height="64px" + id="svg2" + version="1.1" + inkscape:version="0.48.3.1 r9886" + sodipodi:docname="nav_exit_right_bk_var1a.svg"> + <metadata + id="metadata14"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs12" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1280" + inkscape:window-height="955" + id="namedview10" + showgrid="false" + inkscape:zoom="11.859375" + inkscape:cx="32" + inkscape:cy="32" + inkscape:window-x="0" + inkscape:window-y="24" + inkscape:window-maximized="1" + inkscape:current-layer="svg2" + showguides="true" + inkscape:guide-bbox="true" + inkscape:snap-global="true" + inkscape:snap-bbox="true" + inkscape:object-paths="true" + inkscape:snap-nodes="true"> + <sodipodi:guide + orientation="0,1" + position="0,63" + id="guide2987" /> + <sodipodi:guide + orientation="0,1" + position="0,1" + id="guide2989" /> + <sodipodi:guide + orientation="1,0" + position="1,0" + id="guide2991" /> + <sodipodi:guide + orientation="1,0" + position="63,0" + id="guide2993" /> + <sodipodi:guide + orientation="1,0" + position="32,0" + id="guide3038" /> + <sodipodi:guide + orientation="0,1" + position="0,60.5" + id="guide3040" /> + </sodipodi:namedview> + <g + transform="matrix(0.00399274,0,0,0.00286166,-12.663141,-4.1975012)" + id="g3848" + style="fill:#000000"> + <path + transform="matrix(28.222223,0,0,28.222223,-3.2693192e-4,0)" + inkscape:connector-curvature="0" + id="path3076" + d="m 304.15565,64.35416 17.04892,767.6852 75.15314,0 75.15315,0 -139.64771,-767.6852 z" + style="fill:#000000;stroke:none" + sodipodi:nodetypes="cccccc" /> + <path + transform="matrix(28.222223,0,0,28.222223,-3.2693192e-4,0)" + inkscape:connector-curvature="0" + id="path3078" + d="m 256.04066,64.354161 -134.7887,767.685199 150.30709,0 12.18912,-767.685199 z" + style="fill:#000000;stroke:none" /> + </g> + <g + id="g4"> + <path + inkscape:connector-curvature="0" + d="M 32,63 32,42 C 32,31 32,31 42,20" + style="fill:none;stroke:#000000;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + id="path6" /> + <path + inkscape:connector-curvature="0" + transform="matrix(2.1213203,2.1213203,-2.1213203,2.1213203,42,20)" + d="M -4,1 0,-7 4,1 C 2,-1 -2,-1 -4,1" + style="fill:#000000;stroke:#000000;stroke-linejoin:round" + id="path8" /> + </g> +</svg> diff --git a/navit/xpm/nav_exit_right_wh.svg b/navit/xpm/nav_exit_right_wh.svg new file mode 100644 index 000000000..8bf09c0d3 --- /dev/null +++ b/navit/xpm/nav_exit_right_wh.svg @@ -0,0 +1,113 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="64px" + height="64px" + id="svg2" + version="1.1" + inkscape:version="0.48.5 r10040" + sodipodi:docname="nav_exit_right_wh.svg"> + <metadata + id="metadata14"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs12" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1280" + inkscape:window-height="948" + id="namedview10" + showgrid="false" + inkscape:zoom="11.859375" + inkscape:cx="32" + inkscape:cy="32" + inkscape:window-x="0" + inkscape:window-y="24" + inkscape:window-maximized="1" + inkscape:current-layer="svg2" + showguides="true" + inkscape:guide-bbox="true" + inkscape:snap-global="true" + inkscape:snap-bbox="true" + inkscape:object-paths="true" + inkscape:snap-nodes="true"> + <sodipodi:guide + orientation="0,1" + position="0,63" + id="guide2987" /> + <sodipodi:guide + orientation="0,1" + position="0,1" + id="guide2989" /> + <sodipodi:guide + orientation="1,0" + position="1,0" + id="guide2991" /> + <sodipodi:guide + orientation="1,0" + position="63,0" + id="guide2993" /> + <sodipodi:guide + orientation="1,0" + position="32,0" + id="guide3038" /> + <sodipodi:guide + orientation="0,1" + position="0,60.5" + id="guide3040" /> + </sodipodi:namedview> + <g + transform="matrix(0.00399274,0,0,0.00286166,-12.663141,-4.1975012)" + id="g3848" + style="fill:#ffffff"> + <path + transform="matrix(28.222223,0,0,28.222223,-3.2693192e-4,0)" + inkscape:connector-curvature="0" + id="path3076" + d="m 304.15565,64.35416 17.04892,767.6852 75.15314,0 75.15315,0 -139.64771,-767.6852 z" + style="fill:#ffffff;stroke:none" + sodipodi:nodetypes="cccccc" /> + <path + transform="matrix(28.222223,0,0,28.222223,-3.2693192e-4,0)" + inkscape:connector-curvature="0" + id="path3078" + d="m 256.04066,64.354161 -134.7887,767.685199 150.30709,0 12.18912,-767.685199 z" + style="fill:#ffffff;stroke:none" /> + </g> + <g + id="g4"> + <path + inkscape:connector-curvature="0" + d="M 32,63 32,42 C 32,31 32,31 42,20" + style="fill:none;stroke:#ffffff;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + id="path6" /> + <path + inkscape:connector-curvature="0" + transform="matrix(2.1213203,2.1213203,-2.1213203,2.1213203,42,20)" + d="M -4,1 0,-7 4,1 C 2,-1 -2,-1 -4,1" + style="fill:#ffffff;stroke:#ffffff;stroke-linejoin:round" + id="path8" /> + </g> +</svg> diff --git a/navit/xpm/nav_keep_left_bk.svg b/navit/xpm/nav_keep_left_bk.svg new file mode 100644 index 000000000..ed9d0d125 --- /dev/null +++ b/navit/xpm/nav_keep_left_bk.svg @@ -0,0 +1,85 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="64px" + height="64px" + id="svg2" + version="1.1" + inkscape:version="0.48.3.1 r9886" + sodipodi:docname="nav_keep_left_bk.svg"> + <metadata + id="metadata14"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs12" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1280" + inkscape:window-height="955" + id="namedview10" + showgrid="false" + inkscape:zoom="11.859375" + inkscape:cx="32.168643" + inkscape:cy="32" + inkscape:window-x="0" + inkscape:window-y="24" + inkscape:window-maximized="1" + inkscape:current-layer="svg2" + showguides="true" + inkscape:guide-bbox="true" + inkscape:object-nodes="true"> + <sodipodi:guide + orientation="0,1" + position="0,63" + id="guide2995" /> + <sodipodi:guide + orientation="0,1" + position="0,1" + id="guide2997" /> + <sodipodi:guide + orientation="0,1" + position="0,60.5" + id="guide2999" /> + <sodipodi:guide + orientation="1,0" + position="32,0" + id="guide3001" /> + </sodipodi:namedview> + <path + sodipodi:nodetypes="ccccc" + inkscape:connector-curvature="0" + id="path6" + style="fill:none;stroke:#000000;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + d="m 32,63 0,-9.25 c 0,-4.348178 0.003,-4.247019 -5,-9.25 -4.993779,-4.993779 -5,-4.972218 -5,-9.25 L 22,26" /> + <path + inkscape:connector-curvature="0" + id="path8" + style="fill:#000000;stroke:#000000;stroke-width:3;stroke-linejoin:round" + d="M 10,29 22,5 34,29 C 28,23 16,23 10,29" /> + <path + inkscape:connector-curvature="0" + style="fill:#000000;fill-rule:nonzero;stroke:none" + d="m 35.662367,1 c 0,7.784324 1.2632,15.273502 3.59567,22.274023 0.449985,1.350601 1.732995,2.318352 3.235514,2.318352 1.502519,0 2.785529,-0.967751 3.235514,-2.318352 C 48.061535,16.273502 49.324734,8.784324 49.324734,1 L 35.662367,1 z" + id="path15" /> +</svg> diff --git a/navit/xpm/nav_keep_left_wh.svg b/navit/xpm/nav_keep_left_wh.svg new file mode 100644 index 000000000..f9a8efdad --- /dev/null +++ b/navit/xpm/nav_keep_left_wh.svg @@ -0,0 +1,86 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="64px" + height="64px" + id="svg2" + version="1.1" + inkscape:version="0.48.3.1 r9886" + sodipodi:docname="nav_keep_left_wh.svg"> + <metadata + id="metadata14"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs12" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1280" + inkscape:window-height="955" + id="namedview10" + showgrid="false" + inkscape:zoom="11.859375" + inkscape:cx="32.168643" + inkscape:cy="32" + inkscape:window-x="0" + inkscape:window-y="24" + inkscape:window-maximized="1" + inkscape:current-layer="svg2" + showguides="true" + inkscape:guide-bbox="true" + inkscape:object-nodes="true"> + <sodipodi:guide + orientation="0,1" + position="0,63" + id="guide2995" /> + <sodipodi:guide + orientation="0,1" + position="0,1" + id="guide2997" /> + <sodipodi:guide + orientation="0,1" + position="0,60.5" + id="guide2999" /> + <sodipodi:guide + orientation="1,0" + position="32,0" + id="guide3001" /> + </sodipodi:namedview> + <path + sodipodi:nodetypes="ccccc" + inkscape:connector-curvature="0" + id="path6" + style="fill:none;stroke:#ffffff;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + d="m 32,63 0,-9.25 c 0,-4.348178 0.003,-4.247019 -5,-9.25 -4.993779,-4.993779 -5,-4.972218 -5,-9.25 L 22,26" /> + <path + inkscape:connector-curvature="0" + id="path8" + style="fill:#ffffff;stroke:#ffffff;stroke-width:3;stroke-linejoin:round" + d="M 10,29 22,5 34,29 C 28,23 16,23 10,29" /> + <path + inkscape:connector-curvature="0" + style="fill:#ffffff;fill-rule:nonzero;stroke:none" + d="m 35.662367,1 c 0,7.784324 1.2632,15.273502 3.59567,22.274023 0.449985,1.350601 1.732995,2.318352 3.235514,2.318352 1.502519,0 2.785529,-0.967751 3.235514,-2.318352 C 48.061535,16.273502 49.324734,8.784324 49.324734,1 L 35.662367,1 z" + id="path15" /> +</svg> diff --git a/navit/xpm/nav_keep_right_bk.svg b/navit/xpm/nav_keep_right_bk.svg new file mode 100644 index 000000000..ee0d422a6 --- /dev/null +++ b/navit/xpm/nav_keep_right_bk.svg @@ -0,0 +1,86 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="64px" + height="64px" + id="svg2" + version="1.1" + inkscape:version="0.48.3.1 r9886" + sodipodi:docname="nav_keep_left_bk.svg"> + <metadata + id="metadata14"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs12" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1280" + inkscape:window-height="955" + id="namedview10" + showgrid="false" + inkscape:zoom="11.859375" + inkscape:cx="32.168643" + inkscape:cy="32" + inkscape:window-x="0" + inkscape:window-y="24" + inkscape:window-maximized="1" + inkscape:current-layer="svg2" + showguides="true" + inkscape:guide-bbox="true" + inkscape:object-nodes="true"> + <sodipodi:guide + orientation="0,1" + position="0,63" + id="guide2995" /> + <sodipodi:guide + orientation="0,1" + position="0,1" + id="guide2997" /> + <sodipodi:guide + orientation="0,1" + position="0,60.5" + id="guide2999" /> + <sodipodi:guide + orientation="1,0" + position="32,0" + id="guide3001" /> + </sodipodi:namedview> + <path + sodipodi:nodetypes="ccccc" + inkscape:connector-curvature="0" + id="path6" + style="fill:none;stroke:#000000;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + d="m 32,63 0,-9.25 c 0,-4.348178 -0.003,-4.247019 5,-9.25 4.993779,-4.993779 5,-4.972218 5,-9.25 L 42,26" /> + <path + inkscape:connector-curvature="0" + id="path8" + style="fill:#000000;stroke:#000000;stroke-width:3;stroke-linejoin:round" + d="M 54,29 42,5 30,29 c 6,-6 18,-6 24,0" /> + <path + inkscape:connector-curvature="0" + style="fill:#000000;fill-rule:nonzero;stroke:none" + d="m 28.337633,1 c 0,7.784324 -1.2632,15.273502 -3.59567,22.274023 -0.449985,1.350601 -1.732995,2.318352 -3.235514,2.318352 -1.502519,0 -2.785529,-0.967751 -3.235514,-2.318352 C 15.938465,16.273502 14.675266,8.784324 14.675266,1 l 13.662367,0 z" + id="path15" /> +</svg> diff --git a/navit/xpm/nav_keep_right_wh.svg b/navit/xpm/nav_keep_right_wh.svg new file mode 100644 index 000000000..bad0e4343 --- /dev/null +++ b/navit/xpm/nav_keep_right_wh.svg @@ -0,0 +1,86 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="64px" + height="64px" + id="svg2" + version="1.1" + inkscape:version="0.48.3.1 r9886" + sodipodi:docname="nav_keep_right_bk.svg"> + <metadata + id="metadata14"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs12" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1280" + inkscape:window-height="955" + id="namedview10" + showgrid="false" + inkscape:zoom="11.859375" + inkscape:cx="32.168643" + inkscape:cy="32" + inkscape:window-x="0" + inkscape:window-y="24" + inkscape:window-maximized="1" + inkscape:current-layer="svg2" + showguides="true" + inkscape:guide-bbox="true" + inkscape:object-nodes="true"> + <sodipodi:guide + orientation="0,1" + position="0,63" + id="guide2995" /> + <sodipodi:guide + orientation="0,1" + position="0,1" + id="guide2997" /> + <sodipodi:guide + orientation="0,1" + position="0,60.5" + id="guide2999" /> + <sodipodi:guide + orientation="1,0" + position="32,0" + id="guide3001" /> + </sodipodi:namedview> + <path + sodipodi:nodetypes="ccccc" + inkscape:connector-curvature="0" + id="path6" + style="fill:none;stroke:#ffffff;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + d="m 32,63 0,-9.25 c 0,-4.348178 -0.003,-4.247019 5,-9.25 4.993779,-4.993779 5,-4.972218 5,-9.25 L 42,26" /> + <path + inkscape:connector-curvature="0" + id="path8" + style="fill:#ffffff;stroke:#ffffff;stroke-width:3;stroke-linejoin:round" + d="M 54,29 42,5 30,29 c 6,-6 18,-6 24,0" /> + <path + inkscape:connector-curvature="0" + style="fill:#ffffff;fill-rule:nonzero;stroke:none" + d="m 28.337633,1 c 0,7.784324 -1.2632,15.273502 -3.59567,22.274023 -0.449985,1.350601 -1.732995,2.318352 -3.235514,2.318352 -1.502519,0 -2.785529,-0.967751 -3.235514,-2.318352 C 15.938465,16.273502 14.675266,8.784324 14.675266,1 l 13.662367,0 z" + id="path15" /> +</svg> diff --git a/navit/xpm/nav_merge_left_bk.svg b/navit/xpm/nav_merge_left_bk.svg new file mode 100644 index 000000000..340726cc0 --- /dev/null +++ b/navit/xpm/nav_merge_left_bk.svg @@ -0,0 +1,112 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="64px" + height="64px" + id="svg2" + version="1.1" + inkscape:version="0.48.3.1 r9886" + sodipodi:docname="nav_merge_left_bk_var2a.svg"> + <metadata + id="metadata14"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs12" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1280" + inkscape:window-height="955" + id="namedview10" + showgrid="false" + inkscape:zoom="11.859375" + inkscape:cx="32" + inkscape:cy="32" + inkscape:window-x="0" + inkscape:window-y="24" + inkscape:window-maximized="1" + inkscape:current-layer="svg2" + showguides="true" + inkscape:guide-bbox="true"> + <sodipodi:guide + orientation="1,0" + position="1,0" + id="guide2987" /> + <sodipodi:guide + orientation="0,1" + position="0,1" + id="guide2989" /> + <sodipodi:guide + orientation="0,1" + position="0,63" + id="guide2991" /> + <sodipodi:guide + orientation="1,0" + position="63,0" + id="guide2993" /> + <sodipodi:guide + orientation="1,0" + position="32,0" + id="guide3025" /> + <sodipodi:guide + orientation="1,0" + position="54.531,0" + id="guide3027" /> + </sodipodi:namedview> + <g + transform="matrix(0.66666152,0,0,0.66666152,33.197831,21.000324)" + id="g4-5" + style="stroke:#000000"> + <path + inkscape:connector-curvature="0" + d="M 32,63 32,42 C 32,31 32,31 22,20" + style="fill:none;stroke:#000000;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + id="path6-8" /> + <path + inkscape:connector-curvature="0" + transform="matrix(2.1213203,-2.1213203,2.1213203,2.1213203,22,20)" + d="M -4,1 0,-7 4,1 C 2,-1 -2,-1 -4,1" + style="fill:#000000;stroke:#000000;stroke-linejoin:round" + id="path8-8" /> + </g> + <g + transform="matrix(0.00399274,0,0,0.00286166,-12.663154,-4.1975012)" + id="g3848" + style="fill:#000000"> + <path + transform="matrix(28.222223,0,0,28.222223,-3.2693192e-4,0)" + inkscape:connector-curvature="0" + id="path3076" + d="m 304.15565,64.35416 17.04892,767.6852 75.15314,0 75.15315,0 -139.64771,-767.6852 z" + style="fill:#000000;stroke:none" + sodipodi:nodetypes="cccccc" /> + <path + transform="matrix(28.222223,0,0,28.222223,-3.2693192e-4,0)" + inkscape:connector-curvature="0" + id="path3078" + d="m 256.04066,64.354161 -134.7887,767.685199 75.15354,0 75.15355,0 12.18912,-767.685199 z" + style="fill:#000000;stroke:none" + sodipodi:nodetypes="cccccc" /> + </g> +</svg> diff --git a/navit/xpm/nav_merge_left_wh.svg b/navit/xpm/nav_merge_left_wh.svg new file mode 100644 index 000000000..9ed953cad --- /dev/null +++ b/navit/xpm/nav_merge_left_wh.svg @@ -0,0 +1,112 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="64px" + height="64px" + id="svg2" + version="1.1" + inkscape:version="0.48.5 r10040" + sodipodi:docname="nav_merge_left_bk.svg"> + <metadata + id="metadata14"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs12" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1280" + inkscape:window-height="948" + id="namedview10" + showgrid="false" + inkscape:zoom="11.859375" + inkscape:cx="32" + inkscape:cy="32" + inkscape:window-x="0" + inkscape:window-y="24" + inkscape:window-maximized="1" + inkscape:current-layer="svg2" + showguides="true" + inkscape:guide-bbox="true"> + <sodipodi:guide + orientation="1,0" + position="1,0" + id="guide2987" /> + <sodipodi:guide + orientation="0,1" + position="0,1" + id="guide2989" /> + <sodipodi:guide + orientation="0,1" + position="0,63" + id="guide2991" /> + <sodipodi:guide + orientation="1,0" + position="63,0" + id="guide2993" /> + <sodipodi:guide + orientation="1,0" + position="32,0" + id="guide3025" /> + <sodipodi:guide + orientation="1,0" + position="54.531,0" + id="guide3027" /> + </sodipodi:namedview> + <g + transform="matrix(0.66666152,0,0,0.66666152,33.197831,21.000324)" + id="g4-5" + style="stroke:#000000"> + <path + inkscape:connector-curvature="0" + d="M 32,63 32,42 C 32,31 32,31 22,20" + style="fill:none;stroke:#ffffff;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + id="path6-8" /> + <path + inkscape:connector-curvature="0" + transform="matrix(2.1213203,-2.1213203,2.1213203,2.1213203,22,20)" + d="M -4,1 0,-7 4,1 C 2,-1 -2,-1 -4,1" + style="fill:#ffffff;stroke:#ffffff;stroke-linejoin:round" + id="path8-8" /> + </g> + <g + transform="matrix(0.00399274,0,0,0.00286166,-12.663154,-4.1975012)" + id="g3848" + style="fill:#ffffff"> + <path + transform="matrix(28.222223,0,0,28.222223,-3.2693192e-4,0)" + inkscape:connector-curvature="0" + id="path3076" + d="m 304.15565,64.35416 17.04892,767.6852 75.15314,0 75.15315,0 -139.64771,-767.6852 z" + style="fill:#ffffff;stroke:none" + sodipodi:nodetypes="cccccc" /> + <path + transform="matrix(28.222223,0,0,28.222223,-3.2693192e-4,0)" + inkscape:connector-curvature="0" + id="path3078" + d="m 256.04066,64.354161 -134.7887,767.685199 75.15354,0 75.15355,0 12.18912,-767.685199 z" + style="fill:#ffffff;stroke:none" + sodipodi:nodetypes="cccccc" /> + </g> +</svg> diff --git a/navit/xpm/nav_merge_right_bk.svg b/navit/xpm/nav_merge_right_bk.svg new file mode 100644 index 000000000..50da749bd --- /dev/null +++ b/navit/xpm/nav_merge_right_bk.svg @@ -0,0 +1,112 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="64px" + height="64px" + id="svg2" + version="1.1" + inkscape:version="0.48.5 r10040" + sodipodi:docname="nav_merge_left_bk.svg"> + <metadata + id="metadata14"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs12" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1280" + inkscape:window-height="948" + id="namedview10" + showgrid="false" + inkscape:zoom="11.859375" + inkscape:cx="33.349144" + inkscape:cy="33.349144" + inkscape:window-x="0" + inkscape:window-y="24" + inkscape:window-maximized="1" + inkscape:current-layer="svg2" + showguides="true" + inkscape:guide-bbox="true"> + <sodipodi:guide + orientation="1,0" + position="1,0" + id="guide2987" /> + <sodipodi:guide + orientation="0,1" + position="0,1" + id="guide2989" /> + <sodipodi:guide + orientation="0,1" + position="0,63" + id="guide2991" /> + <sodipodi:guide + orientation="1,0" + position="63,0" + id="guide2993" /> + <sodipodi:guide + orientation="1,0" + position="32,0" + id="guide3025" /> + <sodipodi:guide + orientation="1,0" + position="54.531,0" + id="guide3027" /> + </sodipodi:namedview> + <g + transform="matrix(-0.66666152,0,0,0.66666152,25.666477,21.000324)" + id="g4-5" + style="stroke:#000000"> + <path + inkscape:connector-curvature="0" + d="M 32,63 32,42 C 32,31 32,31 22,20" + style="fill:none;stroke:#000000;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + id="path6-8" /> + <path + inkscape:connector-curvature="0" + transform="matrix(2.1213203,-2.1213203,2.1213203,2.1213203,22,20)" + d="M -4,1 0,-7 4,1 C 2,-1 -2,-1 -4,1" + style="fill:#000000;stroke:#000000;stroke-linejoin:round" + id="path8-8" /> + </g> + <g + transform="matrix(-0.00399274,0,0,0.00286166,71.527462,-4.1975012)" + id="g3848" + style="fill:#000000"> + <path + transform="matrix(28.222223,0,0,28.222223,-3.2693192e-4,0)" + inkscape:connector-curvature="0" + id="path3076" + d="m 304.15565,64.35416 17.04892,767.6852 75.15314,0 75.15315,0 -139.64771,-767.6852 z" + style="fill:#000000;stroke:none" + sodipodi:nodetypes="cccccc" /> + <path + transform="matrix(28.222223,0,0,28.222223,-3.2693192e-4,0)" + inkscape:connector-curvature="0" + id="path3078" + d="m 256.04066,64.354161 -134.7887,767.685199 75.15354,0 75.15355,0 12.18912,-767.685199 z" + style="fill:#000000;stroke:none" + sodipodi:nodetypes="cccccc" /> + </g> +</svg> diff --git a/navit/xpm/nav_merge_right_wh.svg b/navit/xpm/nav_merge_right_wh.svg new file mode 100644 index 000000000..c7cb52872 --- /dev/null +++ b/navit/xpm/nav_merge_right_wh.svg @@ -0,0 +1,112 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="64px" + height="64px" + id="svg2" + version="1.1" + inkscape:version="0.48.5 r10040" + sodipodi:docname="nav_merge_right_bk.svg"> + <metadata + id="metadata14"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs12" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1280" + inkscape:window-height="948" + id="namedview10" + showgrid="false" + inkscape:zoom="11.859375" + inkscape:cx="33.349144" + inkscape:cy="33.349144" + inkscape:window-x="0" + inkscape:window-y="24" + inkscape:window-maximized="1" + inkscape:current-layer="svg2" + showguides="true" + inkscape:guide-bbox="true"> + <sodipodi:guide + orientation="1,0" + position="1,0" + id="guide2987" /> + <sodipodi:guide + orientation="0,1" + position="0,1" + id="guide2989" /> + <sodipodi:guide + orientation="0,1" + position="0,63" + id="guide2991" /> + <sodipodi:guide + orientation="1,0" + position="63,0" + id="guide2993" /> + <sodipodi:guide + orientation="1,0" + position="32,0" + id="guide3025" /> + <sodipodi:guide + orientation="1,0" + position="54.531,0" + id="guide3027" /> + </sodipodi:namedview> + <g + transform="matrix(-0.66666152,0,0,0.66666152,25.666477,21.000324)" + id="g4-5" + style="stroke:#000000"> + <path + inkscape:connector-curvature="0" + d="M 32,63 32,42 C 32,31 32,31 22,20" + style="fill:none;stroke:#ffffff;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + id="path6-8" /> + <path + inkscape:connector-curvature="0" + transform="matrix(2.1213203,-2.1213203,2.1213203,2.1213203,22,20)" + d="M -4,1 0,-7 4,1 C 2,-1 -2,-1 -4,1" + style="fill:#ffffff;stroke:#ffffff;stroke-linejoin:round" + id="path8-8" /> + </g> + <g + transform="matrix(-0.00399274,0,0,0.00286166,71.527462,-4.1975012)" + id="g3848" + style="fill:#ffffff"> + <path + transform="matrix(28.222223,0,0,28.222223,-3.2693192e-4,0)" + inkscape:connector-curvature="0" + id="path3076" + d="m 304.15565,64.35416 17.04892,767.6852 75.15314,0 75.15315,0 -139.64771,-767.6852 z" + style="fill:#ffffff;stroke:none" + sodipodi:nodetypes="cccccc" /> + <path + transform="matrix(28.222223,0,0,28.222223,-3.2693192e-4,0)" + inkscape:connector-curvature="0" + id="path3078" + d="m 256.04066,64.354161 -134.7887,767.685199 75.15354,0 75.15355,0 12.18912,-767.685199 z" + style="fill:#ffffff;stroke:none" + sodipodi:nodetypes="cccccc" /> + </g> +</svg> diff --git a/po/af.po.in b/po/af.po.in index fcba87bf2..bfb95e1e2 100644 --- a/po/af.po.in +++ b/po/af.po.in @@ -8,19 +8,19 @@ # Stephan Wessels https://launchpad.net/~slwessels # Wimpie Hall https://launchpad.net/~gotek # mdhull https://launchpad.net/~mark-emsafrica - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2013-09-28 01:39+0000\n" "Last-Translator: KaZeR <Unknown>\n" "Language-Team: Afrikaans <af@li.org>\n" +"Language: af\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"Language: af\n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -138,88 +138,188 @@ msgid_plural "in %d kilometers" msgstr[0] "na een kilometer" msgstr[1] "na %d kilometer" -msgid "exit" -msgstr "afrit" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "" -msgid "into the ramp" -msgstr "na die afrit" +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" -msgstr "%sin die straat %s%s%s in" +msgid "%sinto %s%s%s" +msgstr "%sin die %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" -msgstr "%sin die %s%s%s|" +msgid "%sinto %s%s%s|masculine form" +msgstr "%sin die %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" -msgstr "%sin die %s%s%s|" +msgid "%sinto %s%s%s|feminine form" +msgstr "%sin die %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" -msgstr "%sin die %s%s%s|" +msgid "%sinto %s%s%s|neuter form" +msgstr "%sin die %s%s%s" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) #, c-format msgid "%sinto the %s" msgstr "%sin die %s in" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "regs" +msgid "When possible, please turn around" +msgstr "Draai asseblief om wanneer moontlik" -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "links" +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" +msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "easily " -msgstr "maklik " +#, c-format +msgid "Follow the road for the next %s" +msgstr "Volg die pad vir die volgende %s" -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " -msgstr "skerp " +msgid "Enter the roundabout soon" +msgstr "Gaan kortliks in die sirkel in" -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " +#. TRANSLATORS: %s is the distance to the roundabout +#, c-format +msgid "Enter the roundabout %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" +msgstr "verlaat dan die sirkel by die %1$s %2$s" + +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "Leave the roundabout at the %1$s %2$s" +msgstr "Verlaat die sirkel by die %1$s %2$s" + +msgid "soon" +msgstr "kortliks" + +msgid "now" +msgstr "nou" + +msgid "then" +msgstr "dan" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|right" msgstr "" -msgid "When possible, please turn around" -msgstr "Draai asseblief om wanneer moontlik" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|right" +msgstr "" -msgid "Enter the roundabout soon" -msgstr "Gaan kortliks in die sirkel in" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|left" +msgstr "" -#. TRANSLATORS: %s is the distance to the roundabout +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Enter the roundabout %s" +msgid "Merge %1$s%2$s|left" +msgstr "" + +msgid "on your left" +msgstr "" + +msgid "on your right" msgstr "" +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance +#, c-format +msgid "Take exit %1$s %2$s %3$s" +msgstr "Neem die afrit %1$s %2$s %3$s" + +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "then leave the roundabout at the %s" +msgid "Take the exit %1$s %2$s%3$s" +msgstr "Neem die afrit %1$s %2$s%3$s" + +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" msgstr "" +msgid "at exit" +msgstr "by die afrit" + +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "Leave the roundabout at the %s" +msgid "then continue straight%1$s" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination #, c-format -msgid "Follow the road for the next %s" -msgstr "Volg die pad vir die volgende %s" +msgid "Continue straight %1$s%2$s%3$s" +msgstr "" -msgid "soon" -msgstr "kortliks" +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep right%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep right %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "regs" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "links" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "maklik " + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "skerp " -#. TRANSLATORS: First argument is the how manieth street to take, second the direction #, c-format msgid "Take the %1$s road to the %2$s" msgstr "Neem die %1$s pad na %2$s" @@ -228,32 +328,59 @@ msgstr "Neem die %1$s pad na %2$s" msgid "after %i roads" msgstr "na %i paaie" -msgid "now" -msgstr "nou" - +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination #, c-format -msgid "then take the %1$s road to the %2$s" -msgstr "" +msgid "Turn %1$s%2$s %3$s%4$s" +msgstr "Draai %1$s%2$s %3$s%4$s" -msgid "error" -msgstr "" +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "draai dan om" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "Turn %1$s%2$s %3$s%4$s" -msgstr "" +msgid "Make a U-turn %1$s|left" +msgstr "Draai om %1$s" + +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" +msgstr "draai dan om" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +msgid "Make a U-turn %1$s|right" +msgstr "Draai om %1$s" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" msgstr "" +msgid "then you have reached your destination." +msgstr "dan het jy jou bestemming bereik." + +#. TRANSLATORS: the arg. is distance #, c-format msgid "You have reached your destination %s" msgstr "Jy het jou bestemming bereik %s" -msgid "then you have reached your destination." -msgstr "dan het jy jou bestemming bereik." +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "" + +msgid "Exit" +msgstr "Afrit" #. Android resource: @strings/position_popup_title msgid "Position" @@ -1808,10 +1935,10 @@ msgstr "" msgid "Enter Coordinates" msgstr "" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/ar.po.in b/po/ar.po.in index 137319f61..ab724aae6 100644 --- a/po/ar.po.in +++ b/po/ar.po.in @@ -6,20 +6,20 @@ # Magd Addin M. Almuntaser https://launchpad.net/~ttmtt-team # drsaudi https://launchpad.net/~mon7b6 # metehyi https://launchpad.net/~metehyi - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2013-11-10 01:24+0000\n" "Last-Translator: metehyi <Unknown>\n" "Language-Team: Arabic <ar@li.org>\n" +"Language: ar\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= " "3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n" -"Language: ar\n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -153,30 +153,53 @@ msgstr[3] "بعد %d كلم" msgstr[4] "بعد %d كلم" msgstr[5] "بعد %d كلم" -msgid "exit" -msgstr "خروج" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "" -msgid "into the ramp" -msgstr "إلى داخل الطريق المنحدر" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "" + +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" +msgid "%sinto %s%s%s" msgstr "%s إلى داخل الشارع %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" +msgid "%sinto %s%s%s|masculine form" msgstr "%sإلى داخل %s%s%s|صفة الذكر" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" +msgid "%sinto %s%s%s|feminine form" msgstr "%sإلى داخل %s%s%s|صفة الأنثى" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" +msgid "%sinto %s%s%s|neuter form" msgstr "%sإلى داخل %s%s%s|غير محدد الجنس" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) @@ -184,32 +207,17 @@ msgstr "%sإلى داخل %s%s%s|غير محدد الجنس" msgid "%sinto the %s" msgstr "%s إلى داخل %s" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "إلى اليمين" - -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "إلى اليسار" - -#. TRANSLATORS: Don't forget the ending space -msgid "easily " -msgstr "بسهولة " - -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " -msgstr "بكل شدة " - -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " -msgstr "" +msgid "When possible, please turn around" +msgstr "حيث ممكن الرجاء اللف" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" msgstr "" -msgid "When possible, please turn around" -msgstr "حيث ممكن الرجاء اللف" +#, c-format +msgid "Follow the road for the next %s" +msgstr "تابع الطريق لل- %s التالية" msgid "Enter the roundabout soon" msgstr "قريباً الدخول إلى المستديرة" @@ -219,22 +227,114 @@ msgstr "قريباً الدخول إلى المستديرة" msgid "Enter the roundabout %s" msgstr "أدخل المسافة %s إلى المستديرة" +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" +msgstr "ثم أخرج من المستديرة عند الــ%1$s %2$s" + +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow #, c-format -msgid "then leave the roundabout at the %s" +msgid "Leave the roundabout at the %1$s %2$s" +msgstr "أخرج من المستديرة عند الــ %1$s %2$s" + +msgid "soon" +msgstr "قريبا" + +msgid "now" +msgstr "الآن" + +msgid "then" msgstr "" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "Leave the roundabout at the %s" +msgid "then merge%1$s|right" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "Follow the road for the next %s" -msgstr "تابع الطريق لل- %s التالية" +msgid "Merge %1$s%2$s|right" +msgstr "" -msgid "soon" -msgstr "قريبا" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|left" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|left" +msgstr "" + +msgid "on your left" +msgstr "" + +msgid "on your right" +msgstr "" + +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance +#, c-format +msgid "Take exit %1$s %2$s %3$s" +msgstr "" + +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination +#, c-format +msgid "Take the exit %1$s %2$s%3$s" +msgstr "" + +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" +msgstr "" + +msgid "at exit" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then continue straight%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep right%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep right %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "إلى اليمين" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "إلى اليسار" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "بسهولة " + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "بكل شدة " -#. TRANSLATORS: First argument is the how manieth street to take, second the direction #, c-format msgid "Take the %1$s road to the %2$s" msgstr "خذ الطريق %1$s إلى ال%2$s" @@ -243,32 +343,59 @@ msgstr "خذ الطريق %1$s إلى ال%2$s" msgid "after %i roads" msgstr "بعد %i طرقات" -msgid "now" -msgstr "الآن" +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination +#, c-format +msgid "Turn %1$s%2$s %3$s%4$s" +msgstr "حوّل %1$s%2$s %3$s%4$s" + +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "" +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "then take the %1$s road to the %2$s" +msgid "Make a U-turn %1$s|left" msgstr "" -msgid "error" +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" msgstr "" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "Turn %1$s%2$s %3$s%4$s" +msgid "Make a U-turn %1$s|right" msgstr "" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination -#, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" msgstr "" +msgid "then you have reached your destination." +msgstr "و بعدها تكون قد وصلت إلى هدفك" + +#. TRANSLATORS: the arg. is distance #, c-format msgid "You have reached your destination %s" msgstr "لقد وصلت إلى هدفك %s" -msgid "then you have reached your destination." -msgstr "و بعدها تكون قد وصلت إلى هدفك" +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "" + +msgid "Exit" +msgstr "خروج" #. Android resource: @strings/position_popup_title msgid "Position" @@ -1823,10 +1950,10 @@ msgstr "نقاط المراحل" msgid "Enter Coordinates" msgstr "أدخل الإحداثيات" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/ast.po.in b/po/ast.po.in index 4d72f19fd..5a446a254 100644 --- a/po/ast.po.in +++ b/po/ast.po.in @@ -3,19 +3,19 @@ # This file is distributed under the same license as the navit package. # Many thanks to the contributors of this translation: # Xuacu Saturio https://launchpad.net/~xuacusk8 - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2013-09-28 01:39+0000\n" "Last-Translator: Xuacu Saturio <xuacusk8@gmail.com>\n" "Language-Team: Asturian <ast@li.org>\n" +"Language: ast\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"Language: ast\n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -133,63 +133,71 @@ msgid_plural "in %d kilometers" msgstr[0] "nun quilómetru" msgstr[1] "en %d quilómetros" -msgid "exit" -msgstr "salida" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" -msgid "into the ramp" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "" + +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "pal enllaz" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" +msgid "%sinto %s%s%s" msgstr "%s pa la cai %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" -msgstr "%s pal %s%s%s|male form" +msgid "%sinto %s%s%s|masculine form" +msgstr "%s pal %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" -msgstr "%s pa la %s%s%s|female form" +msgid "%sinto %s%s%s|feminine form" +msgstr "%s pa la %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" -msgstr "%s pal %s%s%s|neutral form" +msgid "%sinto %s%s%s|neuter form" +msgstr "%s pal %s%s%s" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) #, c-format msgid "%sinto the %s" msgstr "%s pa la %s" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "drecha" - -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "izquierda" - -#. TRANSLATORS: Don't forget the ending space -msgid "easily " -msgstr "selemente " - -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " -msgstr "enforma " - -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " -msgstr "" +msgid "When possible, please turn around" +msgstr "Cuando seya posible, de la vuelta" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" msgstr "" -msgid "When possible, please turn around" -msgstr "Cuando seya posible, de la vuelta" +#, c-format +msgid "Follow the road for the next %s" +msgstr "Siga pela carretera los siguientes %s" msgid "Enter the roundabout soon" msgstr "Entre ceo na rotonda" @@ -199,57 +207,176 @@ msgstr "Entre ceo na rotonda" msgid "Enter the roundabout %s" msgstr "" +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" +msgstr "llueu dexe la rotonda pola %1$s %2$s" + +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "Leave the roundabout at the %1$s %2$s" +msgstr "Dexe la rotonda pola %1$s %2$s" + +msgid "soon" +msgstr "aína" + +msgid "now" +msgstr "agora" + +msgid "then" +msgstr "llueu" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|right" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "then leave the roundabout at the %s" +msgid "Merge %1$s%2$s|right" msgstr "" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Leave the roundabout at the %s" +msgid "then merge%1$s|left" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Follow the road for the next %s" -msgstr "Siga pela carretera los siguientes %s" +msgid "Merge %1$s%2$s|left" +msgstr "" -msgid "soon" -msgstr "aína" +msgid "on your left" +msgstr "" + +msgid "on your right" +msgstr "" -#. TRANSLATORS: First argument is the how manieth street to take, second the direction +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "Take the %1$s road to the %2$s" -msgstr "Tome la carretera %1$s dica %2$s" +msgid "Take exit %1$s %2$s %3$s" +msgstr "" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "after %i roads" -msgstr "tres %i carreteres" +msgid "Take the exit %1$s %2$s%3$s" +msgstr "Tome la salida %1$s %2$s%3$s" -msgid "now" -msgstr "agora" +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" +msgstr "" +msgid "at exit" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "then take the %1$s road to the %2$s" +msgid "then continue straight%1$s" msgstr "" -msgid "error" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" msgstr "" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "Turn %1$s%2$s %3$s%4$s" +msgid "then keep right%1$s" msgstr "" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +msgid "Keep right %1$s%2$s%3$s" msgstr "" +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "You have reached your destination %s" -msgstr "Llegó al destín %s" +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "drecha" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "izquierda" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "selemente " + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "enforma " + +#, c-format +msgid "Take the %1$s road to the %2$s" +msgstr "Tome la carretera %1$s dica %2$s" + +#, c-format +msgid "after %i roads" +msgstr "tres %i carreteres" + +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination +#, c-format +msgid "Turn %1$s%2$s %3$s%4$s" +msgstr "Xire %1$s%2$s %3$s%4$s" + +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "llueu de la vuelta" + +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. +#, c-format +msgid "Make a U-turn %1$s|left" +msgstr "De la vuelta %1$s" + +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" +msgstr "llueu de la vuelta" + +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. +#, c-format +msgid "Make a U-turn %1$s|right" +msgstr "De la vuelta %1$s" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" +msgstr "siga" msgid "then you have reached your destination." msgstr "entós llegará al destín." +#. TRANSLATORS: the arg. is distance +#, c-format +msgid "You have reached your destination %s" +msgstr "Llegó al destín %s" + +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "" + +msgid "Exit" +msgstr "Salida" + #. Android resource: @strings/position_popup_title msgid "Position" msgstr "Posición" @@ -1803,10 +1930,10 @@ msgstr "" msgid "Enter Coordinates" msgstr "" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/be.po.in b/po/be.po.in index 58137de76..b3041903b 100644 --- a/po/be.po.in +++ b/po/be.po.in @@ -4,20 +4,20 @@ # Many thanks to the contributors of this translation: # Anatoli Putseyeu https://launchpad.net/~st-shadow-by # KaZeR https://launchpad.net/~kazer - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2014-11-15 22:06+0000\n" "Last-Translator: KaZeR <Unknown>\n" "Language-Team: Belarusian <be@li.org>\n" +"Language: be\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " -"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"Language: be\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" msgid "Running from source directory\n" msgstr "" @@ -135,30 +135,53 @@ msgid_plural "in %d kilometers" msgstr[0] "" msgstr[1] "" -msgid "exit" -msgstr "выхад" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "" -msgid "into the ramp" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "" + +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" +msgid "%sinto %s%s%s" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" +msgid "%sinto %s%s%s|masculine form" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" +msgid "%sinto %s%s%s|feminine form" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" +msgid "%sinto %s%s%s|neuter form" msgstr "" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) @@ -166,92 +189,196 @@ msgstr "" msgid "%sinto the %s" msgstr "" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "направа" +msgid "When possible, please turn around" +msgstr "Развярніцеся, калі будзе магчымасць" -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "налева" +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" +msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "easily " +#, c-format +msgid "Follow the road for the next %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " -msgstr "мацней " +msgid "Enter the roundabout soon" +msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " +#. TRANSLATORS: %s is the distance to the roundabout +#, c-format +msgid "Enter the roundabout %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" msgstr "" -msgid "When possible, please turn around" -msgstr "Развярніцеся, калі будзе магчымасць" +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "Leave the roundabout at the %1$s %2$s" +msgstr "" -msgid "Enter the roundabout soon" +msgid "soon" +msgstr "скора" + +msgid "now" +msgstr "зараз" + +msgid "then" msgstr "" -#. TRANSLATORS: %s is the distance to the roundabout +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "Enter the roundabout %s" +msgid "then merge%1$s|right" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "then leave the roundabout at the %s" +msgid "Merge %1$s%2$s|right" msgstr "" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Leave the roundabout at the %s" +msgid "then merge%1$s|left" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Follow the road for the next %s" +msgid "Merge %1$s%2$s|left" msgstr "" -msgid "soon" -msgstr "скора" +msgid "on your left" +msgstr "" -#. TRANSLATORS: First argument is the how manieth street to take, second the direction +msgid "on your right" +msgstr "" + +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "Take the %1$s road to the %2$s" +msgid "Take exit %1$s %2$s %3$s" msgstr "" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "after %i roads" +msgid "Take the exit %1$s %2$s%3$s" msgstr "" -msgid "now" -msgstr "зараз" +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" +msgstr "" +msgid "at exit" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "then take the %1$s road to the %2$s" +msgid "then continue straight%1$s" msgstr "" -msgid "error" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" msgstr "" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep right%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep right %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "направа" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "налева" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "" + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "мацней " + +#, c-format +msgid "Take the %1$s road to the %2$s" +msgstr "" + +#, c-format +msgid "after %i roads" +msgstr "" + +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination #, c-format msgid "Turn %1$s%2$s %3$s%4$s" msgstr "" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "" + +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +msgid "Make a U-turn %1$s|left" +msgstr "Развярніцеся %1$s" + +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" msgstr "" +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "You have reached your destination %s" +msgid "Make a U-turn %1$s|right" +msgstr "Развярніцеся %1$s" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" msgstr "" msgid "then you have reached your destination." msgstr "" +#. TRANSLATORS: the arg. is distance +#, c-format +msgid "You have reached your destination %s" +msgstr "" + +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "" + +msgid "Exit" +msgstr "Выхад" + #. Android resource: @strings/position_popup_title msgid "Position" msgstr "Размяшчэнне" @@ -1805,10 +1932,10 @@ msgstr "" msgid "Enter Coordinates" msgstr "" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/bg.po.in b/po/bg.po.in index 46d5b779f..2b5b019c9 100644 --- a/po/bg.po.in +++ b/po/bg.po.in @@ -7,19 +7,19 @@ # Anton Todorov https://launchpad.net/~antod # Lyudmil Bonev https://launchpad.net/~bonev-j # MalamiR https://launchpad.net/~mamut-killer - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2013-09-28 01:39+0000\n" "Last-Translator: Alex Stanev <alex@stanev.org>\n" "Language-Team: Bulgarian <bg@li.org>\n" +"Language: bg\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"Language: bg\n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -137,123 +137,250 @@ msgid_plural "in %d kilometers" msgstr[0] "след един километър" msgstr[1] "след %d километра" -msgid "exit" -msgstr "изход" - -msgid "into the ramp" -msgstr "на рампата" - -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name #, c-format -msgid "%sinto the street %s%s%s" -msgstr "%sпо улица %s%s%s" +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name #, c-format -msgid "%sinto the %s%s%s|male form" +msgid "%1$sonto %2$s" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" +msgid "%1$sonto %2$s|masculine form" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" +msgid "%1$sonto %2$s|feminine form" msgstr "" -#. TRANSLATORS: gives the name of the next road to turn into (into the E17) +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s" +msgid "%1$sonto %2$s|neuter form" msgstr "" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "надясно" +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" +msgstr "на рампата" -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "наляво" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name +#, c-format +msgid "%sinto %s%s%s" +msgstr "%sпо улица %s%s%s" -#. TRANSLATORS: Don't forget the ending space -msgid "easily " -msgstr "леко " +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%sinto %s%s%s|masculine form" +msgstr "%sпо улица %s%s%s" -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " -msgstr "силно " +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%sinto %s%s%s|feminine form" +msgstr "%sпо улица %s%s%s" -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " -msgstr "" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%sinto %s%s%s|neuter form" +msgstr "%sпо улица %s%s%s" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: gives the name of the next road to turn into (into the E17) +#, c-format +msgid "%sinto the %s" msgstr "" msgid "When possible, please turn around" msgstr "Когато е възможно обърнете" +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" +msgstr "" + +#, c-format +msgid "Follow the road for the next %s" +msgstr "Следвайте пътя през следващите %s" + msgid "Enter the roundabout soon" msgstr "Скоро навлизате в кръгово" #. TRANSLATORS: %s is the distance to the roundabout #, c-format msgid "Enter the roundabout %s" +msgstr "Навлизате в кръгово %s" + +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" +msgstr "след това излезте от кръговото на %1$s %2$s" + +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "Leave the roundabout at the %1$s %2$s" +msgstr "Излезте от кръговото на %1$s %2$s" + +msgid "soon" +msgstr "скоро" + +msgid "now" +msgstr "сега" + +msgid "then" +msgstr "след това" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|right" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "then leave the roundabout at the %s" +msgid "Merge %1$s%2$s|right" msgstr "" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Leave the roundabout at the %s" +msgid "then merge%1$s|left" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Follow the road for the next %s" -msgstr "Следвайте пътя през следващите %s" +msgid "Merge %1$s%2$s|left" +msgstr "" -msgid "soon" -msgstr "скоро" +msgid "on your left" +msgstr "" -#. TRANSLATORS: First argument is the how manieth street to take, second the direction +msgid "on your right" +msgstr "" + +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "Take the %1$s road to the %2$s" -msgstr "Тръгнете по %1$s път към %2$s" +msgid "Take exit %1$s %2$s %3$s" +msgstr "" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "after %i roads" -msgstr "след %i пресечки" +msgid "Take the exit %1$s %2$s%3$s" +msgstr "" -msgid "now" -msgstr "сега" +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" +msgstr "" +msgid "at exit" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "then take the %1$s road to the %2$s" +msgid "then continue straight%1$s" msgstr "" -msgid "error" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" msgstr "" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "Turn %1$s%2$s %3$s%4$s" +msgid "then keep right%1$s" msgstr "" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +msgid "Keep right %1$s%2$s%3$s" msgstr "" +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "You have reached your destination %s" -msgstr "Достигнахте до целта %s" +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "надясно" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "наляво" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "леко " + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "силно " + +#, c-format +msgid "Take the %1$s road to the %2$s" +msgstr "Тръгнете по %1$s път към %2$s" + +#, c-format +msgid "after %i roads" +msgstr "след %i пресечки" + +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination +#, c-format +msgid "Turn %1$s%2$s %3$s%4$s" +msgstr "Завийте %1$s%2$s %3$s%4$s" + +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "след това обърнете" + +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. +#, c-format +msgid "Make a U-turn %1$s|left" +msgstr "Обърнете %1$s" + +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" +msgstr "след това обърнете" + +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. +#, c-format +msgid "Make a U-turn %1$s|right" +msgstr "Обърнете %1$s" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" +msgstr "" msgid "then you have reached your destination." msgstr "след това пристигате на местоназначението" +#. TRANSLATORS: the arg. is distance +#, c-format +msgid "You have reached your destination %s" +msgstr "Достигнахте до целта %s" + +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "" + +msgid "Exit" +msgstr "Изход" + #. Android resource: @strings/position_popup_title msgid "Position" msgstr "Позиция" @@ -1807,10 +1934,10 @@ msgstr "" msgid "Enter Coordinates" msgstr "" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/bs.po.in b/po/bs.po.in index e6445c0f7..c9270fce3 100644 --- a/po/bs.po.in +++ b/po/bs.po.in @@ -4,20 +4,20 @@ # Many thanks to the contributors of this translation: # KaZeR https://launchpad.net/~kazer # Kenan https://launchpad.net/~kahrickenan - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2014-08-08 23:15+0000\n" "Last-Translator: KaZeR <Unknown>\n" "Language-Team: Bosnian <bs@li.org>\n" +"Language: bs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " -"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"Language: bs\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" msgid "Running from source directory\n" msgstr "" @@ -136,30 +136,53 @@ msgstr[0] "u %d kilometru" msgstr[1] "u %d kilometara" msgstr[2] "u %d kilometara" -msgid "exit" -msgstr "izlaz" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" -msgid "into the ramp" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "" + +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "u rampu" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" +msgid "%sinto %s%s%s" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" +msgid "%sinto %s%s%s|masculine form" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" +msgid "%sinto %s%s%s|feminine form" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" +msgid "%sinto %s%s%s|neuter form" msgstr "" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) @@ -167,92 +190,196 @@ msgstr "" msgid "%sinto the %s" msgstr "" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" +msgid "When possible, please turn around" msgstr "" -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "easily " +#, c-format +msgid "Follow the road for the next %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " +msgid "Enter the roundabout soon" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " +#. TRANSLATORS: %s is the distance to the roundabout +#, c-format +msgid "Enter the roundabout %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" msgstr "" -msgid "When possible, please turn around" +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "Leave the roundabout at the %1$s %2$s" msgstr "" -msgid "Enter the roundabout soon" +msgid "soon" msgstr "" -#. TRANSLATORS: %s is the distance to the roundabout +msgid "now" +msgstr "" + +msgid "then" +msgstr "" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "Enter the roundabout %s" +msgid "then merge%1$s|right" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "then leave the roundabout at the %s" +msgid "Merge %1$s%2$s|right" msgstr "" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Leave the roundabout at the %s" +msgid "then merge%1$s|left" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Follow the road for the next %s" +msgid "Merge %1$s%2$s|left" msgstr "" -msgid "soon" +msgid "on your left" msgstr "" -#. TRANSLATORS: First argument is the how manieth street to take, second the direction +msgid "on your right" +msgstr "" + +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "Take the %1$s road to the %2$s" +msgid "Take exit %1$s %2$s %3$s" msgstr "" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "after %i roads" +msgid "Take the exit %1$s %2$s%3$s" msgstr "" -msgid "now" +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" +msgstr "" + +msgid "at exit" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then continue straight%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep right%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep right %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "" + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " msgstr "" #, c-format -msgid "then take the %1$s road to the %2$s" +msgid "Take the %1$s road to the %2$s" msgstr "" -msgid "error" +#, c-format +msgid "after %i roads" msgstr "" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination #, c-format msgid "Turn %1$s%2$s %3$s%4$s" msgstr "" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "" + +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +msgid "Make a U-turn %1$s|left" msgstr "" +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" +msgstr "" + +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "You have reached your destination %s" +msgid "Make a U-turn %1$s|right" +msgstr "" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" msgstr "" msgid "then you have reached your destination." msgstr "" +#. TRANSLATORS: the arg. is distance +#, c-format +msgid "You have reached your destination %s" +msgstr "" + +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "" + +msgid "Exit" +msgstr "Izlaz" + #. Android resource: @strings/position_popup_title msgid "Position" msgstr "" @@ -1806,10 +1933,10 @@ msgstr "" msgid "Enter Coordinates" msgstr "" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/ca.po.in b/po/ca.po.in index a36140c6e..228ce565f 100644 --- a/po/ca.po.in +++ b/po/ca.po.in @@ -13,19 +13,19 @@ # juliwoodbcn https://launchpad.net/~julianlozano # kualsevol https://launchpad.net/~ojuanv # peremayol@gmail.com https://launchpad.net/~peremayol - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2014-07-09 18:11+0000\n" "Last-Translator: Sergi Gomis <paloky3@gmail.com>\n" "Language-Team: Catalan <ca@li.org>\n" +"Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"Language: ca\n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -143,123 +143,250 @@ msgid_plural "in %d kilometers" msgstr[0] "d'aquí a un quilòmetre" msgstr[1] "d'aquí a %d quilòmetres" -msgid "exit" -msgstr "surt" - -msgid "into the ramp" -msgstr "a la sortida" - -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name #, c-format -msgid "%sinto the street %s%s%s" -msgstr "%s al carrer %s %s %s" +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name #, c-format -msgid "%sinto the %s%s%s|male form" -msgstr "%s al %s %s %s" +msgid "%1$sonto %2$s" +msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" -msgstr "%s a la %s %s %s" +msgid "%1$sonto %2$s|masculine form" +msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" -msgstr "%s a %s %s %s" +msgid "%1$sonto %2$s|feminine form" +msgstr "" -#. TRANSLATORS: gives the name of the next road to turn into (into the E17) +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s" -msgstr "%s cap a la %s" +msgid "%1$sonto %2$s|neuter form" +msgstr "" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "dreta" +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" +msgstr "" -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "esquerra" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name +#, c-format +msgid "%sinto %s%s%s" +msgstr "%sal carrer %s%s%s" -#. TRANSLATORS: Don't forget the ending space -msgid "easily " -msgstr "fàcilment " +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%sinto %s%s%s|masculine form" +msgstr "%sal %s%s%s" -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " -msgstr "fortament " +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%sinto %s%s%s|feminine form" +msgstr "%sa la %s%s%s" -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " -msgstr "" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%sinto %s%s%s|neuter form" +msgstr "%sa %s%s%s" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " -msgstr "" +#. TRANSLATORS: gives the name of the next road to turn into (into the E17) +#, c-format +msgid "%sinto the %s" +msgstr "%scap a la %s" msgid "When possible, please turn around" msgstr "Quan sigui possible, doneu mitja volta" +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" +msgstr "cap a %s" + +#, c-format +msgid "Follow the road for the next %s" +msgstr "Seguiu per la carretera durant els propers %s" + msgid "Enter the roundabout soon" msgstr "Entreu a la rotonda vinent" #. TRANSLATORS: %s is the distance to the roundabout #, c-format msgid "Enter the roundabout %s" +msgstr "Entreu a la rotonda %s" + +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" +msgstr "aleshores deixeu la rotonda a la %1$s %2$s" + +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "Leave the roundabout at the %1$s %2$s" +msgstr "Deixeu la rotonda a la %1$s %2$s" + +msgid "soon" +msgstr "aviat" + +msgid "now" +msgstr "ara" + +msgid "then" +msgstr "aleshores" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|right" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "then leave the roundabout at the %s" +msgid "Merge %1$s%2$s|right" msgstr "" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Leave the roundabout at the %s" +msgid "then merge%1$s|left" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Follow the road for the next %s" -msgstr "Seguiu per la carretera durant els propers %s" +msgid "Merge %1$s%2$s|left" +msgstr "" -msgid "soon" -msgstr "aviat" +msgid "on your left" +msgstr "a l'esquerra" -#. TRANSLATORS: First argument is the how manieth street to take, second the direction +msgid "on your right" +msgstr "a la dreta" + +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "Take the %1$s road to the %2$s" -msgstr "Preneu el %1$s carrer a la %2$s" +msgid "Take exit %1$s %2$s %3$s" +msgstr "Preneu la sortida %1$s %2$s %3$s" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "after %i roads" -msgstr "després de %i carrers" +msgid "Take the exit %1$s %2$s%3$s" +msgstr "Preneu la sortida %1$s %2$s%3$s" -msgid "now" -msgstr "ara" +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" +msgstr "a l'intersecció" + +msgid "at exit" +msgstr "a la sortida" +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "then take the %1$s road to the %2$s" +msgid "then continue straight%1$s" msgstr "" -msgid "error" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" msgstr "" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "Turn %1$s%2$s %3$s%4$s" +msgid "then keep right%1$s" msgstr "" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +msgid "Keep right %1$s%2$s%3$s" msgstr "" +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "You have reached your destination %s" -msgstr "Heu arribat a la destinació %s" +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "dreta" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "esquerra" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "fàcilment " + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "fortament " + +#, c-format +msgid "Take the %1$s road to the %2$s" +msgstr "Preneu el %1$s carrer a la %2$s" + +#, c-format +msgid "after %i roads" +msgstr "després de %i carrers" + +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination +#, c-format +msgid "Turn %1$s%2$s %3$s%4$s" +msgstr "Gireu %1$s%2$s %3$s%4$s" + +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "després, doneu mitja volta" + +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. +#, c-format +msgid "Make a U-turn %1$s|left" +msgstr "Doneu mitja volta %1$s" + +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" +msgstr "després, doneu mitja volta" + +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. +#, c-format +msgid "Make a U-turn %1$s|right" +msgstr "Doneu mitja volta %1$s" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" +msgstr "seguiu" msgid "then you have reached your destination." msgstr "aleshores heu arribat a destí" +#. TRANSLATORS: the arg. is distance +#, c-format +msgid "You have reached your destination %s" +msgstr "Heu arribat a la destinació %s" + +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "Intersecció" + +msgid "Exit" +msgstr "Sortida" + #. Android resource: @strings/position_popup_title msgid "Position" msgstr "Posició" @@ -1546,7 +1673,7 @@ msgid "Police" msgstr "" msgid "Justice" -msgstr "" +msgstr "Jutjats" msgid "Taxi" msgstr "" @@ -1813,10 +1940,10 @@ msgstr "" msgid "Enter Coordinates" msgstr "" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/ckb.po.in b/po/ckb.po.in index 98908ac02..b3f952022 100644 --- a/po/ckb.po.in +++ b/po/ckb.po.in @@ -3,19 +3,19 @@ # This file is distributed under the same license as the navit package. # Many thanks to the contributors of this translation: # kosar https://launchpad.net/~kosar-belana - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2013-06-22 23:00+0000\n" "Last-Translator: kosar <kosar.belana@gmail.com>\n" "Language-Team: Kurdish (Sorani) <ckb@li.org>\n" +"Language: ckb\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"Language: \n" msgid "Running from source directory\n" msgstr "" @@ -132,30 +132,53 @@ msgid_plural "in %d kilometers" msgstr[0] "" msgstr[1] "" -msgid "exit" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" msgstr "" -msgid "into the ramp" +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" +msgid "%sinto %s%s%s" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" +msgid "%sinto %s%s%s|masculine form" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" +msgid "%sinto %s%s%s|feminine form" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" +msgid "%sinto %s%s%s|neuter form" msgstr "" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) @@ -163,92 +186,196 @@ msgstr "" msgid "%sinto the %s" msgstr "" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" +msgid "When possible, please turn around" msgstr "" -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "easily " +#, c-format +msgid "Follow the road for the next %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " +msgid "Enter the roundabout soon" +msgstr "" + +#. TRANSLATORS: %s is the distance to the roundabout +#, c-format +msgid "Enter the roundabout %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "Leave the roundabout at the %1$s %2$s" msgstr "" -msgid "When possible, please turn around" +msgid "soon" msgstr "" -msgid "Enter the roundabout soon" +msgid "now" msgstr "" -#. TRANSLATORS: %s is the distance to the roundabout +msgid "then" +msgstr "" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "Enter the roundabout %s" +msgid "then merge%1$s|right" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "then leave the roundabout at the %s" +msgid "Merge %1$s%2$s|right" msgstr "" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Leave the roundabout at the %s" +msgid "then merge%1$s|left" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Follow the road for the next %s" +msgid "Merge %1$s%2$s|left" msgstr "" -msgid "soon" +msgid "on your left" +msgstr "" + +msgid "on your right" msgstr "" -#. TRANSLATORS: First argument is the how manieth street to take, second the direction +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "Take the %1$s road to the %2$s" +msgid "Take exit %1$s %2$s %3$s" msgstr "" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "after %i roads" +msgid "Take the exit %1$s %2$s%3$s" msgstr "" -msgid "now" +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" msgstr "" +msgid "at exit" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "then take the %1$s road to the %2$s" +msgid "then continue straight%1$s" msgstr "" -msgid "error" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" msgstr "" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep right%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep right %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "" + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "" + +#, c-format +msgid "Take the %1$s road to the %2$s" +msgstr "" + +#, c-format +msgid "after %i roads" +msgstr "" + +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination #, c-format msgid "Turn %1$s%2$s %3$s%4$s" msgstr "" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "" + +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +msgid "Make a U-turn %1$s|left" +msgstr "" + +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" msgstr "" +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "You have reached your destination %s" +msgid "Make a U-turn %1$s|right" +msgstr "" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" msgstr "" msgid "then you have reached your destination." msgstr "" +#. TRANSLATORS: the arg. is distance +#, c-format +msgid "You have reached your destination %s" +msgstr "" + +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "" + +msgid "Exit" +msgstr "" + #. Android resource: @strings/position_popup_title msgid "Position" msgstr "" @@ -1802,10 +1929,10 @@ msgstr "" msgid "Enter Coordinates" msgstr "" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/cs.po.in b/po/cs.po.in index efc464925..9c78adfe4 100644 --- a/po/cs.po.in +++ b/po/cs.po.in @@ -15,19 +15,19 @@ # Vojtěch Látal https://launchpad.net/~vojtik # stritek https://launchpad.net/~stritek # talmik https://launchpad.net/~mikatom - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2015-03-15 14:56+0000\n" "Last-Translator: Jakuje <jakuje@gmail.com>\n" "Language-Team: Čeština\n" +"Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"Language: \n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -149,30 +149,53 @@ msgstr[0] "za %d kilometr" msgstr[1] "za %d kilometry" msgstr[2] "za %d kilometrů" -msgid "exit" -msgstr "ukončit" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "%1$sna %2$s%3$s%4$s" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "%1$sna %2$s" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "%1$sna %2$s" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "%1$sna %2$s" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "%1$sna %2$s" -msgid "into the ramp" +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "na přivadeč" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" -msgstr "%sdo ulice %s%s%s" +msgid "%sinto %s%s%s" +msgstr "%sdo %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" -msgstr "%s do %s%s%s" +msgid "%sinto %s%s%s|masculine form" +msgstr "%sdo %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" +msgid "%sinto %s%s%s|feminine form" msgstr "%sdo %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" +msgid "%sinto %s%s%s|neuter form" msgstr "%sdo %s%s%s" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) @@ -180,32 +203,17 @@ msgstr "%sdo %s%s%s" msgid "%sinto the %s" msgstr "%sna %s" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "vpravo" - -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "vlevo" - -#. TRANSLATORS: Don't forget the ending space -msgid "easily " -msgstr "mírně " - -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " -msgstr "silně " - -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " -msgstr "" +msgid "When possible, please turn around" +msgstr "Až to bude možné, otočte se" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" msgstr "" -msgid "When possible, please turn around" -msgstr "Až to bude možné, otočte se" +#, c-format +msgid "Follow the road for the next %s" +msgstr "Pokračujte po cestě dalších %s" msgid "Enter the roundabout soon" msgstr "Brzy najeďte na kruhový objezd" @@ -215,57 +223,176 @@ msgstr "Brzy najeďte na kruhový objezd" msgid "Enter the roundabout %s" msgstr "Najeďte na kruhový objezd %s" +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" +msgstr "pak sjeďte na %1$s %2$s" + +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "Leave the roundabout at the %1$s %2$s" +msgstr "Sjeďte na %1$s %2$s" + +msgid "soon" +msgstr "brzy" + +msgid "now" +msgstr "nyní" + +msgid "then" +msgstr "pak" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "then leave the roundabout at the %s" +msgid "then merge%1$s|right" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "Leave the roundabout at the %s" +msgid "Merge %1$s%2$s|right" msgstr "" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Follow the road for the next %s" -msgstr "Pokračujte po cestě dalších %s" +msgid "then merge%1$s|left" +msgstr "" -msgid "soon" -msgstr "brzy" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|left" +msgstr "" + +msgid "on your left" +msgstr "" -#. TRANSLATORS: First argument is the how manieth street to take, second the direction +msgid "on your right" +msgstr "" + +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "Take the %1$s road to the %2$s" -msgstr "Jeďte na %1$s silnici %2$s" +msgid "Take exit %1$s %2$s %3$s" +msgstr "" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "after %i roads" -msgstr "za %i silnice" +msgid "Take the exit %1$s %2$s%3$s" +msgstr "" -msgid "now" -msgstr "nyní" +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" +msgstr "" + +msgid "at exit" +msgstr "" +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "then take the %1$s road to the %2$s" +msgid "then continue straight%1$s" msgstr "" -msgid "error" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" msgstr "" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "Turn %1$s%2$s %3$s%4$s" +msgid "then keep right%1$s" msgstr "" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +msgid "Keep right %1$s%2$s%3$s" msgstr "" +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "You have reached your destination %s" -msgstr "%s dorazíte do cíle" +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "vpravo" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "vlevo" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "mírně " + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "silně " + +#, c-format +msgid "Take the %1$s road to the %2$s" +msgstr "Jeďte na %1$s silnici %2$s" + +#, c-format +msgid "after %i roads" +msgstr "za %i silnice" + +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination +#, c-format +msgid "Turn %1$s%2$s %3$s%4$s" +msgstr "Zabočte %1$s%2$s %3$s%4$s" + +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "pak otočte se" + +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. +#, c-format +msgid "Make a U-turn %1$s|left" +msgstr "Otočte se %1$s" + +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" +msgstr "pak otočte se" + +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. +#, c-format +msgid "Make a U-turn %1$s|right" +msgstr "Otočte se %1$s" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" +msgstr "" msgid "then you have reached your destination." msgstr "pak budete v cíli." +#. TRANSLATORS: the arg. is distance +#, c-format +msgid "You have reached your destination %s" +msgstr "%s dorazíte do cíle" + +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "" + +msgid "Exit" +msgstr "Ukončit" + #. Android resource: @strings/position_popup_title msgid "Position" msgstr "Poloha" @@ -1821,10 +1948,10 @@ msgstr "Body trasy" msgid "Enter Coordinates" msgstr "Zadejte souřadnice" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/cy.po.in b/po/cy.po.in index ff8e87d07..f417c0845 100644 --- a/po/cy.po.in +++ b/po/cy.po.in @@ -4,20 +4,20 @@ # Many thanks to the contributors of this translation: # Padi Phillips https://launchpad.net/~padi # Simon Hewison https://launchpad.net/~simon-hewison-6 - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2015-01-18 20:41+0000\n" "Last-Translator: Padi Phillips <Unknown>\n" "Language-Team: Welsh <cy@li.org>\n" +"Language: cy\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? " "2 : 3;\n" -"Language: cy\n" msgid "Running from source directory\n" msgstr "" @@ -136,30 +136,53 @@ msgid_plural "in %d kilometers" msgstr[0] "" msgstr[1] "" -msgid "exit" -msgstr "allanfa" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "" -msgid "into the ramp" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "" + +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" +msgid "%sinto %s%s%s" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" +msgid "%sinto %s%s%s|masculine form" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" +msgid "%sinto %s%s%s|feminine form" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" +msgid "%sinto %s%s%s|neuter form" msgstr "" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) @@ -167,92 +190,196 @@ msgstr "" msgid "%sinto the %s" msgstr "" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" +msgid "When possible, please turn around" msgstr "" -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "easily " +#, c-format +msgid "Follow the road for the next %s" +msgstr "Dilynwch yr heol am y %s nesaf" + +msgid "Enter the roundabout soon" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " -msgstr "yn cryf " +#. TRANSLATORS: %s is the distance to the roundabout +#, c-format +msgid "Enter the roundabout %s" +msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "Leave the roundabout at the %1$s %2$s" msgstr "" -msgid "When possible, please turn around" +msgid "soon" +msgstr "yn fuan" + +msgid "now" +msgstr "nawr" + +msgid "then" msgstr "" -msgid "Enter the roundabout soon" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|right" msgstr "" -#. TRANSLATORS: %s is the distance to the roundabout +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "Enter the roundabout %s" +msgid "Merge %1$s%2$s|right" msgstr "" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "then leave the roundabout at the %s" +msgid "then merge%1$s|left" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Leave the roundabout at the %s" +msgid "Merge %1$s%2$s|left" msgstr "" +msgid "on your left" +msgstr "" + +msgid "on your right" +msgstr "" + +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "Follow the road for the next %s" -msgstr "Dilynwch yr heol am y %s nesaf" +msgid "Take exit %1$s %2$s %3$s" +msgstr "" -msgid "soon" -msgstr "yn fuan" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination +#, c-format +msgid "Take the exit %1$s %2$s%3$s" +msgstr "" -#. TRANSLATORS: First argument is the how manieth street to take, second the direction +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" +msgstr "" + +msgid "at exit" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "Take the %1$s road to the %2$s" +msgid "then continue straight%1$s" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination #, c-format -msgid "after %i roads" +msgid "Continue straight %1$s%2$s%3$s" msgstr "" -msgid "now" -msgstr "nawr" +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep right%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep right %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "" + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "yn cryf " #, c-format -msgid "then take the %1$s road to the %2$s" +msgid "Take the %1$s road to the %2$s" msgstr "" -msgid "error" +#, c-format +msgid "after %i roads" msgstr "" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination #, c-format msgid "Turn %1$s%2$s %3$s%4$s" msgstr "" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "" + +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +msgid "Make a U-turn %1$s|left" +msgstr "" + +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" msgstr "" +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "You have reached your destination %s" +msgid "Make a U-turn %1$s|right" +msgstr "" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" msgstr "" msgid "then you have reached your destination." msgstr "" +#. TRANSLATORS: the arg. is distance +#, c-format +msgid "You have reached your destination %s" +msgstr "" + +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "" + +msgid "Exit" +msgstr "Allanfa" + #. Android resource: @strings/position_popup_title msgid "Position" msgstr "" @@ -1806,10 +1933,10 @@ msgstr "" msgid "Enter Coordinates" msgstr "" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/da.po.in b/po/da.po.in index 9c1baf9ba..18d631f7b 100644 --- a/po/da.po.in +++ b/po/da.po.in @@ -11,19 +11,19 @@ # Ole Carlsen https://launchpad.net/~ole-carlsen-web # Tomas Groth https://launchpad.net/~tomasgroth # Uffe Kjems https://launchpad.net/~uffekjems - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2013-09-28 01:40+0000\n" "Last-Translator: Lasse Luttermann <luttermann@silenzio.dk>\n" "Language-Team: Glenn Sommer <glemsom@gmail.com>\n" +"Language: da\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"Language: \n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -141,63 +141,71 @@ msgid_plural "in %d kilometers" msgstr[0] "om én kilometer" msgstr[1] "om %d kilometer" -msgid "exit" -msgstr "afkørsel" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "" -msgid "into the ramp" +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "op på rampen" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" -msgstr "%s ind i gaden %s%s%s" +msgid "%sinto %s%s%s" +msgstr "%sind i %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" -msgstr "%s ind i %s%s%s" +msgid "%sinto %s%s%s|masculine form" +msgstr "%sind i %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" -msgstr "%s ind i %s%s%s" +msgid "%sinto %s%s%s|feminine form" +msgstr "%sind i %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" -msgstr "%s ind i %s%s%s" +msgid "%sinto %s%s%s|neuter form" +msgstr "%sind i %s%s%s" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) #, c-format msgid "%sinto the %s" msgstr "%sind i %s" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "højre" - -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "venstre" - -#. TRANSLATORS: Don't forget the ending space -msgid "easily " -msgstr "blødt " - -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " -msgstr "skarpt " - -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " -msgstr "" +msgid "When possible, please turn around" +msgstr "Når muligt, vend venligst om" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" msgstr "" -msgid "When possible, please turn around" -msgstr "Når muligt, vend venligst om" +#, c-format +msgid "Follow the road for the next %s" +msgstr "Følg vejen de næste %s" msgid "Enter the roundabout soon" msgstr "Kør snart ind i rundkørslen" @@ -205,59 +213,178 @@ msgstr "Kør snart ind i rundkørslen" #. TRANSLATORS: %s is the distance to the roundabout #, c-format msgid "Enter the roundabout %s" +msgstr "Kør ind i rundkørslen %s" + +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" +msgstr "forlad så rundkørslen ved den %1$s %2$s" + +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "Leave the roundabout at the %1$s %2$s" +msgstr "Forlad rundkørslen ved den %1$s %2$s" + +msgid "soon" +msgstr "snart" + +msgid "now" +msgstr "nu" + +msgid "then" +msgstr "så" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|right" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "then leave the roundabout at the %s" +msgid "Merge %1$s%2$s|right" msgstr "" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Leave the roundabout at the %s" +msgid "then merge%1$s|left" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Follow the road for the next %s" -msgstr "Følg vejen de næste %s" +msgid "Merge %1$s%2$s|left" +msgstr "" -msgid "soon" -msgstr "snart" +msgid "on your left" +msgstr "" -#. TRANSLATORS: First argument is the how manieth street to take, second the direction +msgid "on your right" +msgstr "" + +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "Take the %1$s road to the %2$s" -msgstr "Tag den %1$s vej til %2$s" +msgid "Take exit %1$s %2$s %3$s" +msgstr "Tag den afkørslen %1$s %2$s %3$s" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "after %i roads" -msgstr "efter %i veje" +msgid "Take the exit %1$s %2$s%3$s" +msgstr "Tag den afkørslen %1$s %2$s%3$s" -msgid "now" -msgstr "nu" +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" +msgstr "" + +msgid "at exit" +msgstr "" +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "then take the %1$s road to the %2$s" +msgid "then continue straight%1$s" msgstr "" -msgid "error" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" msgstr "" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "Turn %1$s%2$s %3$s%4$s" +msgid "then keep right%1$s" msgstr "" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +msgid "Keep right %1$s%2$s%3$s" msgstr "" +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "You have reached your destination %s" -msgstr "Du er fremme ved destinationen %s" +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "højre" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "venstre" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "blødt " + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "skarpt " + +#, c-format +msgid "Take the %1$s road to the %2$s" +msgstr "Tag den %1$s vej til %2$s" + +#, c-format +msgid "after %i roads" +msgstr "efter %i veje" + +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination +#, c-format +msgid "Turn %1$s%2$s %3$s%4$s" +msgstr "Drej %1$s%2$s %3$s%4$s" + +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "vend så om" + +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. +#, c-format +msgid "Make a U-turn %1$s|left" +msgstr "Vend om %1$s" + +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" +msgstr "vend så om" + +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. +#, c-format +msgid "Make a U-turn %1$s|right" +msgstr "Vend om %1$s" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" +msgstr "følg" msgid "then you have reached your destination." msgstr "og så ankommer du til din destination" +#. TRANSLATORS: the arg. is distance +#, c-format +msgid "You have reached your destination %s" +msgstr "Du er fremme ved destinationen %s" + +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "Motorvejskryds" + +msgid "Exit" +msgstr "Afkørsel" + #. Android resource: @strings/position_popup_title msgid "Position" msgstr "Position" @@ -1811,10 +1938,10 @@ msgstr "" msgid "Enter Coordinates" msgstr "" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/de.po.in b/po/de.po.in index 5f79a20c8..d220b0e9a 100644 --- a/po/de.po.in +++ b/po/de.po.in @@ -34,19 +34,19 @@ # singesang https://launchpad.net/~singesang # spaetz https://launchpad.net/~spaetz # vsandre https://launchpad.net/~riedel-andre - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2015-04-22 22:10+0000\n" "Last-Translator: Mathias Klein <ma_klein@gmx.de>\n" "Language-Team: Martin Schaller <martin-s@sourceforge.net>\n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"Language: \n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -126,11 +126,11 @@ msgstr "In %d Metern" #, c-format msgid "%d.%d miles" -msgstr "%d.%d Meilen" +msgstr "%d,%d Meilen" #, c-format msgid "in %d.%d miles" -msgstr "in %d.%d Meilen" +msgstr "in %d,%d Meilen" #, c-format msgid "%d.%d kilometers" @@ -164,30 +164,53 @@ msgid_plural "in %d kilometers" msgstr[0] "In einem Kilometer" msgstr[1] "In %d Kilometern" -msgid "exit" -msgstr "Ausfahrt" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "%1$sauf die %2$s%3$s%4$s" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "%1$sauf die Straße %2$s" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "%1$sauf den %2$s" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "%1$sauf die %2$s" -msgid "into the ramp" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "%1$sauf das %2$s" + +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "auf die Auffahrt" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" +msgid "%sinto %s%s%s" msgstr "%sauf die Straße %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" +msgid "%sinto %s%s%s|masculine form" msgstr "%sauf den %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" +msgid "%sinto %s%s%s|feminine form" msgstr "%sauf die %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" +msgid "%sinto %s%s%s|neuter form" msgstr "%sauf das %s%s%s" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) @@ -195,34 +218,19 @@ msgstr "%sauf das %s%s%s" msgid "%sinto the %s" msgstr "%sauf die %s" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "rechts" - -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "links" - -#. TRANSLATORS: Don't forget the ending space -msgid "easily " -msgstr "leicht " - -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " -msgstr "scharf " - -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " -msgstr "sehr stark " - -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " -msgstr "unbekannt " - # msgid "When possible, please turn around" msgstr "Wenn möglich, bitte wenden" +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" +msgstr "in Richtung %s" + +#, c-format +msgid "Follow the road for the next %s" +msgstr "Dem Straßenverlauf %s folgen" + msgid "Enter the roundabout soon" msgstr "Demnächst in den Kreisverkehr einfahren" @@ -231,22 +239,117 @@ msgstr "Demnächst in den Kreisverkehr einfahren" msgid "Enter the roundabout %s" msgstr "%s in den Kreisverkehr einfahren" +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow #, c-format -msgid "then leave the roundabout at the %s" -msgstr "anschliessend verlassen Sie den Kreisverkehr an der %s" - -#, c-format -msgid "Leave the roundabout at the %s" -msgstr "Verlassen Sie den Kreisverkehr an der %s" +msgid "then leave the roundabout at the %1$s %2$s" +msgstr "anschließend verlassen Sie den Kreisverkehr an der %1$s %2$s" +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow #, c-format -msgid "Follow the road for the next %s" -msgstr "Dem Straßenverlauf %s folgen" +msgid "Leave the roundabout at the %1$s %2$s" +msgstr "Verlassen Sie den Kreisverkehr an der %1$s %2$s" msgid "soon" msgstr "Demnächst" -#. TRANSLATORS: First argument is the how manieth street to take, second the direction +msgid "now" +msgstr "Jetzt" + +msgid "then" +msgstr "dann" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|right" +msgstr "dann auf die%1$s auffahren" + +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|right" +msgstr "Fahren Sie %1$s%2$s auf" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|left" +msgstr "dann auf die%1$s auffahren" + +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|left" +msgstr "Fahren Sie %1$s%2$s auf" + +msgid "on your left" +msgstr "" + +msgid "on your right" +msgstr "" + +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance +#, c-format +msgid "Take exit %1$s %2$s %3$s" +msgstr "Nehmen Sie die Ausfahrt %1$s %2$s %3$s" + +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination +#, c-format +msgid "Take the exit %1$s %2$s%3$s" +msgstr "Nehmen Sie die Ausfahrt %1$s %2$s%3$s" + +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" +msgstr "am Autobahnknoten" + +msgid "at exit" +msgstr "an der Ausfahrt" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then continue straight%1$s" +msgstr "dann geradeaus fahren%1$s" + +# c-format +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" +msgstr "Geradeaus fahren %1$s%2$s%3$s" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep right%1$s" +msgstr "dann rechts halten%1$s" + +# c-format +# todo unify left/right string +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep right %1$s%2$s%3$s" +msgstr "Rechts halten %1$s%2$s%3$s" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep left%1$s" +msgstr "dann links halten%1$s" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "Links halten %1$s%2$s%3$s" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "rechts" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "links" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "leicht " + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "scharf " + #, c-format msgid "Take the %1$s road to the %2$s" msgstr "Die %1$s Straße %2$s abbiegen" @@ -255,32 +358,59 @@ msgstr "Die %1$s Straße %2$s abbiegen" msgid "after %i roads" msgstr "nach %i Straßen" -msgid "now" -msgstr "Jetzt" - +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination #, c-format -msgid "then take the %1$s road to the %2$s" -msgstr "dann die %1$s Straße %2$s abbiegen" +msgid "Turn %1$s%2$s %3$s%4$s" +msgstr "Biegen Sie %1$s%2$s ab %3$s%4$s" -msgid "error" -msgstr "Fehler" +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "dann wenden" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "Turn %1$s%2$s %3$s%4$s" -msgstr "%3$s %1$s%2$s abbiegen%4$s" +msgid "Make a U-turn %1$s|left" +msgstr "Wenden Sie %1$s" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" +msgstr "dann wenden" + +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" -msgstr "dann %3$s %1$s%2$s abbiegen%4$s" +msgid "Make a U-turn %1$s|right" +msgstr "Wenden Sie %1$s" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" +msgstr "folgen" +msgid "then you have reached your destination." +msgstr "dann haben Sie Ihr Ziel erreicht." + +#. TRANSLATORS: the arg. is distance #, c-format msgid "You have reached your destination %s" msgstr "Sie haben Ihr Ziel %s erreicht" -msgid "then you have reached your destination." -msgstr "dann haben Sie Ihr Ziel erreicht." +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "Autobahnknoten" + +msgid "Exit" +msgstr "Ausfahrt" #. Android resource: @strings/position_popup_title msgid "Position" @@ -1841,10 +1971,10 @@ msgstr "Wegpunkte" msgid "Enter Coordinates" msgstr "Koordinaten eingeben" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/de_CH.po.in b/po/de_CH.po.in index a039fdc8d..b5086c86a 100644 --- a/po/de_CH.po.in +++ b/po/de_CH.po.in @@ -2,19 +2,19 @@ # Copyright (C) 2006-2014 The Navit Team # This file is distributed under the same license as the navit package. # Many thanks to the contributors of this translation: - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2010-05-18 08:49+0000\n" "Last-Translator: \n" "Language-Team: German (Switzerland) <de_CH@li.org>\n" +"Language: de_CH\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"Language: \n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -132,30 +132,53 @@ msgid_plural "in %d kilometers" msgstr[0] "" msgstr[1] "" -msgid "exit" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" msgstr "" -msgid "into the ramp" +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" +msgid "%sinto %s%s%s" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" +msgid "%sinto %s%s%s|masculine form" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" +msgid "%sinto %s%s%s|feminine form" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" +msgid "%sinto %s%s%s|neuter form" msgstr "" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) @@ -163,92 +186,196 @@ msgstr "" msgid "%sinto the %s" msgstr "" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" +msgid "When possible, please turn around" msgstr "" -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "easily " +#, c-format +msgid "Follow the road for the next %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " +msgid "Enter the roundabout soon" +msgstr "" + +#. TRANSLATORS: %s is the distance to the roundabout +#, c-format +msgid "Enter the roundabout %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "Leave the roundabout at the %1$s %2$s" msgstr "" -msgid "When possible, please turn around" +msgid "soon" msgstr "" -msgid "Enter the roundabout soon" +msgid "now" msgstr "" -#. TRANSLATORS: %s is the distance to the roundabout +msgid "then" +msgstr "" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "Enter the roundabout %s" +msgid "then merge%1$s|right" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "then leave the roundabout at the %s" +msgid "Merge %1$s%2$s|right" msgstr "" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Leave the roundabout at the %s" +msgid "then merge%1$s|left" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Follow the road for the next %s" +msgid "Merge %1$s%2$s|left" msgstr "" -msgid "soon" +msgid "on your left" +msgstr "" + +msgid "on your right" msgstr "" -#. TRANSLATORS: First argument is the how manieth street to take, second the direction +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "Take the %1$s road to the %2$s" +msgid "Take exit %1$s %2$s %3$s" msgstr "" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "after %i roads" +msgid "Take the exit %1$s %2$s%3$s" msgstr "" -msgid "now" +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" msgstr "" +msgid "at exit" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "then take the %1$s road to the %2$s" +msgid "then continue straight%1$s" msgstr "" -msgid "error" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" msgstr "" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep right%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep right %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "" + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "" + +#, c-format +msgid "Take the %1$s road to the %2$s" +msgstr "" + +#, c-format +msgid "after %i roads" +msgstr "" + +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination #, c-format msgid "Turn %1$s%2$s %3$s%4$s" msgstr "" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "" + +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +msgid "Make a U-turn %1$s|left" +msgstr "" + +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" msgstr "" +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "You have reached your destination %s" +msgid "Make a U-turn %1$s|right" +msgstr "" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" msgstr "" msgid "then you have reached your destination." msgstr "" +#. TRANSLATORS: the arg. is distance +#, c-format +msgid "You have reached your destination %s" +msgstr "" + +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "" + +msgid "Exit" +msgstr "" + #. Android resource: @strings/position_popup_title msgid "Position" msgstr "" @@ -1802,10 +1929,10 @@ msgstr "" msgid "Enter Coordinates" msgstr "" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/el.po.in b/po/el.po.in index 130cd2da3..56cd0897c 100644 --- a/po/el.po.in +++ b/po/el.po.in @@ -8,19 +8,19 @@ # alichani https://launchpad.net/~alichani # okiroi https://launchpad.net/~g-theodoroy # vassilis https://launchpad.net/~kagemarou - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2014-12-07 10:54+0000\n" "Last-Translator: aitolos <Unknown>\n" "Language-Team: Greek <el@li.org>\n" +"Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"Language: el\n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -138,88 +138,188 @@ msgid_plural "in %d kilometers" msgstr[0] "σε ένα χιλιόμετρο" msgstr[1] "σε %d χιλιόμετρα" -msgid "exit" -msgstr "έξοδος" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "" -msgid "into the ramp" +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "στη ράμπα" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" -msgstr "%s στην οδό %s%s%s" +msgid "%sinto %s%s%s" +msgstr "%sστην οδό %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" +msgid "%sinto %s%s%s|masculine form" msgstr "%sστον %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" +msgid "%sinto %s%s%s|feminine form" msgstr "%sστην %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" +msgid "%sinto %s%s%s|neuter form" msgstr "%sστο %s%s%s" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) #, c-format msgid "%sinto the %s" -msgstr "%s στην %s" +msgstr "%sστην %s" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "δεξιά" +msgid "When possible, please turn around" +msgstr "Όταν είναι δυνατόν, κάνε αναστροφή" -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "αριστερά" +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" +msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "easily " -msgstr "ελαφρά " +#, c-format +msgid "Follow the road for the next %s" +msgstr "Ακολουθήστε το δρόμο για τα επόμενα %s" -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " -msgstr "Κλειστά " +msgid "Enter the roundabout soon" +msgstr "Μπές στη κυκλική πορεία άμεσα" -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " +#. TRANSLATORS: %s is the distance to the roundabout +#, c-format +msgid "Enter the roundabout %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" +msgstr "και βγείτε απο την κυκλική πορεία στην %1$s %2$s" + +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "Leave the roundabout at the %1$s %2$s" +msgstr "Εξοδος απο την κυκλική πορεία στην %1$s %2$s" + +msgid "soon" +msgstr "σύντομα" + +msgid "now" +msgstr "τώρα" + +msgid "then" +msgstr "και" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|right" msgstr "" -msgid "When possible, please turn around" -msgstr "Όταν είναι δυνατόν, κάνε αναστροφή" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|right" +msgstr "" -msgid "Enter the roundabout soon" -msgstr "Μπές στη κυκλική πορεία άμεσα" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|left" +msgstr "" -#. TRANSLATORS: %s is the distance to the roundabout +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Enter the roundabout %s" +msgid "Merge %1$s%2$s|left" +msgstr "" + +msgid "on your left" msgstr "" +msgid "on your right" +msgstr "" + +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "then leave the roundabout at the %s" +msgid "Take exit %1$s %2$s %3$s" msgstr "" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "Leave the roundabout at the %s" +msgid "Take the exit %1$s %2$s%3$s" +msgstr "" + +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" +msgstr "" + +msgid "at exit" msgstr "" +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "Follow the road for the next %s" -msgstr "Ακολουθήστε το δρόμο για τα επόμενα %s" +msgid "then continue straight%1$s" +msgstr "" -msgid "soon" -msgstr "σύντομα" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep right%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep right %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "δεξιά" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "αριστερά" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "ελαφρά " + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "κλειστά " -#. TRANSLATORS: First argument is the how manieth street to take, second the direction #, c-format msgid "Take the %1$s road to the %2$s" msgstr "Πάρτε τον %1$s δρόμο για το %2$s" @@ -228,32 +328,59 @@ msgstr "Πάρτε τον %1$s δρόμο για το %2$s" msgid "after %i roads" msgstr "μετά από %i δρόμους" -msgid "now" -msgstr "τώρα" - +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination #, c-format -msgid "then take the %1$s road to the %2$s" -msgstr "" +msgid "Turn %1$s%2$s %3$s%4$s" +msgstr "Στρίψτε %1$s%2$s %3$s%4$s" -msgid "error" -msgstr "" +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "και κάνε αναστροφή" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "Turn %1$s%2$s %3$s%4$s" -msgstr "" +msgid "Make a U-turn %1$s|left" +msgstr "Κάνε αναστροφή %1$s" + +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" +msgstr "και κάνε αναστροφή" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +msgid "Make a U-turn %1$s|right" +msgstr "Κάνε αναστροφή %1$s" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" msgstr "" +msgid "then you have reached your destination." +msgstr "τότε έχετε φτάσει στον προορισμό σας." + +#. TRANSLATORS: the arg. is distance #, c-format msgid "You have reached your destination %s" msgstr "Φτάσατε στον προορισμό σας %s" -msgid "then you have reached your destination." -msgstr "τότε έχετε φτάσει στον προορισμό σας." +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "" + +msgid "Exit" +msgstr "Εξοδος" #. Android resource: @strings/position_popup_title msgid "Position" @@ -1808,10 +1935,10 @@ msgstr "" msgid "Enter Coordinates" msgstr "" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/en.po.in b/po/en.po.in new file mode 100644 index 000000000..ca337896c --- /dev/null +++ b/po/en.po.in @@ -0,0 +1,2736 @@ +# English translations for navit +# Copyright (C) 2006-2015 The Navit Team +# This file is distributed under the same license as the navit package. +msgid "" +msgstr "" +"Project-Id-Version: navit 0.5.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" +"PO-Revision-Date: 2015-05-14 13:03+0200\n" +"Last-Translator: Michael von Glasow <michael@vonglasow.com>\n" +"Language-Team: English <en@li.org>\n" +"Language: en\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" + +msgid "Running from source directory\n" +msgstr "Running from source directory\n" + +#, c-format +msgid "setting '%s' to '%s'\n" +msgstr "setting '%s' to '%s'\n" + +#. TRANSLATORS: the following counts refer to streets +msgid "zeroth" +msgstr "zeroth" + +msgid "first" +msgstr "first" + +msgid "second" +msgstr "second" + +msgid "third" +msgstr "third" + +msgid "fourth" +msgstr "fourth" + +msgid "fifth" +msgstr "fifth" + +msgid "sixth" +msgstr "sixth" + +#. TRANSLATORS: the following counts refer to roundabout exits +msgid "zeroth exit" +msgstr "zeroth exit" + +msgid "first exit" +msgstr "first exit" + +msgid "second exit" +msgstr "second exit" + +msgid "third exit" +msgstr "third exit" + +msgid "fourth exit" +msgstr "fourth exit" + +msgid "fifth exit" +msgstr "fifth exit" + +msgid "sixth exit" +msgstr "sixth exit" + +#, c-format +msgid "%d m" +msgstr "%d m" + +#, c-format +msgid "in %d m" +msgstr "in %d m" + +#, c-format +msgid "%d feet" +msgstr "" + +#, c-format +msgid "in %d feet" +msgstr "" + +#, c-format +msgid "%d meters" +msgstr "%d meters" + +#, c-format +msgid "in %d meters" +msgstr "in %d meters" + +#, c-format +msgid "%d.%d miles" +msgstr "" + +#, c-format +msgid "in %d.%d miles" +msgstr "" + +#, c-format +msgid "%d.%d kilometers" +msgstr "%d.%d kilometers" + +#, c-format +msgid "in %d.%d kilometers" +msgstr "in %d.%d kilometers" + +#, c-format +msgid "one mile" +msgid_plural "%d miles" +msgstr[0] "" +msgstr[1] "" + +#, c-format +msgid "in one mile" +msgid_plural "in %d miles" +msgstr[0] "" +msgstr[1] "" + +#, c-format +msgid "one kilometer" +msgid_plural "%d kilometers" +msgstr[0] "one kilometer" +msgstr[1] "%d kilometers" + +#, c-format +msgid "in one kilometer" +msgid_plural "in %d kilometers" +msgstr[0] "in one kilometer" +msgstr[1] "in %d kilometers" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "%1$sonto %2$s" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "%1$sonto %2$s" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "%1$sonto %2$s" + +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" +msgstr "onto the motorway ramp" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name +#, c-format +msgid "%sinto %s%s%s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%sinto %s%s%s|masculine form" +msgstr "%sinto %s%s%s" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%sinto %s%s%s|feminine form" +msgstr "%sinto %s%s%s" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%sinto %s%s%s|neuter form" +msgstr "%sinto %s%s%s" + +#. TRANSLATORS: gives the name of the next road to turn into (into the E17) +#, c-format +msgid "%sinto the %s" +msgstr "%sinto the %s" + +msgid "When possible, please turn around" +msgstr "When possible, please turn around" + +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" +msgstr "" + +#, c-format +msgid "Follow the road for the next %s" +msgstr "Follow the road for the next %s" + +msgid "Enter the roundabout soon" +msgstr "" + +#. TRANSLATORS: %s is the distance to the roundabout +#, c-format +msgid "Enter the roundabout %s" +msgstr "" + +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" +msgstr "" + +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "Leave the roundabout at the %1$s %2$s" +msgstr "" + +msgid "soon" +msgstr "soon" + +msgid "now" +msgstr "now" + +msgid "then" +msgstr "" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|right" +msgstr "then merge%1$s" + +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|right" +msgstr "Merge %1$s%2$s" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|left" +msgstr "then merge%1$s" + +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|left" +msgstr "Merge %1$s%2$s" + +msgid "on your left" +msgstr "" + +msgid "on your right" +msgstr "" + +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance +#, c-format +msgid "Take exit %1$s %2$s %3$s" +msgstr "" + +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination +#, c-format +msgid "Take the exit %1$s %2$s%3$s" +msgstr "" + +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" +msgstr "" + +msgid "at exit" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then continue straight%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep right%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep right %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "right" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "left" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "easily " + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "strongly " + +#, c-format +msgid "Take the %1$s road to the %2$s" +msgstr "Take the %1$s road to the %2$s" + +#, c-format +msgid "after %i roads" +msgstr "after %i roads" + +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination +#, c-format +msgid "Turn %1$s%2$s %3$s%4$s" +msgstr "Turn %1$s%2$s %3$s%4$s" + +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "then make a U-turn" + +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. +#, c-format +msgid "Make a U-turn %1$s|left" +msgstr "Make a U-turn %1$s" + +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" +msgstr "then make a U-turn" + +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. +#, c-format +msgid "Make a U-turn %1$s|right" +msgstr "Make a U-turn %1$s" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" +msgstr "" + +msgid "then you have reached your destination." +msgstr "then you have reached your destination." + +#. TRANSLATORS: the arg. is distance +#, c-format +msgid "You have reached your destination %s" +msgstr "You have reached your destination %s" + +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "Interchange" + +msgid "Exit" +msgstr "Exit" + +#. Android resource: @strings/position_popup_title +msgid "Position" +msgstr "" + +msgid "Command" +msgstr "" + +msgid "Length" +msgstr "" + +msgid "km" +msgstr "" + +msgid "m" +msgstr "" + +msgid "Time" +msgstr "" + +msgid "Destination Length" +msgstr "" + +msgid "Destination Time" +msgstr "" + +msgid "Roadbook" +msgstr "" + +#, c-format +msgid "Waypoint %d" +msgstr "" + +msgid "Visit before..." +msgstr "" + +msgid "Set as position" +msgstr "" + +msgid "Set as destination" +msgstr "" + +msgid "Add as bookmark" +msgstr "" + +#, c-format +msgid "Point 0x%x 0x%x" +msgstr "" + +#, c-format +msgid "Screen coord : %d %d" +msgstr "" + +#. 020 +msgid "Andorra" +msgstr "" + +#. 784 +msgid "United Arab Emirates" +msgstr "" + +#. 004 +msgid "Afghanistan" +msgstr "" + +#. 028 +msgid "Antigua and Barbuda" +msgstr "" + +#. 660 +msgid "Anguilla" +msgstr "" + +#. 008 +msgid "Albania" +msgstr "" + +#. 051 +msgid "Armenia" +msgstr "" + +#. 530 +msgid "Netherlands Antilles" +msgstr "" + +#. 024 +msgid "Angola" +msgstr "" + +#. 010 +msgid "Antarctica" +msgstr "" + +#. 032 +msgid "Argentina" +msgstr "" + +#. 016 +msgid "American Samoa" +msgstr "" + +#. 040 +msgid "Austria" +msgstr "" + +#. 036 +msgid "Australia" +msgstr "" + +#. 533 +msgid "Aruba" +msgstr "" + +#. 248 +msgid "Aland Islands" +msgstr "" + +#. 031 +msgid "Azerbaijan" +msgstr "" + +#. 070 +msgid "Bosnia and Herzegovina" +msgstr "" + +#. 052 +msgid "Barbados" +msgstr "" + +#. 050 +msgid "Bangladesh" +msgstr "" + +#. 056 +msgid "Belgium" +msgstr "" + +#. 854 +msgid "Burkina Faso" +msgstr "" + +#. 100 +msgid "Bulgaria" +msgstr "" + +#. 048 +msgid "Bahrain" +msgstr "" + +#. 108 +msgid "Burundi" +msgstr "" + +#. 204 +msgid "Benin" +msgstr "" + +#. 652 +msgid "Saint Barthelemy" +msgstr "" + +#. 060 +msgid "Bermuda" +msgstr "" + +#. 096 +msgid "Brunei Darussalam" +msgstr "" + +#. 068 +msgid "Bolivia" +msgstr "" + +#. 535 +msgid "Bonaire, Sint Eustatius and Saba" +msgstr "" + +#. 076 +msgid "Brazil" +msgstr "" + +#. 044 +msgid "Bahamas" +msgstr "" + +#. 064 +msgid "Bhutan" +msgstr "" + +#. 074 +msgid "Bouvet Island" +msgstr "" + +#. 072 +msgid "Botswana" +msgstr "" + +#. 112 +msgid "Belarus" +msgstr "" + +#. 084 +msgid "Belize" +msgstr "" + +#. 124 +msgid "Canada" +msgstr "" + +#. 166 +msgid "Cocos (Keeling) Islands" +msgstr "" + +#. 180 +msgid "Congo, Democratic Republic of the" +msgstr "" + +#. 140 +msgid "Central African Republic" +msgstr "" + +#. 178 +msgid "Congo" +msgstr "" + +#. 756 +msgid "Switzerland" +msgstr "" + +#. 384 +msgid "Cote d'Ivoire" +msgstr "" + +#. 184 +msgid "Cook Islands" +msgstr "" + +#. 152 +msgid "Chile" +msgstr "" + +#. 120 +msgid "Cameroon" +msgstr "" + +#. 156 +msgid "China" +msgstr "" + +#. 170 +msgid "Colombia" +msgstr "" + +#. 188 +msgid "Costa Rica" +msgstr "" + +#. 192 +msgid "Cuba" +msgstr "" + +#. 132 +msgid "Cape Verde" +msgstr "" + +#. 531 +msgid "Curacao" +msgstr "" + +#. 162 +msgid "Christmas Island" +msgstr "" + +#. 196 +msgid "Cyprus" +msgstr "" + +#. 203 +msgid "Czech Republic" +msgstr "" + +#. 276 +msgid "Germany" +msgstr "" + +#. 262 +msgid "Djibouti" +msgstr "" + +#. 208 +msgid "Denmark" +msgstr "" + +#. 212 +msgid "Dominica" +msgstr "" + +#. 214 +msgid "Dominican Republic" +msgstr "" + +#. 012 +msgid "Algeria" +msgstr "" + +#. 218 +msgid "Ecuador" +msgstr "" + +#. 233 +msgid "Estonia" +msgstr "" + +#. 818 +msgid "Egypt" +msgstr "" + +#. 732 +msgid "Western Sahara" +msgstr "" + +#. 232 +msgid "Eritrea" +msgstr "" + +#. 724 +msgid "Spain" +msgstr "" + +#. 231 +msgid "Ethiopia" +msgstr "" + +#. 246 +msgid "Finland" +msgstr "" + +#. 242 +msgid "Fiji" +msgstr "" + +#. 238 +msgid "Falkland Islands (Malvinas)" +msgstr "" + +#. 583 +msgid "Micronesia, Federated States of" +msgstr "" + +#. 234 +msgid "Faroe Islands" +msgstr "" + +#. 250 +msgid "France" +msgstr "" + +#. 266 +msgid "Gabon" +msgstr "" + +#. 826 +msgid "United Kingdom" +msgstr "" + +#. 308 +msgid "Grenada" +msgstr "" + +#. 268 +msgid "Georgia" +msgstr "" + +#. 254 +msgid "French Guiana" +msgstr "" + +#. 831 +msgid "Guernsey" +msgstr "" + +#. 288 +msgid "Ghana" +msgstr "" + +#. 292 +msgid "Gibraltar" +msgstr "" + +#. 304 +msgid "Greenland" +msgstr "" + +#. 270 +msgid "Gambia" +msgstr "" + +#. 324 +msgid "Guinea" +msgstr "" + +#. 312 +msgid "Guadeloupe" +msgstr "" + +#. 226 +msgid "Equatorial Guinea" +msgstr "" + +#. 300 +msgid "Greece" +msgstr "" + +#. 239 +msgid "South Georgia and the South Sandwich Islands" +msgstr "" + +#. 320 +msgid "Guatemala" +msgstr "" + +#. 316 +msgid "Guam" +msgstr "" + +#. 624 +msgid "Guinea-Bissau" +msgstr "" + +#. 328 +msgid "Guyana" +msgstr "" + +#. 344 +msgid "Hong Kong" +msgstr "" + +#. 334 +msgid "Heard Island and McDonald Islands" +msgstr "" + +#. 340 +msgid "Honduras" +msgstr "" + +#. 191 +msgid "Croatia" +msgstr "" + +#. 332 +msgid "Haiti" +msgstr "" + +#. 348 +msgid "Hungary" +msgstr "" + +#. 360 +msgid "Indonesia" +msgstr "" + +#. 372 +msgid "Ireland" +msgstr "" + +#. 376 +msgid "Israel" +msgstr "" + +#. 833 +msgid "Isle of Man" +msgstr "" + +#. 356 +msgid "India" +msgstr "" + +#. 086 +msgid "British Indian Ocean Territory" +msgstr "" + +#. 368 +msgid "Iraq" +msgstr "" + +#. 364 +msgid "Iran, Islamic Republic of" +msgstr "" + +#. 352 +msgid "Iceland" +msgstr "" + +#. 380 +msgid "Italy" +msgstr "" + +#. 832 +msgid "Jersey" +msgstr "" + +#. 388 +msgid "Jamaica" +msgstr "" + +#. 400 +msgid "Jordan" +msgstr "" + +#. 392 +msgid "Japan" +msgstr "" + +#. 404 +msgid "Kenya" +msgstr "" + +#. 417 +msgid "Kyrgyzstan" +msgstr "" + +#. 116 +msgid "Cambodia" +msgstr "" + +#. 296 +msgid "Kiribati" +msgstr "" + +#. 174 +msgid "Comoros" +msgstr "" + +#. 659 +msgid "Saint Kitts and Nevis" +msgstr "" + +#. 408 +msgid "Korea, Democratic People's Republic of" +msgstr "" + +#. 410 +msgid "Korea, Republic of" +msgstr "" + +#. 414 +msgid "Kuwait" +msgstr "" + +#. 136 +msgid "Cayman Islands" +msgstr "" + +#. 398 +msgid "Kazakhstan" +msgstr "" + +#. 418 +msgid "Lao People's Democratic Republic" +msgstr "" + +#. 422 +msgid "Lebanon" +msgstr "" + +#. 662 +msgid "Saint Lucia" +msgstr "" + +#. 438 +msgid "Liechtenstein" +msgstr "" + +#. 144 +msgid "Sri Lanka" +msgstr "" + +#. 430 +msgid "Liberia" +msgstr "" + +#. 426 +msgid "Lesotho" +msgstr "" + +#. 440 +msgid "Lithuania" +msgstr "" + +#. 442 +msgid "Luxembourg" +msgstr "" + +#. 428 +msgid "Latvia" +msgstr "" + +#. 434 +msgid "Libya" +msgstr "" + +#. 504 +msgid "Morocco" +msgstr "" + +#. 492 +msgid "Monaco" +msgstr "" + +#. 498 +msgid "Moldova, Republic of" +msgstr "" + +#. 499 +msgid "Montenegro" +msgstr "" + +#. 663 +msgid "Saint Martin (French part)" +msgstr "" + +#. 450 +msgid "Madagascar" +msgstr "" + +#. 584 +msgid "Marshall Islands" +msgstr "" + +#. 807 +msgid "Macedonia, the former Yugoslav Republic of" +msgstr "" + +#. 466 +msgid "Mali" +msgstr "" + +#. 104 +msgid "Myanmar" +msgstr "" + +#. 496 +msgid "Mongolia" +msgstr "" + +#. 446 +msgid "Macao" +msgstr "" + +#. 580 +msgid "Northern Mariana Islands" +msgstr "" + +#. 474 +msgid "Martinique" +msgstr "" + +#. 478 +msgid "Mauritania" +msgstr "" + +#. 500 +msgid "Montserrat" +msgstr "" + +#. 470 +msgid "Malta" +msgstr "" + +#. 480 +msgid "Mauritius" +msgstr "" + +#. 462 +msgid "Maldives" +msgstr "" + +#. 454 +msgid "Malawi" +msgstr "" + +#. 484 +msgid "Mexico" +msgstr "" + +#. 458 +msgid "Malaysia" +msgstr "" + +#. 508 +msgid "Mozambique" +msgstr "" + +#. 516 +msgid "Namibia" +msgstr "" + +#. 540 +msgid "New Caledonia" +msgstr "" + +#. 562 +msgid "Niger" +msgstr "" + +#. 574 +msgid "Norfolk Island" +msgstr "" + +#. 566 +msgid "Nigeria" +msgstr "" + +#. 558 +msgid "Nicaragua" +msgstr "" + +#. 528 +msgid "Netherlands" +msgstr "" + +#. 578 +msgid "Norway" +msgstr "" + +#. 524 +msgid "Nepal" +msgstr "" + +#. 520 +msgid "Nauru" +msgstr "" + +#. 570 +msgid "Niue" +msgstr "" + +#. 554 +msgid "New Zealand" +msgstr "" + +#. 512 +msgid "Oman" +msgstr "" + +#. 591 +msgid "Panama" +msgstr "" + +#. 604 +msgid "Peru" +msgstr "" + +#. 258 +msgid "French Polynesia" +msgstr "" + +#. 598 +msgid "Papua New Guinea" +msgstr "" + +#. 608 +msgid "Philippines" +msgstr "" + +#. 586 +msgid "Pakistan" +msgstr "" + +#. 616 +msgid "Poland" +msgstr "" + +#. 666 +msgid "Saint Pierre and Miquelon" +msgstr "" + +#. 612 +msgid "Pitcairn" +msgstr "" + +#. 630 +msgid "Puerto Rico" +msgstr "" + +#. 275 +msgid "Palestinian Territory, Occupied" +msgstr "" + +#. 620 +msgid "Portugal" +msgstr "" + +#. 585 +msgid "Palau" +msgstr "" + +#. 600 +msgid "Paraguay" +msgstr "" + +#. 634 +msgid "Qatar" +msgstr "" + +#. 638 +msgid "Reunion" +msgstr "" + +#. 642 +msgid "Romania" +msgstr "" + +#. 688 +msgid "Serbia" +msgstr "" + +#. 643 +msgid "Russian Federation" +msgstr "" + +#. 646 +msgid "Rwanda" +msgstr "" + +#. 682 +msgid "Saudi Arabia" +msgstr "" + +#. 090 +msgid "Solomon Islands" +msgstr "" + +#. 690 +msgid "Seychelles" +msgstr "" + +#. 736 +msgid "Sudan" +msgstr "" + +#. 752 +msgid "Sweden" +msgstr "" + +#. 702 +msgid "Singapore" +msgstr "" + +#. 654 +msgid "Saint Helena" +msgstr "" + +#. 705 +msgid "Slovenia" +msgstr "" + +#. 744 +msgid "Svalbard and Jan Mayen" +msgstr "" + +#. 703 +msgid "Slovakia" +msgstr "" + +#. 694 +msgid "Sierra Leone" +msgstr "" + +#. 674 +msgid "San Marino" +msgstr "" + +#. 686 +msgid "Senegal" +msgstr "" + +#. 706 +msgid "Somalia" +msgstr "" + +#. 740 +msgid "Suriname" +msgstr "" + +#. 728 +msgid "South Sudan" +msgstr "" + +#. 678 +msgid "Sao Tome and Principe" +msgstr "" + +#. 222 +msgid "El Salvador" +msgstr "" + +#. 534 +msgid "Sint Maarten (Dutch part)" +msgstr "" + +#. 760 +msgid "Syrian Arab Republic" +msgstr "" + +#. 748 +msgid "Swaziland" +msgstr "" + +#. 796 +msgid "Turks and Caicos Islands" +msgstr "" + +#. 148 +msgid "Chad" +msgstr "" + +#. 260 +msgid "French Southern Territories" +msgstr "" + +#. 768 +msgid "Togo" +msgstr "" + +#. 764 +msgid "Thailand" +msgstr "" + +#. 762 +msgid "Tajikistan" +msgstr "" + +#. 772 +msgid "Tokelau" +msgstr "" + +#. 626 +msgid "Timor-Leste" +msgstr "" + +#. 795 +msgid "Turkmenistan" +msgstr "" + +#. 788 +msgid "Tunisia" +msgstr "" + +#. 776 +msgid "Tonga" +msgstr "" + +#. 792 +msgid "Turkey" +msgstr "" + +#. 780 +msgid "Trinidad and Tobago" +msgstr "" + +#. 798 +msgid "Tuvalu" +msgstr "" + +#. 158 +msgid "Taiwan, Province of China" +msgstr "" + +#. 834 +msgid "Tanzania, United Republic of" +msgstr "" + +#. 804 +msgid "Ukraine" +msgstr "" + +#. 800 +msgid "Uganda" +msgstr "" + +#. 581 +msgid "United States Minor Outlying Islands" +msgstr "" + +#. 840 +msgid "United States" +msgstr "" + +#. 858 +msgid "Uruguay" +msgstr "" + +#. 860 +msgid "Uzbekistan" +msgstr "" + +#. 336 +msgid "Holy See (Vatican City State)" +msgstr "" + +#. 670 +msgid "Saint Vincent and the Grenadines" +msgstr "" + +#. 862 +msgid "Venezuela" +msgstr "" + +#. 092 +msgid "Virgin Islands, British" +msgstr "" + +#. 850 +msgid "Virgin Islands, U.S." +msgstr "" + +#. 704 +msgid "Viet Nam" +msgstr "" + +#. 548 +msgid "Vanuatu" +msgstr "" + +#. 876 +msgid "Wallis and Futuna" +msgstr "" + +#. 882 +msgid "Samoa" +msgstr "" + +#. 887 +msgid "Yemen" +msgstr "" + +#. 175 +msgid "Mayotte" +msgstr "" + +#. 710 +msgid "South Africa" +msgstr "" + +#. 894 +msgid "Zambia" +msgstr "" + +#. 716 +msgid "Zimbabwe" +msgstr "" + +msgid "* Unknown, add is_in tags to those cities" +msgstr "" + +msgid "" +"navit usage:\n" +"navit [options] [configfile]\n" +"\t-c <file>: use <file> as config file, instead of using the default file.\n" +"\t-d <n>: set the global debug output level to <n> (0=error, 1=warning, " +"2=info, 3=debug).\n" +"\tSettings from config file will still take effect where they set a higher " +"level.\n" +"\t-h: print this usage info and exit.\n" +"\t-v: print the version and exit.\n" +msgstr "" + +#. We have not found an existing config file from all possibilities +msgid "No config file navit.xml, navit.xml.local found\n" +msgstr "" + +#, c-format +msgid "Error parsing config file '%s': %s\n" +msgstr "" + +#, c-format +msgid "Using config file '%s'\n" +msgstr "" + +#, c-format +msgid "Error: No configuration found in config file '%s'\n" +msgstr "" + +msgid "" +"Internal initialization failed, exiting. Check previous error messages.\n" +msgstr "" + +msgid "unknown street" +msgstr "" + +#. Safe cast: attr_generic_set_attr does not modify its parameter. +msgid "Unnamed vehicle" +msgstr "" + +msgid "Failed to write bookmarks file" +msgstr "" + +#. Strings from navit_shipped.xml +msgid "Map Point" +msgstr "" + +msgid "Car" +msgstr "" + +msgid "Iso2" +msgstr "" + +msgid "Iso3" +msgstr "" + +msgid "Country" +msgstr "" + +msgid "Postal" +msgstr "" + +msgid "Town" +msgstr "" + +msgid "District" +msgstr "" + +msgid "Street" +msgstr "" + +msgid "Number" +msgstr "" + +msgid "Enter Destination" +msgstr "" + +msgid "Zip Code" +msgstr "" + +msgid "City" +msgstr "" + +msgid "District/Township" +msgstr "" + +msgid "Map" +msgstr "" + +msgid "Bookmark" +msgstr "" + +msgid "Destination" +msgstr "" + +#. TRANSLATORS: These texts are for menu items in GTK GUI. The _ indicates the mnemonic key (=underlined character) for this menu item. Please place the _ before a suitable character in the translation (or omit it if no mnemonic key is desired). +msgid "_Display" +msgstr "" + +msgid "_Route" +msgstr "" + +msgid "_Former Destinations" +msgstr "" + +msgid "_Bookmarks" +msgstr "" + +msgid "_Map" +msgstr "" + +msgid "_Layout" +msgstr "" + +msgid "_Projection" +msgstr "" + +msgid "_Vehicle" +msgstr "" + +msgid "Zoom_Out" +msgstr "" + +msgid "Decrease zoom level" +msgstr "" + +msgid "Zoom_In" +msgstr "" + +msgid "Increase zoom level" +msgstr "" + +msgid "_Recalculate" +msgstr "" + +msgid "Redraw map" +msgstr "" + +msgid "_Info" +msgstr "" + +msgid "Set _destination" +msgstr "" + +msgid "Opens address search dialog" +msgstr "" + +msgid "_POI search" +msgstr "" + +msgid "Opens POI search dialog" +msgstr "" + +msgid "_Stop Navigation" +msgstr "" + +msgid "Test" +msgstr "" + +msgid "_Quit" +msgstr "" + +msgid "Quit the application" +msgstr "" + +msgid "Show position _cursor" +msgstr "" + +msgid "_Lock on Road" +msgstr "" + +msgid "_Keep orientation to the North" +msgstr "" + +msgid "Switches map orientation to the north or the vehicle" +msgstr "" + +msgid "_Roadbook" +msgstr "" + +msgid "Show/hide route description" +msgstr "" + +msgid "_Autozoom" +msgstr "" + +msgid "Enable/disable automatic zoom level changing" +msgstr "" + +msgid "_Fullscreen" +msgstr "" + +msgid "Data" +msgstr "" + +msgid "Pharmacy" +msgstr "" + +msgid "Restaurant" +msgstr "" + +msgid "Restaurant. Fast food" +msgstr "" + +msgid "Hotel" +msgstr "" + +msgid "Car parking" +msgstr "" + +msgid "Fuel station" +msgstr "" + +msgid "Bank" +msgstr "" + +msgid "Hospital" +msgstr "" + +msgid "Cinema" +msgstr "" + +msgid "Train station" +msgstr "" + +msgid "School" +msgstr "" + +msgid "Police" +msgstr "" + +msgid "Justice" +msgstr "" + +msgid "Taxi" +msgstr "" + +msgid "Shopping" +msgstr "" + +msgid "Distance from screen center (km)" +msgstr "" + +#, c-format +msgid "POI %s. %s" +msgstr "" + +#, c-format +msgid "Set destination to %ld, %ld \n" +msgstr "" + +#, c-format +msgid "Set map to %ld, %ld \n" +msgstr "" + +#, c-format +msgid "Set next visit to %ld, %ld \n" +msgstr "" + +msgid "POI search" +msgstr "" + +msgid "Select a category" +msgstr "" + +msgid "Select a distance to look for (km)" +msgstr "" + +msgid "Select a POI" +msgstr "" + +msgid " " +msgstr "" + +msgid "Category" +msgstr "" + +msgid "Direction" +msgstr "" + +msgid "Distance(m)" +msgstr "" + +msgid "Name" +msgstr "" + +msgid "Visit Before" +msgstr "" + +msgid "N" +msgstr "" + +msgid "NE" +msgstr "" + +msgid "E" +msgstr "" + +msgid "SE" +msgstr "" + +msgid "S" +msgstr "" + +msgid "SW" +msgstr "" + +msgid "W" +msgstr "" + +msgid "NW" +msgstr "" + +#. Android resource: @strings/no +msgid "No" +msgstr "" + +msgid "2D" +msgstr "" + +msgid "3D" +msgstr "" + +msgid "OT" +msgstr "" + +#, c-format +msgid "Route %4.0fkm %02d:%02d ETA" +msgstr "" + +msgid "Route 0000km 0+00:00 ETA" +msgstr "" + +msgid "Help" +msgstr "" + +#, c-format +msgid "Waypoint %s" +msgstr "" + +msgid "Select waypoint to insert the new one before" +msgstr "" + +msgid "View in Browser" +msgstr "" + +msgid "Item type" +msgstr "" + +#. Android resource: @strings/address_search_streets +msgid "Streets" +msgstr "" + +msgid "House numbers" +msgstr "" + +msgid "View Attributes" +msgstr "" + +msgid "Set as position (and deactivate vehicle)" +msgstr "" + +msgid "POIs" +msgstr "" + +msgid "View on map" +msgstr "" + +msgid "Remove search results from the map" +msgstr "" + +msgid "Show results on the map" +msgstr "" + +msgid "Cut Bookmark" +msgstr "" + +msgid "Copy Bookmark" +msgstr "" + +msgid "Rename Bookmark" +msgstr "" + +msgid "Paste Bookmark" +msgstr "" + +msgid "Delete Bookmark" +msgstr "" + +msgid "Delete waypoint" +msgstr "" + +msgid "Bookmarks" +msgstr "" + +msgid "Bookmarks as waypoints" +msgstr "" + +msgid "Save waypoints" +msgstr "" + +msgid "Replace with waypoints" +msgstr "" + +msgid "Delete Folder" +msgstr "" + +#. Adds the Bookmark folders +msgid "Add Bookmark folder" +msgstr "" + +#. Pastes the Bookmark +msgid "Paste bookmark" +msgstr "" + +#, c-format +msgid "Bookmark %s" +msgstr "" + +#, c-format +msgid "Download %s" +msgstr "" + +msgid "Map Download" +msgstr "" + +msgid "Active" +msgstr "" + +msgid "Download Enabled" +msgstr "" + +msgid "Download completely" +msgstr "" + +msgid "Show Satellite Status" +msgstr "" + +msgid " Elevation " +msgstr "" + +msgid " Azimuth " +msgstr "" + +msgid "Show NMEA Data" +msgstr "" + +msgid "car" +msgstr "" + +msgid "bike" +msgstr "" + +msgid "pedestrian" +msgstr "" + +#, c-format +msgid "Current profile: %s" +msgstr "" + +#, c-format +msgid "Change profile to: %s" +msgstr "" + +msgid "Set as active" +msgstr "" + +msgid "Show Satellite status" +msgstr "" + +msgid "Show NMEA data" +msgstr "" + +msgid "Add Bookmark" +msgstr "" + +msgid "Rename" +msgstr "" + +msgid "About Navit" +msgstr "" + +#. Authors +msgid "By" +msgstr "" + +#. Contributors +msgid "And all the Navit Team" +msgstr "" + +msgid "members and contributors." +msgstr "" + +msgid "Waypoints" +msgstr "" + +msgid "Enter Coordinates" +msgstr "" + +#. +#. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill); +#. gui_internal_widget_append(wb, w); +#. +#. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill); +#. gui_internal_widget_append(w, we); +msgid "Latitude Longitude" +msgstr "" + +msgid "Enter coordinates, for example:" +msgstr "" + +msgid "Vehicle" +msgstr "" + +msgid "Rules" +msgstr "" + +msgid "Lock on road" +msgstr "" + +msgid "Northing" +msgstr "" + +msgid "Map follows Vehicle" +msgstr "" + +msgid "Plan with Waypoints" +msgstr "" + +msgid "Maps" +msgstr "" + +msgid "Layout" +msgstr "" + +msgid "Height Profile" +msgstr "" + +msgid "Route Description" +msgstr "" + +msgid "Show Locale" +msgstr "" + +msgid "Former Destinations" +msgstr "" + +msgid "- No former destinations available -" +msgstr "" + +msgid "Message" +msgstr "" + +msgid "Back" +msgstr "" + +msgid "Back to map" +msgstr "" + +msgid "Main Menu" +msgstr "" + +msgid "House number" +msgstr "" + +msgid "Next" +msgstr "" + +msgid "Prev" +msgstr "" + +msgid "Return to route!" +msgstr "" + +#. warning told +msgid "Look out! Camera!" +msgstr "" + +#. warning told +msgid "Please decrease your speed" +msgstr "" + +msgid "partial match" +msgstr "" + +#. Android resource: @strings/address_search_button +msgid "Search" +msgstr "" + +#. Android resource: @strings/address_search_towns +msgid "Towns" +msgstr "" + +#. Android resource: @strings/position_popup_drive_here +msgid "Route to here" +msgstr "" + +msgid "Map data (c) OpenStreetMap contributors, ODBL" +msgstr "" + +msgid "" +"Current map location %s is not available\n" +"Please restart Navit after you attach an SD card or select a different map " +"location." +msgstr "" + +msgid "Downloaded maps" +msgstr "" + +msgid "" +"Sorry, we currently do not support maps above 3.8G on Android, please select " +"a smaller one." +msgstr "" + +msgid "Cancel" +msgstr "" + +msgid "filenamePath" +msgstr "" + +msgid "" +"New location set to %s\n" +"Restart Navit to apply the changes." +msgstr "" + +msgid "Whole Planet" +msgstr "" + +msgid "Africa" +msgstr "" + +msgid "Canary Islands" +msgstr "" + +msgid "Asia" +msgstr "" + +msgid "Korea" +msgstr "" + +msgid "Taiwan" +msgstr "" + +msgid "UAE+Other" +msgstr "" + +msgid "Oceania" +msgstr "" + +msgid "Tasmania" +msgstr "" + +msgid "Victoria" +msgstr "" + +msgid "New South Wales" +msgstr "" + +msgid "Europe" +msgstr "" + +msgid "Western Europe" +msgstr "" + +msgid "Azores" +msgstr "" + +msgid "BeNeLux" +msgstr "" + +msgid "Alsace" +msgstr "" + +msgid "Aquitaine" +msgstr "" + +msgid "Auvergne" +msgstr "" + +msgid "Basse-Normandie" +msgstr "" + +msgid "Bourgogne" +msgstr "" + +msgid "Bretagne" +msgstr "" + +msgid "Centre" +msgstr "" + +msgid "Champagne-Ardenne" +msgstr "" + +msgid "Corse" +msgstr "" + +msgid "Franche-Comte" +msgstr "" + +msgid "Haute-Normandie" +msgstr "" + +msgid "Ile-de-France" +msgstr "" + +msgid "Languedoc-Roussillon" +msgstr "" + +msgid "Limousin" +msgstr "" + +msgid "Lorraine" +msgstr "" + +msgid "Midi-Pyrenees" +msgstr "" + +msgid "Nord-pas-de-Calais" +msgstr "" + +msgid "Pays-de-la-Loire" +msgstr "" + +msgid "Picardie" +msgstr "" + +msgid "Poitou-Charentes" +msgstr "" + +msgid "Provence-Alpes-Cote-d-Azur" +msgstr "" + +msgid "Rhone-Alpes" +msgstr "" + +msgid "Baden-Wuerttemberg" +msgstr "" + +msgid "Bayern" +msgstr "" + +msgid "Mittelfranken" +msgstr "" + +msgid "Niederbayern" +msgstr "" + +msgid "Oberbayern" +msgstr "" + +msgid "Oberfranken" +msgstr "" + +msgid "Oberpfalz" +msgstr "" + +msgid "Schwaben" +msgstr "" + +msgid "Unterfranken" +msgstr "" + +msgid "Berlin" +msgstr "" + +msgid "Brandenburg" +msgstr "" + +msgid "Bremen" +msgstr "" + +msgid "Hamburg" +msgstr "" + +msgid "Hessen" +msgstr "" + +msgid "Mecklenburg-Vorpommern" +msgstr "" + +msgid "Niedersachsen" +msgstr "" + +msgid "Nordrhein-westfalen" +msgstr "" + +msgid "Rheinland-Pfalz" +msgstr "" + +msgid "Saarland" +msgstr "" + +msgid "Sachsen-Anhalt" +msgstr "" + +msgid "Sachsen" +msgstr "" + +msgid "Schleswig-Holstein" +msgstr "" + +msgid "Thueringen" +msgstr "" + +msgid "Mallorca" +msgstr "" + +msgid "Galicia" +msgstr "" + +msgid "Scandinavia" +msgstr "" + +msgid "England" +msgstr "" + +msgid "Buckinghamshire" +msgstr "" + +msgid "Cambridgeshire" +msgstr "" + +msgid "Cumbria" +msgstr "" + +msgid "East yorkshire with hull" +msgstr "" + +msgid "Essex" +msgstr "" + +msgid "Herefordshire" +msgstr "" + +msgid "Kent" +msgstr "" + +msgid "Lancashire" +msgstr "" + +msgid "Leicestershire" +msgstr "" + +msgid "Norfolk" +msgstr "" + +msgid "Nottinghamshire" +msgstr "" + +msgid "Oxfordshire" +msgstr "" + +msgid "Shropshire" +msgstr "" + +msgid "Somerset" +msgstr "" + +msgid "South yorkshire" +msgstr "" + +msgid "Suffolk" +msgstr "" + +msgid "Surrey" +msgstr "" + +msgid "Wiltshire" +msgstr "" + +msgid "Scotland" +msgstr "" + +msgid "Wales" +msgstr "" + +msgid "Crete" +msgstr "" + +msgid "North America" +msgstr "" + +msgid "Alaska" +msgstr "" + +msgid "Hawaii" +msgstr "" + +msgid "USA" +msgstr "" + +msgid " (except Alaska and Hawaii)" +msgstr "" + +msgid "Midwest" +msgstr "" + +msgid "Michigan" +msgstr "" + +msgid "Ohio" +msgstr "" + +msgid "Northeast" +msgstr "" + +msgid "Massachusetts" +msgstr "" + +msgid "Vermont" +msgstr "" + +msgid "Pacific" +msgstr "" + +msgid "South" +msgstr "" + +msgid "Arkansas" +msgstr "" + +msgid "District of Columbia" +msgstr "" + +msgid "Florida" +msgstr "" + +msgid "Louisiana" +msgstr "" + +msgid "Maryland" +msgstr "" + +msgid "Mississippi" +msgstr "" + +msgid "Oklahoma" +msgstr "" + +msgid "Texas" +msgstr "" + +msgid "Virginia" +msgstr "" + +msgid "West Virginia" +msgstr "" + +msgid "West" +msgstr "" + +msgid "Arizona" +msgstr "" + +msgid "California" +msgstr "" + +msgid "Colorado" +msgstr "" + +msgid "Idaho" +msgstr "" + +msgid "Montana" +msgstr "" + +msgid "New Mexico" +msgstr "" + +msgid "Nevada" +msgstr "" + +msgid "Oregon" +msgstr "" + +msgid "Utah" +msgstr "" + +msgid "Washington State" +msgstr "" + +msgid "South+Middle America" +msgstr "" + +msgid "Guyane Francaise" +msgstr "" + +msgid "downloading" +msgstr "" + +#. Android resource: @strings/map_download_ready +msgid "ready" +msgstr "" + +msgid "Media selected for map storage is not available" +msgstr "" + +#. Android resource: @strings/map_download_not_enough_free_space +msgid "Not enough free space" +msgstr "" + +msgid "Error downloading map!" +msgstr "" + +msgid "Error writing map!" +msgstr "" + +msgid "Map download aborted!" +msgstr "" + +#. Android resource: @strings/map_download_eta +msgid "ETA" +msgstr "" + +#. Android resource: @strings/map_download_title +msgid "Map download" +msgstr "" + +msgid "Vehicle Position" +msgstr "" + +msgid "Main menu" +msgstr "" + +msgid "" +"Show\n" +"Map" +msgstr "" + +msgid "Settings" +msgstr "" + +msgid "Tools" +msgstr "" + +msgid "Route" +msgstr "" + +msgid "About" +msgstr "" + +msgid "Quit" +msgstr "" + +msgid "Actions" +msgstr "" + +msgid "" +"Former\n" +"Destinations" +msgstr "" + +msgid "Coordinates" +msgstr "" + +msgid "" +"Stop\n" +"Navigation" +msgstr "" + +msgid "Display" +msgstr "" + +msgid "Fullscreen" +msgstr "" + +msgid "Window Mode" +msgstr "" + +msgid "Description" +msgstr "" + +msgid "" +"Drop last \n" +"Waypoint" +msgstr "" + +msgid "" +"Drop next \n" +"Waypoint" +msgstr "" + +msgid "Satellite Status" +msgstr "" + +msgid "NMEA Data" +msgstr "" + +msgid "car_shortest" +msgstr "" + +msgid "car_avoid_tolls" +msgstr "" + +msgid "car_pedantic" +msgstr "" + +msgid "horse" +msgstr "" + +msgid "Truck" +msgstr "" + +#. Strings from android/res/values/strings.xml +#. Android resource: @strings/yes +msgid "Yes" +msgstr "" + +#. Android resource: @strings/notification_ticker +msgid "Navit started" +msgstr "" + +#. Android resource: @strings/notification_event_default +msgid "Navit running" +msgstr "" + +#. Android resource: @strings/initial_info_box_title +msgid "Welcome to Navit" +msgstr "" + +#. Android resource: @strings/initial_info_box_message +msgid "" +"Thank you for installing Navit!\n" +"\n" +"To start, select \"Download maps\" from the menu to download a map. Note: " +"The map filesize may be large (>50MB) - a wifi connection is recommended.\n" +"\n" +"Mapdata: (c) OpenStreetMap contributors\n" +"\n" +"Enjoy Navit!" +msgstr "" + +#. Android resource: @strings/initial_info_box_OK +msgid "OK" +msgstr "" + +#. Android resource: @strings/initial_info_box_more_info +msgid "More info" +msgstr "" + +#. Android resource: @strings/optionsmenu_zoom_in +msgid "Zoom in" +msgstr "" + +#. Android resource: @strings/optionsmenu_zoom_out +msgid "Zoom out" +msgstr "" + +#. Android resource: @strings/optionsmenu_download_maps +msgid "Download maps" +msgstr "" + +#. Android resource: @strings/optionsmenu_toggle_poi +msgid "Toggle POIs" +msgstr "" + +#. Android resource: @strings/optionsmenu_exit_navit +msgid "Exit Navit" +msgstr "" + +#. Android resource: @strings/optionsmenu_backup_restore +msgid "Backup / Restore" +msgstr "" + +#. Android resource: @strings/optionsmenu_set_map_location +msgid "Set map location" +msgstr "" + +#. Android resource: @strings/map_delete +msgid "Delete this map?" +msgstr "" + +#. Android resource: @strings/map_download_downloading +msgid "Downloading:" +msgstr "" + +#. Android resource: @strings/map_download_download_error +msgid "Error downloading map." +msgstr "" + +#. Android resource: @strings/map_download_download_aborted +msgid "Map download aborted" +msgstr "" + +#. Android resource: @strings/map_no_fix +msgid "No location. Reopen after location fix." +msgstr "" + +#. Android resource: @strings/maps_for_current_location +msgid "Maps containing current location" +msgstr "" + +#. Android resource: @strings/address_search_title +msgid "Address search" +msgstr "" + +#. Android resource: @strings/address_enter_destination +msgid "Enter destination" +msgstr "" + +#. Android resource: @strings/address_partial_match +msgid "Match partial address" +msgstr "" + +#. Android resource: @strings/address_search_searching +msgid "Searching..." +msgstr "" + +#. Android resource: @strings/address_search_not_found +msgid "Address not found" +msgstr "" + +#. Android resource: @strings/address_search_getting_results +msgid "Getting search results" +msgstr "" + +#. Android resource: @strings/address_search_loading_results +msgid "Loading search results" +msgstr "" + +#. Android resource: @strings/address_search_no_results +msgid "No results found" +msgstr "" + +#. Android resource: @strings/address_search_no_text_entered +msgid "No text entered" +msgstr "" + +#. Android resource: @strings/address_search_set_destination +msgid "Setting destination to:" +msgstr "" + +#. Android resource: @strings/choose_an_action +msgid "Choose an action" +msgstr "" + +#. Android resource: @strings/please_insert_an_sd_card +msgid "Please insert an SD Card" +msgstr "" + +#. Android resource: @strings/backing_up +msgid "Backing up..." +msgstr "" + +#. Android resource: @strings/restoring +msgid "Restoring..." +msgstr "" + +#. Android resource: @strings/failed_to_create_backup_directory +msgid "Failed to create backup directory" +msgstr "" + +#. Android resource: @strings/backup_failed +msgid "Backup failed" +msgstr "" + +#. Android resource: @strings/no_backup_found +msgid "No backup found" +msgstr "" + +#. Android resource: @strings/failed_to_restore +msgid "Failed to restore" +msgstr "" + +#. Android resource: @strings/backup_successful +msgid "Backup successful" +msgstr "" + +#. Android resource: @strings/restore_successful_please_restart_navit +msgid "" +"Restore Successful\n" +"Please restart Navit" +msgstr "" + +#. Android resource: @strings/backup_not_found +msgid "Backup not found" +msgstr "" + +#. Android resource: @strings/restore_failed +msgid "Restore failed" +msgstr "" + +#. Android resource: @strings/select_backup +msgid "Select backup" +msgstr "" + +#. Android resource: @strings/backup +msgid "Backup" +msgstr "" + +#. Android resource: @strings/restore +msgid "Restore" +msgstr "" + +#. Android resource: @strings/TTS_title_data_missing +msgid "System text to speech engine data is missing" +msgstr "" + +#. Android resource: @strings/TTS_qery_install_data +msgid "" +"Navit can use any text to speech engine installed on your device. The " +"currently selected engine reports it is unable to speak in your language. " +"Should we ask the system to show voice download dialog?" +msgstr "" diff --git a/po/en_AU.po.in b/po/en_AU.po.in index 515b5f2f6..e177a7646 100644 --- a/po/en_AU.po.in +++ b/po/en_AU.po.in @@ -4,19 +4,19 @@ # Many thanks to the contributors of this translation: # Athol Mullen https://launchpad.net/~athol-mullen # KaZeR https://launchpad.net/~kazer - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2013-09-28 01:41+0000\n" "Last-Translator: KaZeR <Unknown>\n" "Language-Team: English (Australia) <en_AU@li.org>\n" +"Language: en_AU\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"Language: \n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -134,88 +134,188 @@ msgid_plural "in %d kilometers" msgstr[0] "in one kilometre" msgstr[1] "in %d kilometres" -msgid "exit" -msgstr "exit" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "%1$sonto %2$s" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "%1$sonto %2$s" -msgid "into the ramp" -msgstr "into the ramp" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "%1$sonto %2$s" + +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" +msgstr "onto the motorway ramp" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" -msgstr "%sinto the street %s%s%s" +msgid "%sinto %s%s%s" +msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" -msgstr "%sinto the %s%s%s" +msgid "%sinto %s%s%s|masculine form" +msgstr "%sinto %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" -msgstr "%sinto the %s%s%s" +msgid "%sinto %s%s%s|feminine form" +msgstr "%sinto %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" -msgstr "%sinto the %s%s%s" +msgid "%sinto %s%s%s|neuter form" +msgstr "%sinto %s%s%s" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) #, c-format msgid "%sinto the %s" msgstr "%sinto the %s" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "right" +msgid "When possible, please turn around" +msgstr "When possible, please turn around" -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "left" +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" +msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "easily " -msgstr "easily " +#, c-format +msgid "Follow the road for the next %s" +msgstr "Follow the road for the next %s" -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " -msgstr "strongly " +msgid "Enter the roundabout soon" +msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " +#. TRANSLATORS: %s is the distance to the roundabout +#, c-format +msgid "Enter the roundabout %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" msgstr "" -msgid "When possible, please turn around" -msgstr "When possible, please turn around" +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "Leave the roundabout at the %1$s %2$s" +msgstr "" -msgid "Enter the roundabout soon" +msgid "soon" +msgstr "soon" + +msgid "now" +msgstr "now" + +msgid "then" msgstr "" -#. TRANSLATORS: %s is the distance to the roundabout +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "Enter the roundabout %s" +msgid "then merge%1$s|right" +msgstr "then merge%1$s" + +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|right" +msgstr "Merge %1$s%2$s" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|left" +msgstr "then merge%1$s" + +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|left" +msgstr "Merge %1$s%2$s" + +msgid "on your left" +msgstr "" + +msgid "on your right" msgstr "" +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "then leave the roundabout at the %s" +msgid "Take exit %1$s %2$s %3$s" msgstr "" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "Leave the roundabout at the %s" +msgid "Take the exit %1$s %2$s%3$s" +msgstr "" + +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" +msgstr "" + +msgid "at exit" msgstr "" +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "Follow the road for the next %s" -msgstr "Follow the road for the next %s" +msgid "then continue straight%1$s" +msgstr "" -msgid "soon" -msgstr "soon" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep right%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep right %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "right" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "left" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "easily " + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "strongly " -#. TRANSLATORS: First argument is the how manieth street to take, second the direction #, c-format msgid "Take the %1$s road to the %2$s" msgstr "Take the %1$s road to the %2$s" @@ -224,32 +324,59 @@ msgstr "Take the %1$s road to the %2$s" msgid "after %i roads" msgstr "after %i roads" -msgid "now" -msgstr "now" - +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination #, c-format -msgid "then take the %1$s road to the %2$s" -msgstr "" +msgid "Turn %1$s%2$s %3$s%4$s" +msgstr "Turn %1$s%2$s %3$s%4$s" -msgid "error" -msgstr "" +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "then make a U-turn" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "Turn %1$s%2$s %3$s%4$s" -msgstr "" +msgid "Make a U-turn %1$s|left" +msgstr "Make a U-turn %1$s" + +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" +msgstr "then make a U-turn" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +msgid "Make a U-turn %1$s|right" +msgstr "Make a U-turn %1$s" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" msgstr "" +msgid "then you have reached your destination." +msgstr "then you will have reached your destination" + +#. TRANSLATORS: the arg. is distance #, c-format msgid "You have reached your destination %s" msgstr "You have reached your destination %s" -msgid "then you have reached your destination." -msgstr "then you will have reached your destination" +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "Interchange" + +msgid "Exit" +msgstr "Exit" #. Android resource: @strings/position_popup_title msgid "Position" @@ -1804,10 +1931,10 @@ msgstr "" msgid "Enter Coordinates" msgstr "" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/en_CA.po.in b/po/en_CA.po.in index 57578ddbe..aac5067c3 100644 --- a/po/en_CA.po.in +++ b/po/en_CA.po.in @@ -3,19 +3,19 @@ # This file is distributed under the same license as the navit package. # Many thanks to the contributors of this translation: # Frank Bax https://launchpad.net/~drw06g0w-qaens-52bk9e55 - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2012-11-20 02:05+0000\n" "Last-Translator: Frank Bax <frank@bax.on.ca>\n" "Language-Team: English (Canada) <en_CA@li.org>\n" +"Language: en_CA\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"Language: \n" msgid "Running from source directory\n" msgstr "Running from source directory\n" @@ -132,88 +132,188 @@ msgid_plural "in %d kilometers" msgstr[0] "in one kilometre" msgstr[1] "in %d kilometres" -msgid "exit" -msgstr "exit" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "%1$sonto %2$s" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "%1$sonto %2$s" -msgid "into the ramp" -msgstr "into the ramp" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "%1$sonto %2$s" + +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" +msgstr "onto the motorway ramp" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" -msgstr "%sinto the street %s%s%s" +msgid "%sinto %s%s%s" +msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" -msgstr "%sinto the %s%s%s|male form" +msgid "%sinto %s%s%s|masculine form" +msgstr "%sinto %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" -msgstr "%sinto the %s%s%s|female form" +msgid "%sinto %s%s%s|feminine form" +msgstr "%sinto %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" -msgstr "%sinto the %s%s%s|neutral form" +msgid "%sinto %s%s%s|neuter form" +msgstr "%sinto %s%s%s" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) #, c-format msgid "%sinto the %s" msgstr "%sinto the %s" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "right" +msgid "When possible, please turn around" +msgstr "When possible, please turn around" -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "left" +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" +msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "easily " -msgstr "easily " +#, c-format +msgid "Follow the road for the next %s" +msgstr "Follow the road for the next %s" -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " -msgstr "strongly " +msgid "Enter the roundabout soon" +msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " +#. TRANSLATORS: %s is the distance to the roundabout +#, c-format +msgid "Enter the roundabout %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" msgstr "" -msgid "When possible, please turn around" -msgstr "When possible, please turn around" +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "Leave the roundabout at the %1$s %2$s" +msgstr "" -msgid "Enter the roundabout soon" +msgid "soon" +msgstr "soon" + +msgid "now" +msgstr "now" + +msgid "then" msgstr "" -#. TRANSLATORS: %s is the distance to the roundabout +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "Enter the roundabout %s" +msgid "then merge%1$s|right" +msgstr "then merge%1$s" + +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|right" +msgstr "Merge %1$s%2$s" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|left" +msgstr "then merge%1$s" + +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|left" +msgstr "Merge %1$s%2$s" + +msgid "on your left" +msgstr "" + +msgid "on your right" msgstr "" +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "then leave the roundabout at the %s" +msgid "Take exit %1$s %2$s %3$s" msgstr "" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "Leave the roundabout at the %s" +msgid "Take the exit %1$s %2$s%3$s" +msgstr "" + +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" +msgstr "" + +msgid "at exit" msgstr "" +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "Follow the road for the next %s" -msgstr "Follow the road for the next %s" +msgid "then continue straight%1$s" +msgstr "" -msgid "soon" -msgstr "soon" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep right%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep right %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "right" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "left" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "easily " + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "strongly " -#. TRANSLATORS: First argument is the how manieth street to take, second the direction #, c-format msgid "Take the %1$s road to the %2$s" msgstr "Take the %1$s road to the %2$s" @@ -222,32 +322,59 @@ msgstr "Take the %1$s road to the %2$s" msgid "after %i roads" msgstr "after %i roads" -msgid "now" -msgstr "now" - +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination #, c-format -msgid "then take the %1$s road to the %2$s" -msgstr "" +msgid "Turn %1$s%2$s %3$s%4$s" +msgstr "Turn %1$s%2$s %3$s%4$s" -msgid "error" -msgstr "" +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "then make a U-turn" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "Turn %1$s%2$s %3$s%4$s" -msgstr "" +msgid "Make a U-turn %1$s|left" +msgstr "Make a U-turn %1$s" + +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" +msgstr "then make a U-turn" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +msgid "Make a U-turn %1$s|right" +msgstr "Make a U-turn %1$s" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" msgstr "" +msgid "then you have reached your destination." +msgstr "then you have reached your destination." + +#. TRANSLATORS: the arg. is distance #, c-format msgid "You have reached your destination %s" msgstr "You have reached your destination %s" -msgid "then you have reached your destination." -msgstr "then you have reached your destination." +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "Interchange" + +msgid "Exit" +msgstr "Exit" #. Android resource: @strings/position_popup_title msgid "Position" @@ -1802,10 +1929,10 @@ msgstr "" msgid "Enter Coordinates" msgstr "" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/en_GB.po.in b/po/en_GB.po.in index e7e3b13db..973c689ad 100644 --- a/po/en_GB.po.in +++ b/po/en_GB.po.in @@ -10,19 +10,19 @@ # Stephen Irons https://launchpad.net/~stephen-irons # half_monkey https://launchpad.net/~d-r-williams-01 # lopho https://launchpad.net/~lopho - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2014-11-12 10:10+0000\n" "Last-Translator: Andi Chandler <Unknown>\n" "Language-Team: English (United Kingdom) <en_GB@li.org>\n" +"Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"Language: \n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -140,63 +140,71 @@ msgid_plural "in %d kilometers" msgstr[0] "in one kilometre" msgstr[1] "in %d kilometres" -msgid "exit" -msgstr "exit" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "%1$sonto %2$s" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "%1$sonto %2$s" -msgid "into the ramp" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "%1$sonto %2$s" + +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "onto the slip road" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" -msgstr "%sonto the street %s%s%s" +msgid "%sinto %s%s%s" +msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" -msgstr "%sonto the %s%s%s" +msgid "%sinto %s%s%s|masculine form" +msgstr "%sinto %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" -msgstr "%sonto the %s%s%s" +msgid "%sinto %s%s%s|feminine form" +msgstr "%sinto %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" -msgstr "%sonto the %s%s%s" +msgid "%sinto %s%s%s|neuter form" +msgstr "%sinto %s%s%s" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) #, c-format msgid "%sinto the %s" msgstr "%sonto the %s" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "right" - -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "left" - -#. TRANSLATORS: Don't forget the ending space -msgid "easily " -msgstr "easily " - -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " -msgstr "strongly " - -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " -msgstr "" +msgid "When possible, please turn around" +msgstr "When possible, please turn around" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" msgstr "" -msgid "When possible, please turn around" -msgstr "When possible, please turn around" +#, c-format +msgid "Follow the road for the next %s" +msgstr "Follow the road for the next %s" msgid "Enter the roundabout soon" msgstr "Enter the roundabout soon" @@ -206,57 +214,176 @@ msgstr "Enter the roundabout soon" msgid "Enter the roundabout %s" msgstr "Enter the roundabout %s" +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow #, c-format -msgid "then leave the roundabout at the %s" +msgid "then leave the roundabout at the %1$s %2$s" msgstr "" +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow #, c-format -msgid "Leave the roundabout at the %s" +msgid "Leave the roundabout at the %1$s %2$s" msgstr "" -#, c-format -msgid "Follow the road for the next %s" -msgstr "Follow the road for the next %s" - msgid "soon" msgstr "soon" -#. TRANSLATORS: First argument is the how manieth street to take, second the direction +msgid "now" +msgstr "now" + +msgid "then" +msgstr "" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "Take the %1$s road to the %2$s" -msgstr "Take the %1$s road to the %2$s" +msgid "then merge%1$s|right" +msgstr "then merge%1$s" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "after %i roads" -msgstr "after %i roads" +msgid "Merge %1$s%2$s|right" +msgstr "Merge %1$s%2$s" -msgid "now" -msgstr "now" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|left" +msgstr "then merge%1$s" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "then take the %1$s road to the %2$s" +msgid "Merge %1$s%2$s|left" +msgstr "Merge %1$s%2$s" + +msgid "on your left" msgstr "" -msgid "error" +msgid "on your right" msgstr "" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "Turn %1$s%2$s %3$s%4$s" +msgid "Take exit %1$s %2$s %3$s" +msgstr "" + +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination +#, c-format +msgid "Take the exit %1$s %2$s%3$s" msgstr "" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" +msgstr "" + +msgid "at exit" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +msgid "then continue straight%1$s" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination #, c-format -msgid "You have reached your destination %s" -msgstr "You have reached your destination %s" +msgid "Continue straight %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep right%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep right %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "right" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "left" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "easily " + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "strongly " + +#, c-format +msgid "Take the %1$s road to the %2$s" +msgstr "Take the %1$s road to the %2$s" + +#, c-format +msgid "after %i roads" +msgstr "after %i roads" + +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination +#, c-format +msgid "Turn %1$s%2$s %3$s%4$s" +msgstr "Turn %1$s%2$s %3$s%4$s" + +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "then make a U-turn" + +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. +#, c-format +msgid "Make a U-turn %1$s|left" +msgstr "Make a U-turn %1$s" + +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" +msgstr "then make a U-turn" + +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. +#, c-format +msgid "Make a U-turn %1$s|right" +msgstr "Make a U-turn %1$s" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" +msgstr "" msgid "then you have reached your destination." msgstr "then you have reached your destination" +#. TRANSLATORS: the arg. is distance +#, c-format +msgid "You have reached your destination %s" +msgstr "You have reached your destination %s" + +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "Interchange" + +msgid "Exit" +msgstr "Exit" + #. Android resource: @strings/position_popup_title msgid "Position" msgstr "Position" @@ -1811,10 +1938,10 @@ msgstr "Waypoints" msgid "Enter Coordinates" msgstr "Enter Coordinates" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/eo.po.in b/po/eo.po.in index 67e485b04..4414815a6 100644 --- a/po/eo.po.in +++ b/po/eo.po.in @@ -6,19 +6,19 @@ # Lucas Larson https://launchpad.net/~lucaslarson # Michael Moroni https://launchpad.net/~airon90 # OlivierWeb https://launchpad.net/~olivierweb - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2013-09-27 21:43+0000\n" "Last-Translator: KaZeR <Unknown>\n" "Language-Team: Esperanto <eo@li.org>\n" +"Language: eo\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"Language: eo\n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -136,30 +136,53 @@ msgid_plural "in %d kilometers" msgstr[0] "en unu kilometron" msgstr[1] "en %d kilometrojn" -msgid "exit" -msgstr "eliro" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" -msgid "into the ramp" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "" + +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "al la ramplon" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" -msgstr "%sal la straton %s%s%s" +msgid "%sinto %s%s%s" +msgstr "%sal la %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" +msgid "%sinto %s%s%s|masculine form" msgstr "%sal la %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" +msgid "%sinto %s%s%s|feminine form" msgstr "%sal la %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" +msgid "%sinto %s%s%s|neuter form" msgstr "%sal la %s%s%s" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) @@ -167,57 +190,134 @@ msgstr "%sal la %s%s%s" msgid "%sinto the %s" msgstr "%sal la %s" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "dekstren" +msgid "When possible, please turn around" +msgstr "Kiam eble, bonvole ĉirkaŭturnu" -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "maldekstren" +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" +msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "easily " -msgstr "facile " +#, c-format +msgid "Follow the road for the next %s" +msgstr "Sekvu la straton ĝis la sekva %s" -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " -msgstr "forte " +msgid "Enter the roundabout soon" +msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " +#. TRANSLATORS: %s is the distance to the roundabout +#, c-format +msgid "Enter the roundabout %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" +msgstr "do lasu la trafikcirklon ĉe la %1$s %2$s" + +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "Leave the roundabout at the %1$s %2$s" +msgstr "Lasu la trafikcirklon ĉe la %1$s %2$s" + +msgid "soon" +msgstr "baldaŭ" + +msgid "now" +msgstr "nun" + +msgid "then" +msgstr "do" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|right" msgstr "" -msgid "When possible, please turn around" -msgstr "Kiam eble, bonvole ĉirkaŭturnu" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|right" +msgstr "" -msgid "Enter the roundabout soon" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|left" msgstr "" -#. TRANSLATORS: %s is the distance to the roundabout +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Enter the roundabout %s" +msgid "Merge %1$s%2$s|left" +msgstr "" + +msgid "on your left" +msgstr "" + +msgid "on your right" msgstr "" +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "then leave the roundabout at the %s" +msgid "Take exit %1$s %2$s %3$s" msgstr "" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "Leave the roundabout at the %s" +msgid "Take the exit %1$s %2$s%3$s" +msgstr "" + +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" msgstr "" +msgid "at exit" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "Follow the road for the next %s" -msgstr "Sekvu la straton ĝis la sekva %s" +msgid "then continue straight%1$s" +msgstr "" -msgid "soon" -msgstr "baldaŭ" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep right%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep right %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "dekstren" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "maldekstren" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "facile " + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "forte " -#. TRANSLATORS: First argument is the how manieth street to take, second the direction #, c-format msgid "Take the %1$s road to the %2$s" msgstr "Turnu %2$s ĉe la strato %1$s" @@ -226,32 +326,59 @@ msgstr "Turnu %2$s ĉe la strato %1$s" msgid "after %i roads" msgstr "post %i stratoj" -msgid "now" -msgstr "nun" - +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination #, c-format -msgid "then take the %1$s road to the %2$s" -msgstr "" +msgid "Turn %1$s%2$s %3$s%4$s" +msgstr "Turnu %1$s%2$s %3$s%4$s" -msgid "error" -msgstr "" +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "do ĉirkaŭturnu" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "Turn %1$s%2$s %3$s%4$s" -msgstr "" +msgid "Make a U-turn %1$s|left" +msgstr "Ĉirkaŭturnu %1$s" + +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" +msgstr "do ĉirkaŭturnu" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" -msgstr "" +msgid "Make a U-turn %1$s|right" +msgstr "Ĉirkaŭturnu %1$s" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" +msgstr "sekvu" +msgid "then you have reached your destination." +msgstr "do vi atingis la celon" + +#. TRANSLATORS: the arg. is distance #, c-format msgid "You have reached your destination %s" msgstr "Vi atingis la celon %s" -msgid "then you have reached your destination." -msgstr "do vi atingis la celon" +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "" + +msgid "Exit" +msgstr "Eliro" #. Android resource: @strings/position_popup_title msgid "Position" @@ -1806,10 +1933,10 @@ msgstr "" msgid "Enter Coordinates" msgstr "" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/es.po.in b/po/es.po.in index 24fccfb02..b57d5badb 100644 --- a/po/es.po.in +++ b/po/es.po.in @@ -19,19 +19,19 @@ # marZiano https://launchpad.net/~m3marte # pataquets https://launchpad.net/~pataquets # singesang https://launchpad.net/~singesang - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2013-12-18 16:54+0000\n" "Last-Translator: iceman75 <Unknown>\n" "Language-Team: Chris Eubank <cteubank@gmail.com>\n" +"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"Language: \n" msgid "Running from source directory\n" msgstr "Ejecutando desde el directorio fuente\n" @@ -148,64 +148,72 @@ msgid_plural "in %d kilometers" msgstr[0] "en un kilómetro" msgstr[1] "en %d kilómetros" -msgid "exit" -msgstr "salir" - -msgid "into the ramp" -msgstr "en la salida" - -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name #, c-format -msgid "%sinto the street %s%s%s" -msgstr "%s en la calle %s %s %s" +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "%1$sen la %2$s%3$s%4$s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name #, c-format -msgid "%sinto the %s%s%s|male form" -msgstr "%s en el %s%s%s" +msgid "%1$sonto %2$s" +msgstr "%1$sen la carretera %2$s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" -msgstr "%s en la %s%s%s" +msgid "%1$sonto %2$s|masculine form" +msgstr "%1$sen el %2$s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" -msgstr "%s en %s%s%s" +msgid "%1$sonto %2$s|feminine form" +msgstr "%1$sen la %2$s" -#. TRANSLATORS: gives the name of the next road to turn into (into the E17) +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s" -msgstr "%s en la %s" +msgid "%1$sonto %2$s|neuter form" +msgstr "%1$sen la carretera %2$s" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "a la derecha" +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" +msgstr "en el carril de entrada" -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "a la izquierda" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name +#, c-format +msgid "%sinto %s%s%s" +msgstr "%sen la calle %s%s%s" -#. TRANSLATORS: Don't forget the ending space -msgid "easily " -msgstr "ligeramente " +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%sinto %s%s%s|masculine form" +msgstr "%sen el %s%s%s" -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " -msgstr "bruscamente " +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%sinto %s%s%s|feminine form" +msgstr "%sen la %s%s%s" -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " -msgstr "" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%sinto %s%s%s|neuter form" +msgstr "%sen la calle %s%s%s" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " -msgstr "" +#. TRANSLATORS: gives the name of the next road to turn into (into the E17) +#, c-format +msgid "%sinto the %s" +msgstr "%sen la %s" msgid "When possible, please turn around" msgstr "Dé la vuelta cuando sea posible" +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" +msgstr "hacia %s" + +#, c-format +msgid "Follow the road for the next %s" +msgstr "Continúe en esta carretera durante %s" + msgid "Enter the roundabout soon" msgstr "Entre en la próxima rotonda" @@ -214,22 +222,114 @@ msgstr "Entre en la próxima rotonda" msgid "Enter the roundabout %s" msgstr "Entre en la rotonda %s" +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow #, c-format -msgid "then leave the roundabout at the %s" -msgstr "" +msgid "then leave the roundabout at the %1$s %2$s" +msgstr "después salga de la rotonda por la %1$s %2$s" +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow #, c-format -msgid "Leave the roundabout at the %s" -msgstr "" - -#, c-format -msgid "Follow the road for the next %s" -msgstr "Continúe en esta carretera durante %s" +msgid "Leave the roundabout at the %1$s %2$s" +msgstr "Salga de la rotonda por la %1$s %2$s" msgid "soon" msgstr "próximamente" -#. TRANSLATORS: First argument is the how manieth street to take, second the direction +msgid "now" +msgstr "ahora" + +msgid "then" +msgstr "luego" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|right" +msgstr "luego entre%1$s" + +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|right" +msgstr "Entre%2$s %1$s" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|left" +msgstr "luego entre%1$s" + +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|left" +msgstr "Entre%2$s %1$s" + +msgid "on your left" +msgstr "a la izquierda" + +msgid "on your right" +msgstr "a la derecha" + +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance +#, c-format +msgid "Take exit %1$s %2$s %3$s" +msgstr "Tome la salida %1$s %2$s %3$s" + +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination +#, c-format +msgid "Take the exit %1$s %2$s%3$s" +msgstr "Tome la salida %1$s %2$s%3$s" + +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" +msgstr "al enlace" + +msgid "at exit" +msgstr "a la salida" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then continue straight%1$s" +msgstr "luego continúe todo recto%1$s" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" +msgstr "Continúe todo recto %1$s%2$s%3$s" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep right%1$s" +msgstr "luego manténgase por la derecha%1$s" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep right %1$s%2$s%3$s" +msgstr "Manténgase por la derecha %1$s%2$s%3$s" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep left%1$s" +msgstr "luego manténgase por la izquierda%1$s" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "Manténgase por la izquierda %1$s%2$s%3$s" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "a la derecha" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "a la izquierda" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "ligeramente " + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "bruscamente " + #, c-format msgid "Take the %1$s road to the %2$s" msgstr "Tome la %1$s carretera %2$s" @@ -238,32 +338,59 @@ msgstr "Tome la %1$s carretera %2$s" msgid "after %i roads" msgstr "después de %i carreteras" -msgid "now" -msgstr "ahora" - +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination #, c-format -msgid "then take the %1$s road to the %2$s" -msgstr "" +msgid "Turn %1$s%2$s %3$s%4$s" +msgstr "Gire %1$s%2$s %3$s%4$s" -msgid "error" -msgstr "" +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "luego dé la vuelta" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "Turn %1$s%2$s %3$s%4$s" -msgstr "" +msgid "Make a U-turn %1$s|left" +msgstr "Dé la vuelta %1$s" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" +msgstr "luego dé la vuelta" + +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" -msgstr "" +msgid "Make a U-turn %1$s|right" +msgstr "Dé la vuelta %1$s" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" +msgstr "continúe" + +msgid "then you have reached your destination." +msgstr "entonces ha llegado a su destino." +#. TRANSLATORS: the arg. is distance #, c-format msgid "You have reached your destination %s" msgstr "Ha llegado a su destino %s" -msgid "then you have reached your destination." -msgstr "entonces ha llegado a su destino." +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "Enlace" + +msgid "Exit" +msgstr "Salida" #. Android resource: @strings/position_popup_title msgid "Position" @@ -1518,19 +1645,19 @@ msgid "Data" msgstr "Datos" msgid "Pharmacy" -msgstr "" +msgstr "Farmacia" msgid "Restaurant" -msgstr "" +msgstr "Restaurante" msgid "Restaurant. Fast food" msgstr "" msgid "Hotel" -msgstr "" +msgstr "Hotel" msgid "Car parking" -msgstr "" +msgstr "Estacionamiento" msgid "Fuel station" msgstr "" @@ -1542,19 +1669,19 @@ msgid "Hospital" msgstr "" msgid "Cinema" -msgstr "" +msgstr "Cine" msgid "Train station" msgstr "" msgid "School" -msgstr "" +msgstr "Escuela" msgid "Police" -msgstr "" +msgstr "Policía" msgid "Justice" -msgstr "" +msgstr "Juzgado" msgid "Taxi" msgstr "" @@ -1821,10 +1948,10 @@ msgstr "Puntos de paso" msgid "Enter Coordinates" msgstr "Introduzca coordenadas" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" @@ -1898,7 +2025,7 @@ msgstr "Vuelva a la ruta" #. warning told msgid "Look out! Camera!" -msgstr "!Atención! Radar" +msgstr "¡Atención! Radar" #. warning told msgid "Please decrease your speed" @@ -2062,16 +2189,16 @@ msgid "Baden-Wuerttemberg" msgstr "Baden-Wuerttemberg" msgid "Bayern" -msgstr "Bayern" +msgstr "Baviera" msgid "Mittelfranken" msgstr "Franconia Media" msgid "Niederbayern" -msgstr "Bajo Bayern" +msgstr "Baja Baviera" msgid "Oberbayern" -msgstr "Alto Bayern" +msgstr "Alta Baviera" msgid "Oberfranken" msgstr "Alta Franconia" diff --git a/po/et.po.in b/po/et.po.in index 2f9399600..2b738881f 100644 --- a/po/et.po.in +++ b/po/et.po.in @@ -7,19 +7,19 @@ # Manuel Hohmann https://launchpad.net/~mhohmann # lyyser https://launchpad.net/~lyyser # thucar https://launchpad.net/~rait - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2015-04-13 06:57+0000\n" "Last-Translator: Manuel Hohmann <mhohmann@physnet.uni-hamburg.de>\n" "Language-Team: Estonian <et@li.org>\n" +"Language: et\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"Language: et\n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -137,30 +137,53 @@ msgid_plural "in %d kilometers" msgstr[0] "ühe kilomeetri pärast" msgstr[1] "%d kilomeetri pärast" -msgid "exit" -msgstr "mahasõit" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "" -msgid "into the ramp" +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "kaldteele" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" +msgid "%sinto %s%s%s" msgstr "%s %s%s%s tänavale" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" +msgid "%sinto %s%s%s|masculine form" msgstr "%s %s%s%s tänavale" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" +msgid "%sinto %s%s%s|feminine form" msgstr "%s %s%s%s tänavale" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" +msgid "%sinto %s%s%s|neuter form" msgstr "%s %s%s%s tänavale" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) @@ -168,32 +191,17 @@ msgstr "%s %s%s%s tänavale" msgid "%sinto the %s" msgstr "%steele %s" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "paremale" - -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "vasakule" - -#. TRANSLATORS: Don't forget the ending space -msgid "easily " -msgstr "laugelt " - -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " -msgstr "järsult " - -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " -msgstr "väga järsult " +msgid "When possible, please turn around" +msgstr "Kui võimalik, palun pööra ümber" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" msgstr "" -msgid "When possible, please turn around" -msgstr "Kui võimalik, palun pööra ümber" +#, c-format +msgid "Follow the road for the next %s" +msgstr "Mööda teed järgmised %s" msgid "Enter the roundabout soon" msgstr "Sõida varsti ringteele" @@ -203,22 +211,114 @@ msgstr "Sõida varsti ringteele" msgid "Enter the roundabout %s" msgstr "Ringteeni %s" +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow #, c-format -msgid "then leave the roundabout at the %s" -msgstr "siis lahku ringteelt %s" +msgid "then leave the roundabout at the %1$s %2$s" +msgstr "siis lahku ringteelt %1$s %2$s" +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow #, c-format -msgid "Leave the roundabout at the %s" -msgstr "Lahku ringteelt %s" - -#, c-format -msgid "Follow the road for the next %s" -msgstr "Mööda teed järgmised %s" +msgid "Leave the roundabout at the %1$s %2$s" +msgstr "Lahku ringteelt %1$s %2$s" msgid "soon" msgstr "varsti" -#. TRANSLATORS: First argument is the how manieth street to take, second the direction +msgid "now" +msgstr "nüüd" + +msgid "then" +msgstr "siis" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|right" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|right" +msgstr "" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|left" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|left" +msgstr "" + +msgid "on your left" +msgstr "" + +msgid "on your right" +msgstr "" + +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance +#, c-format +msgid "Take exit %1$s %2$s %3$s" +msgstr "" + +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination +#, c-format +msgid "Take the exit %1$s %2$s%3$s" +msgstr "" + +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" +msgstr "" + +msgid "at exit" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then continue straight%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep right%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep right %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "paremale" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "vasakule" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "laugelt " + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "järsult " + #, c-format msgid "Take the %1$s road to the %2$s" msgstr "Vali %1$s tee, mis viib %2$s" @@ -227,32 +327,59 @@ msgstr "Vali %1$s tee, mis viib %2$s" msgid "after %i roads" msgstr "pärast %i teed" -msgid "now" -msgstr "nüüd" - +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination #, c-format -msgid "then take the %1$s road to the %2$s" -msgstr "siis vali %1$s mis viib %2$s" +msgid "Turn %1$s%2$s %3$s%4$s" +msgstr "Pööra %1$s%2$s %3$s%4$s" -msgid "error" -msgstr "viga" +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "siis pööra ümber" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "Turn %1$s%2$s %3$s%4$s" -msgstr "Pööra %1$s%2$s %3$s%4$s" +msgid "Make a U-turn %1$s|left" +msgstr "Pööra ümber %1$s" + +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" +msgstr "siis pööra ümber" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" -msgstr "siis pööra %1$s%2$s %3$s%4$s" +msgid "Make a U-turn %1$s|right" +msgstr "Pööra ümber %1$s" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" +msgstr "" +msgid "then you have reached your destination." +msgstr "siis oled jõudnud sihtpunkti." + +#. TRANSLATORS: the arg. is distance #, c-format msgid "You have reached your destination %s" msgstr "Sa oled jõudnud sihtpunkti %s" -msgid "then you have reached your destination." -msgstr "siis oled jõudnud sihtpunkti." +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "" + +msgid "Exit" +msgstr "Mahasõit" #. Android resource: @strings/position_popup_title msgid "Position" @@ -1809,10 +1936,10 @@ msgstr "Teekonnapunktid" msgid "Enter Coordinates" msgstr "Sisesta koordinaadid" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/eu.po.in b/po/eu.po.in index 58e516a4b..2b4961d95 100644 --- a/po/eu.po.in +++ b/po/eu.po.in @@ -4,19 +4,19 @@ # Many thanks to the contributors of this translation: # Inaki Saez https://launchpad.net/~inaki-saez # mikel https://launchpad.net/~mikel85 - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2013-09-28 01:42+0000\n" "Last-Translator: Inaki Saez <Inaki.Saez@gmail.com>\n" "Language-Team: Basque <eu@li.org>\n" +"Language: eu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"Language: eu\n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -134,30 +134,53 @@ msgid_plural "in %d kilometers" msgstr[0] "kilometro batean" msgstr[1] "%d kilometrotan" -msgid "exit" -msgstr "irteera" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "" -msgid "into the ramp" +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "maldan" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" +msgid "%sinto %s%s%s" msgstr "%s %s %s %s kalean" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" +msgid "%sinto %s%s%s|masculine form" msgstr "%s %s%s%s-an" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" +msgid "%sinto %s%s%s|feminine form" msgstr "%s %s%s%s-an" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" +msgid "%sinto %s%s%s|neuter form" msgstr "%s %s%s%s-en" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) @@ -165,57 +188,134 @@ msgstr "%s %s%s%s-en" msgid "%sinto the %s" msgstr "%s %s-an" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "eskuina" +msgid "When possible, please turn around" +msgstr "Ahal duzunean eman itzulia, mesedez" -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "ezkerra" +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" +msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "easily " -msgstr "pizka bat " +#, c-format +msgid "Follow the road for the next %s" +msgstr "Jarraitu bidean urrengo %s-arte" -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " -msgstr "gogorki " +msgid "Enter the roundabout soon" +msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " +#. TRANSLATORS: %s is the distance to the roundabout +#, c-format +msgid "Enter the roundabout %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" +msgstr "gero, irten errotondatik %1$s-ean %2$s" + +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "Leave the roundabout at the %1$s %2$s" +msgstr "Irten errotondatik %1$s-ean %2$s" + +msgid "soon" +msgstr "hurrengotan" + +msgid "now" +msgstr "orain" + +msgid "then" msgstr "" -msgid "When possible, please turn around" -msgstr "Ahal duzunean eman itzulia, mesedez" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|right" +msgstr "" -msgid "Enter the roundabout soon" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|right" msgstr "" -#. TRANSLATORS: %s is the distance to the roundabout +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Enter the roundabout %s" +msgid "then merge%1$s|left" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|left" +msgstr "" + +msgid "on your left" msgstr "" +msgid "on your right" +msgstr "" + +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "then leave the roundabout at the %s" +msgid "Take exit %1$s %2$s %3$s" msgstr "" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "Leave the roundabout at the %s" +msgid "Take the exit %1$s %2$s%3$s" +msgstr "" + +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" +msgstr "" + +msgid "at exit" msgstr "" +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "Follow the road for the next %s" -msgstr "Jarraitu bidean urrengo %s-arte" +msgid "then continue straight%1$s" +msgstr "" -msgid "soon" -msgstr "hurrengotan" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep right%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep right %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "eskuina" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "ezkerra" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "pizka bat " + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "gogorki " -#. TRANSLATORS: First argument is the how manieth street to take, second the direction #, c-format msgid "Take the %1$s road to the %2$s" msgstr "Hartu %1$s bidea %2$s-ean" @@ -224,32 +324,59 @@ msgstr "Hartu %1$s bidea %2$s-ean" msgid "after %i roads" msgstr "%i bideen ondoren" -msgid "now" -msgstr "orain" +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination +#, c-format +msgid "Turn %1$s%2$s %3$s%4$s" +msgstr "Biratu %1$s%2$s-ra %3$s%4$s-tan" +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "" + +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "then take the %1$s road to the %2$s" +msgid "Make a U-turn %1$s|left" msgstr "" -msgid "error" +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" msgstr "" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "Turn %1$s%2$s %3$s%4$s" +msgid "Make a U-turn %1$s|right" msgstr "" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination -#, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" msgstr "" +msgid "then you have reached your destination." +msgstr "dagoeneko helburura iritsi zara" + +#. TRANSLATORS: the arg. is distance #, c-format msgid "You have reached your destination %s" msgstr "%s helburura iritsi zara" -msgid "then you have reached your destination." -msgstr "dagoeneko helburura iritsi zara" +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "" + +msgid "Exit" +msgstr "Irteera" #. Android resource: @strings/position_popup_title msgid "Position" @@ -1804,10 +1931,10 @@ msgstr "" msgid "Enter Coordinates" msgstr "" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/fa.po.in b/po/fa.po.in index d5d697084..ff9ce283c 100644 --- a/po/fa.po.in +++ b/po/fa.po.in @@ -4,19 +4,19 @@ # Many thanks to the contributors of this translation: # salix https://launchpad.net/~s-shahsa # the_cephalex https://launchpad.net/~ali-rashidi - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2014-06-28 21:57+0000\n" "Last-Translator: the_cephalex <Unknown>\n" "Language-Team: Persian <fa@li.org>\n" +"Language: fa\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"Language: fa\n" msgid "Running from source directory\n" msgstr "" @@ -133,64 +133,72 @@ msgid_plural "in %d kilometers" msgstr[0] "" msgstr[1] "" -msgid "exit" -msgstr "بیرون" - -msgid "into the ramp" -msgstr "به سوی شیب" - -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name #, c-format -msgid "%sinto the street %s%s%s" +msgid "%1$sonto the %2$s%3$s%4$s" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name #, c-format -msgid "%sinto the %s%s%s|male form" +msgid "%1$sonto %2$s" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" +msgid "%1$sonto %2$s|masculine form" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" +msgid "%1$sonto %2$s|feminine form" msgstr "" -#. TRANSLATORS: gives the name of the next road to turn into (into the E17) +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s" +msgid "%1$sonto %2$s|neuter form" msgstr "" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "راست" +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" +msgstr "به سوی شیب" -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "چپ" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name +#, c-format +msgid "%sinto %s%s%s" +msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "easily " -msgstr "به آسانی " +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%sinto %s%s%s|masculine form" +msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " -msgstr "به سختی " +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%sinto %s%s%s|feminine form" +msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%sinto %s%s%s|neuter form" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: gives the name of the next road to turn into (into the E17) +#, c-format +msgid "%sinto the %s" msgstr "" msgid "When possible, please turn around" msgstr "هنگامیکه توانستید برگردید." +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" +msgstr "" + +#, c-format +msgid "Follow the road for the next %s" +msgstr "" + msgid "Enter the roundabout soon" msgstr "به زودی به فلکه بروید" @@ -199,57 +207,176 @@ msgstr "به زودی به فلکه بروید" msgid "Enter the roundabout %s" msgstr "" +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow #, c-format -msgid "then leave the roundabout at the %s" +msgid "then leave the roundabout at the %1$s %2$s" msgstr "" +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow #, c-format -msgid "Leave the roundabout at the %s" +msgid "Leave the roundabout at the %1$s %2$s" msgstr "" +msgid "soon" +msgstr "به زودی" + +msgid "now" +msgstr "اکنون" + +msgid "then" +msgstr "" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "Follow the road for the next %s" +msgid "then merge%1$s|right" msgstr "" -msgid "soon" -msgstr "به زودی" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|right" +msgstr "" -#. TRANSLATORS: First argument is the how manieth street to take, second the direction +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Take the %1$s road to the %2$s" +msgid "then merge%1$s|left" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "after %i roads" +msgid "Merge %1$s%2$s|left" msgstr "" -msgid "now" -msgstr "اکنون" +msgid "on your left" +msgstr "" +msgid "on your right" +msgstr "" + +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "then take the %1$s road to the %2$s" +msgid "Take exit %1$s %2$s %3$s" msgstr "" -msgid "error" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination +#, c-format +msgid "Take the exit %1$s %2$s%3$s" msgstr "" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" +msgstr "" + +msgid "at exit" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then continue straight%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep right%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep right %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "راست" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "چپ" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "به آسانی " + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "به سختی " + +#, c-format +msgid "Take the %1$s road to the %2$s" +msgstr "" + +#, c-format +msgid "after %i roads" +msgstr "" + +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination #, c-format msgid "Turn %1$s%2$s %3$s%4$s" msgstr "" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "" + +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +msgid "Make a U-turn %1$s|left" +msgstr "" + +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" msgstr "" +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "You have reached your destination %s" +msgid "Make a U-turn %1$s|right" +msgstr "" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" msgstr "" msgid "then you have reached your destination." msgstr "سپس شما به خواستگاه خود رسیده اید." +#. TRANSLATORS: the arg. is distance +#, c-format +msgid "You have reached your destination %s" +msgstr "" + +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "" + +msgid "Exit" +msgstr "بیرون" + #. Android resource: @strings/position_popup_title msgid "Position" msgstr "جایگاه" @@ -1803,10 +1930,10 @@ msgstr "" msgid "Enter Coordinates" msgstr "" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/fi.po.in b/po/fi.po.in index df255eafd..af18088ce 100644 --- a/po/fi.po.in +++ b/po/fi.po.in @@ -9,19 +9,19 @@ # Ossi Berg https://launchpad.net/~fso-polonez # Roadrunner IN https://launchpad.net/~online # Timo Jyrinki https://launchpad.net/~timo-jyrinki - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2013-09-28 01:42+0000\n" "Last-Translator: Timo Jyrinki <timo.jyrinki@canonical.com>\n" "Language-Team: Ossi Berg <o.berg@mail.com>\n" +"Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"Language: \n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -139,30 +139,53 @@ msgid_plural "in %d kilometers" msgstr[0] "Yhden kilometrin päästä" msgstr[1] "%d kilometrin päästä" -msgid "exit" -msgstr "poistumistie" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "" -msgid "into the ramp" +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "rampille" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" +msgid "%sinto %s%s%s" msgstr "%skadulle %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" +msgid "%sinto %s%s%s|masculine form" msgstr "%skadulle %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" +msgid "%sinto %s%s%s|feminine form" msgstr "%skadulle %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" +msgid "%sinto %s%s%s|neuter form" msgstr "%skadulle %s%s%s" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) @@ -170,92 +193,196 @@ msgstr "%skadulle %s%s%s" msgid "%sinto the %s" msgstr "%stielle %s" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "oikealle" +msgid "When possible, please turn around" +msgstr "Kun mahdollista, tee u-käännös" -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "vasemmalle" +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" +msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "easily " -msgstr "loivasti " +#, c-format +msgid "Follow the road for the next %s" +msgstr "Seuraa tätä tietä %s" -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " -msgstr "jyrkästi " +msgid "Enter the roundabout soon" +msgstr "Liity liikenneympyrään pian" -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " +#. TRANSLATORS: %s is the distance to the roundabout +#, c-format +msgid "Enter the roundabout %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" msgstr "" -msgid "When possible, please turn around" -msgstr "Kun mahdollista, tee u-käännös" +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "Leave the roundabout at the %1$s %2$s" +msgstr "" -msgid "Enter the roundabout soon" -msgstr "Liity liikenneympyrään pian" +msgid "soon" +msgstr "pian" -#. TRANSLATORS: %s is the distance to the roundabout +msgid "now" +msgstr "nyt" + +msgid "then" +msgstr "sitten" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "Enter the roundabout %s" +msgid "then merge%1$s|right" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "then leave the roundabout at the %s" +msgid "Merge %1$s%2$s|right" msgstr "" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Leave the roundabout at the %s" +msgid "then merge%1$s|left" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Follow the road for the next %s" -msgstr "Seuraa tätä tietä %s" +msgid "Merge %1$s%2$s|left" +msgstr "" -msgid "soon" -msgstr "pian" +msgid "on your left" +msgstr "" + +msgid "on your right" +msgstr "" -#. TRANSLATORS: First argument is the how manieth street to take, second the direction +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "Take the %1$s road to the %2$s" -msgstr "Valitse %1$s tie suuntaan %2$s" +msgid "Take exit %1$s %2$s %3$s" +msgstr "" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "after %i roads" -msgstr "%i tien jälkeen" +msgid "Take the exit %1$s %2$s%3$s" +msgstr "" -msgid "now" -msgstr "nyt" +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" +msgstr "" + +msgid "at exit" +msgstr "" +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "then take the %1$s road to the %2$s" +msgid "then continue straight%1$s" msgstr "" -msgid "error" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" msgstr "" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "Turn %1$s%2$s %3$s%4$s" +msgid "then keep right%1$s" msgstr "" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +msgid "Keep right %1$s%2$s%3$s" msgstr "" +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "You have reached your destination %s" -msgstr "Olet saavuttanut kohteesi %s" +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "oikealle" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "vasemmalle" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "loivasti " + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "jyrkästi " + +#, c-format +msgid "Take the %1$s road to the %2$s" +msgstr "Valitse %1$s tie suuntaan %2$s" + +#, c-format +msgid "after %i roads" +msgstr "%i tien jälkeen" + +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination +#, c-format +msgid "Turn %1$s%2$s %3$s%4$s" +msgstr "Käänny %1$s%2$s %3$s%4$s" + +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "tee sitten u-käännös" + +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. +#, c-format +msgid "Make a U-turn %1$s|left" +msgstr "Tee u-käännös %1$s" + +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" +msgstr "tee sitten u-käännös" + +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. +#, c-format +msgid "Make a U-turn %1$s|right" +msgstr "Tee u-käännös %1$s" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" +msgstr "" msgid "then you have reached your destination." msgstr "sitten olet perillä." +#. TRANSLATORS: the arg. is distance +#, c-format +msgid "You have reached your destination %s" +msgstr "Olet saavuttanut kohteesi %s" + +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "" + +msgid "Exit" +msgstr "Poistumistie" + #. Android resource: @strings/position_popup_title msgid "Position" msgstr "Sijainti" @@ -1501,8 +1628,7 @@ msgid "_Autozoom" msgstr "Autom. suurennus" msgid "Enable/disable automatic zoom level changing" -msgstr "" -"Ota automaattinen lähennystason muuttaminen käyttöön tai pois käytöstä" +msgstr "Ota automaattinen lähennystason muuttaminen käyttöön tai pois käytöstä" msgid "_Fullscreen" msgstr "Koko ruutu" @@ -1814,10 +1940,10 @@ msgstr "" msgid "Enter Coordinates" msgstr "" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/fil.po.in b/po/fil.po.in index be3aaa3f2..bfcb7c015 100644 --- a/po/fil.po.in +++ b/po/fil.po.in @@ -3,19 +3,19 @@ # This file is distributed under the same license as the navit package. # Many thanks to the contributors of this translation: # chito https://launchpad.net/~cnuarin - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2012-09-26 07:21+0000\n" "Last-Translator: chito <cnuarin@gmail.com>\n" "Language-Team: Filipino <fil@li.org>\n" +"Language: fil\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"Language: fil\n" msgid "Running from source directory\n" msgstr "" @@ -132,123 +132,250 @@ msgid_plural "in %d kilometers" msgstr[0] "sa loob ng isang kilometro" msgstr[1] "sa loob ng %d kilometro" -msgid "exit" -msgstr "labasan" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "" -msgid "into the ramp" +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" +msgid "%sinto %s%s%s" +msgstr "%s sa kalyeng %s%s%s" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%sinto %s%s%s|masculine form" +msgstr "%s sa kalyeng %s%s%s" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%sinto %s%s%s|feminine form" msgstr "%s sa kalyeng %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" +msgid "%sinto %s%s%s|neuter form" +msgstr "%s sa kalyeng %s%s%s" + +#. TRANSLATORS: gives the name of the next road to turn into (into the E17) +#, c-format +msgid "%sinto the %s" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +msgid "When possible, please turn around" +msgstr "Kung maari ay bumalik" + +#. TRANSLATORS: the argument is the destination to follow #, c-format -msgid "%sinto the %s%s%s|female form" +msgid "towards %s" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" +msgid "Follow the road for the next %s" +msgstr "Sundan ang kalye sa susunod na %s" + +msgid "Enter the roundabout soon" msgstr "" -#. TRANSLATORS: gives the name of the next road to turn into (into the E17) +#. TRANSLATORS: %s is the distance to the roundabout #, c-format -msgid "%sinto the %s" +msgid "Enter the roundabout %s" msgstr "" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "kanan" +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" +msgstr "pagkatapos ay lumabas sa rotonda sa may %1$s %2$s" -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "Kaliwa" +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "Leave the roundabout at the %1$s %2$s" +msgstr "Lisanin ang rotonda sa may %1$s %2$s" -#. TRANSLATORS: Don't forget the ending space -msgid "easily " -msgstr "ng marahan " +msgid "soon" +msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " +msgid "now" +msgstr "ngayon na" + +msgid "then" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|right" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|right" msgstr "" -msgid "When possible, please turn around" -msgstr "kung maari ay bumalik" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|left" +msgstr "" -msgid "Enter the roundabout soon" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|left" msgstr "" -#. TRANSLATORS: %s is the distance to the roundabout +msgid "on your left" +msgstr "" + +msgid "on your right" +msgstr "" + +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "Enter the roundabout %s" +msgid "Take exit %1$s %2$s %3$s" msgstr "" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "then leave the roundabout at the %s" +msgid "Take the exit %1$s %2$s%3$s" +msgstr "" + +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" +msgstr "" + +msgid "at exit" msgstr "" +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "Leave the roundabout at the %s" +msgid "then continue straight%1$s" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination #, c-format -msgid "Follow the road for the next %s" -msgstr "Sundan ang kalye sa susunod na %s" +msgid "Continue straight %1$s%2$s%3$s" +msgstr "" -msgid "soon" +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep right%1$s" msgstr "" -#. TRANSLATORS: First argument is the how manieth street to take, second the direction +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination #, c-format -msgid "Take the %1$s road to the %2$s" +msgid "Keep right %1$s%2$s%3$s" msgstr "" +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "after %i roads" +msgid "then keep left%1$s" msgstr "" -msgid "now" -msgstr "ngayon na" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "kanan" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "Kaliwa" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "ng marahan " + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "" #, c-format -msgid "then take the %1$s road to the %2$s" +msgid "Take the %1$s road to the %2$s" msgstr "" -msgid "error" +#, c-format +msgid "after %i roads" msgstr "" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination #, c-format msgid "Turn %1$s%2$s %3$s%4$s" msgstr "" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "" + +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +msgid "Make a U-turn %1$s|left" +msgstr "" + +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" msgstr "" +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "You have reached your destination %s" +msgid "Make a U-turn %1$s|right" +msgstr "" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" msgstr "" msgid "then you have reached your destination." msgstr "" +#. TRANSLATORS: the arg. is distance +#, c-format +msgid "You have reached your destination %s" +msgstr "" + +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "" + +msgid "Exit" +msgstr "Labasan" + #. Android resource: @strings/position_popup_title msgid "Position" msgstr "" @@ -1802,10 +1929,10 @@ msgstr "" msgid "Enter Coordinates" msgstr "" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/fo.po.in b/po/fo.po.in index b5dd2a33f..dc9f8eda5 100644 --- a/po/fo.po.in +++ b/po/fo.po.in @@ -4,19 +4,19 @@ # Many thanks to the contributors of this translation: # Cyberish https://launchpad.net/~cyberish # Gunleif Joensen https://launchpad.net/~gunleif - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2013-09-28 01:42+0000\n" "Last-Translator: Cyberish <kajsten@gmail.com>\n" "Language-Team: Faroese <fo@li.org>\n" +"Language: fo\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"Language: fo\n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -134,30 +134,53 @@ msgid_plural "in %d kilometers" msgstr[0] "um ein kilometur" msgstr[1] "um %d kilometrar" -msgid "exit" -msgstr "avkoyring" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "" -msgid "into the ramp" +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "uppá rampuna" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" +msgid "%sinto %s%s%s" msgstr "%sinná gøtuna %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" -msgstr "%sinto the %s%s%sur" +msgid "%sinto %s%s%s|masculine form" +msgstr "%sinná %s%s%sur" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" -msgstr "%sinto the %s%s%sa" +msgid "%sinto %s%s%s|feminine form" +msgstr "%sinná %s%s%sa" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" +msgid "%sinto %s%s%s|neuter form" msgstr "%sinná %s%s%si" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) @@ -165,57 +188,134 @@ msgstr "%sinná %s%s%si" msgid "%sinto the %s" msgstr "%sinná %s" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "Høgra" +msgid "When possible, please turn around" +msgstr "Vend um skótast tilber" -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "Vinstra" +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" +msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "easily " -msgstr "lætt " +#, c-format +msgid "Follow the road for the next %s" +msgstr "fylg vegnum tær næstu %s" -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " -msgstr "knapt " +msgid "Enter the roundabout soon" +msgstr "Um lítið bil verður koyrt inní rundkoyringina" -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " +#. TRANSLATORS: %s is the distance to the roundabout +#, c-format +msgid "Enter the roundabout %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" +msgstr "far so út úr rundkoyring við %1$s %2$s" + +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "Leave the roundabout at the %1$s %2$s" +msgstr "Far so út úr rundkoyring við %1$s %2$s" + +msgid "soon" +msgstr "skjótt" + +msgid "now" +msgstr "nú" + +msgid "then" +msgstr "so" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|right" msgstr "" -msgid "When possible, please turn around" -msgstr "vend um skótast tilber" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|right" +msgstr "" -msgid "Enter the roundabout soon" -msgstr "Um lítið bil verður koyrt inní rundkoyringina" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|left" +msgstr "" -#. TRANSLATORS: %s is the distance to the roundabout +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Enter the roundabout %s" +msgid "Merge %1$s%2$s|left" +msgstr "" + +msgid "on your left" msgstr "" +msgid "on your right" +msgstr "" + +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "then leave the roundabout at the %s" +msgid "Take exit %1$s %2$s %3$s" msgstr "" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "Leave the roundabout at the %s" +msgid "Take the exit %1$s %2$s%3$s" +msgstr "" + +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" msgstr "" +msgid "at exit" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "Follow the road for the next %s" -msgstr "fylg vegnum tær næstu %s" +msgid "then continue straight%1$s" +msgstr "" -msgid "soon" -msgstr "skjótt" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep right%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep right %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "Høgra" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "Vinstra" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "lætt " + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "knapt " -#. TRANSLATORS: First argument is the how manieth street to take, second the direction #, c-format msgid "Take the %1$s road to the %2$s" msgstr "tak tann %1$s vegin til %2$s" @@ -224,32 +324,59 @@ msgstr "tak tann %1$s vegin til %2$s" msgid "after %i roads" msgstr "eftir %i vegir" -msgid "now" -msgstr "nú" - +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination #, c-format -msgid "then take the %1$s road to the %2$s" -msgstr "" +msgid "Turn %1$s%2$s %3$s%4$s" +msgstr "dreya %1$s%2$s %3$s%4$s" -msgid "error" -msgstr "" +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "vend so um" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "Turn %1$s%2$s %3$s%4$s" -msgstr "" +msgid "Make a U-turn %1$s|left" +msgstr "Vend um %1$s" + +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" +msgstr "vend so um" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +msgid "Make a U-turn %1$s|right" +msgstr "Vend um %1$s" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" msgstr "" +msgid "then you have reached your destination." +msgstr "tá hevur tú nátt tínum ferðamáli" + +#. TRANSLATORS: the arg. is distance #, c-format msgid "You have reached your destination %s" msgstr "Tú hevur nátt tínum ferðamáli %s" -msgid "then you have reached your destination." -msgstr "tá hevur tú nátt tínum ferðamáli" +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "" + +msgid "Exit" +msgstr "Avkoyring" #. Android resource: @strings/position_popup_title msgid "Position" @@ -1804,10 +1931,10 @@ msgstr "" msgid "Enter Coordinates" msgstr "" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/fr.po.in b/po/fr.po.in index a48e9ef14..fd7a50e22 100644 --- a/po/fr.po.in +++ b/po/fr.po.in @@ -23,19 +23,19 @@ # metehyi https://launchpad.net/~metehyi # pierre https://launchpad.net/~pmghost4 # yannick56 https://launchpad.net/~yleny - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2015-04-21 18:51+0000\n" "Last-Translator: Jean Marc <Unknown>\n" "Language-Team: KaZeR <kazer@altern.org>\n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"Language: fr\n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -153,30 +153,53 @@ msgid_plural "in %d kilometers" msgstr[0] "dans un kilomètre" msgstr[1] "dans %d kilomètres" -msgid "exit" -msgstr "sortie" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "%1$svers %2$s%3$s%4$s" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "%1$svers %2$s" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "%1$svers le %2$s" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "%1$svers la %2$s" -msgid "into the ramp" -msgstr "vers la sortie" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "%1$svers l'%2$s" + +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" +msgstr "vers la bretelle" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" -msgstr "%sdans %s%s%s" +msgid "%sinto %s%s%s" +msgstr "%ssur %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" -msgstr "%ssur le %s%s%s|male form" +msgid "%sinto %s%s%s|masculine form" +msgstr "%ssur le %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" -msgstr "%sdans la %s%s%s" +msgid "%sinto %s%s%s|feminine form" +msgstr "%ssur la %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" +msgid "%sinto %s%s%s|neuter form" msgstr "%ssur l'%s%s%s" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) @@ -184,36 +207,18 @@ msgstr "%ssur l'%s%s%s" msgid "%sinto the %s" msgstr "%svers la %s" -# tournez à droite -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "à droite" - -# tournez à gauche -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "à gauche" - -# utilisé pour les changements de voie pour les sorties? -#. TRANSLATORS: Don't forget the ending space -msgid "easily " -msgstr "légèrement " - -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " -msgstr "fortement " - -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " -msgstr "" - -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " -msgstr "inconnu " - msgid "When possible, please turn around" msgstr "Dès que possible, faites demi-tour" +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" +msgstr "vers %s" + +#, c-format +msgid "Follow the road for the next %s" +msgstr "Suivez la route sur %s" + msgid "Enter the roundabout soon" msgstr "Préparez vous à vous engager dans le rond-point" @@ -222,57 +227,179 @@ msgstr "Préparez vous à vous engager dans le rond-point" msgid "Enter the roundabout %s" msgstr "Entrer dans le rond-point %s" +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow #, c-format -msgid "then leave the roundabout at the %s" -msgstr "puis sortez du rond-point à la %s" +msgid "then leave the roundabout at the %1$s %2$s" +msgstr "puis sortez du rond-point à la %1$s %2$s" +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow #, c-format -msgid "Leave the roundabout at the %s" -msgstr "Sortez du rond-point à la %s" - -#, c-format -msgid "Follow the road for the next %s" -msgstr "Suivez la route sur %s" +msgid "Leave the roundabout at the %1$s %2$s" +msgstr "Sortez du rond-point à la %1$s %2$s" msgid "soon" msgstr "bientôt" -#. TRANSLATORS: First argument is the how manieth street to take, second the direction +msgid "now" +msgstr "maintenant" + +msgid "then" +msgstr "puis" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "Take the %1$s road to the %2$s" -msgstr "Empreintez la %1$s rue en direction de %2$s" +msgid "then merge%1$s|right" +msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "after %i roads" -msgstr "après %i rues" +msgid "Merge %1$s%2$s|right" +msgstr "" -msgid "now" -msgstr "maintenant" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|left" +msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "then take the %1$s road to the %2$s" -msgstr "puis prenez la %1$s route à %2$s" +msgid "Merge %1$s%2$s|left" +msgstr "" -msgid "error" -msgstr "erreur" +msgid "on your left" +msgstr "" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +msgid "on your right" +msgstr "" + +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance +#, c-format +msgid "Take exit %1$s %2$s %3$s" +msgstr "Prenez la sortie %1$s %2$s %3$s" + +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination +#, c-format +msgid "Take the exit %1$s %2$s%3$s" +msgstr "Prenez la sortie %1$s %2$s%3$s" + +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" +msgstr "à l'èchangeur" + +msgid "at exit" +msgstr "à la sortie" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then continue straight%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep right%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep right %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +# tournez à droite +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "à droite" + +# tournez à gauche +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "à gauche" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "légèrement " + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "fortement " + +#, c-format +msgid "Take the %1$s road to the %2$s" +msgstr "Empreintez la %1$s rue en direction de %2$s" + +#, c-format +msgid "after %i roads" +msgstr "après %i rues" + +# espace important après le 2 +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination #, c-format msgid "Turn %1$s%2$s %3$s%4$s" msgstr "" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "puis faites demi-tour" + +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" -msgstr "puis tournez %1$s%2$s %3$s%4$s" +msgid "Make a U-turn %1$s|left" +msgstr "Faites demi-tour %1$s" + +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" +msgstr "puis faites demi-tour" +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "You have reached your destination %s" -msgstr "Vous êtes arrivé à destination : %s" +msgid "Make a U-turn %1$s|right" +msgstr "Faites demi-tour %1$s" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" +msgstr "suivez" msgid "then you have reached your destination." msgstr "puis vous arriverez à destination" +#. TRANSLATORS: the arg. is distance +#, c-format +msgid "You have reached your destination %s" +msgstr "Vous êtes arrivé à destination %s" + +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "Echangeur" + +msgid "Exit" +msgstr "Sortie" + #. Android resource: @strings/position_popup_title msgid "Position" msgstr "Position" @@ -1828,10 +1955,10 @@ msgstr "Étapes" msgid "Enter Coordinates" msgstr "Saisissez les coordonnées" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/fr_CH.po.in b/po/fr_CH.po.in index 87e38f758..a0747f177 100644 --- a/po/fr_CH.po.in +++ b/po/fr_CH.po.in @@ -3,19 +3,19 @@ # This file is distributed under the same license as the navit package. # Many thanks to the contributors of this translation: # KaZeR https://launchpad.net/~kazer - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2013-09-28 01:42+0000\n" "Last-Translator: KaZeR <Unknown>\n" "Language-Team: KaZeR <kazer@altern.org>\n" +"Language: fr_CH\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"Language: \n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -133,126 +133,254 @@ msgid_plural "in %d kilometers" msgstr[0] "dans un kilomètre" msgstr[1] "dans %d kilomètres" -msgid "exit" -msgstr "sortie" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "%1$svers %2$s%3$s%4$s" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "%1$svers %2$s" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "%1$svers le %2$s" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "%1$svers la %2$s" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "%1$svers l'%2$s" -msgid "into the ramp" -msgstr "vers la sortie" +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" +msgstr "vers la bretelle" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" +msgid "%sinto %s%s%s" msgstr "%ssur %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" -msgstr "%ssur le %s%s%s|male form" +msgid "%sinto %s%s%s|masculine form" +msgstr "%ssur le %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" -msgstr "%ssur la %s%s%s|female form" +msgid "%sinto %s%s%s|feminine form" +msgstr "%ssur la %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" -msgstr "%ssur l'%s%s%s|neutral form" +msgid "%sinto %s%s%s|neuter form" +msgstr "%ssur l'%s%s%s" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) #, c-format msgid "%sinto the %s" msgstr "%svers la %s" -# tournez à droite -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "à droite" +msgid "When possible, please turn around" +msgstr "Dès que possible, faites demi-tour" -# tournez à gauche -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "à gauche" +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" +msgstr "vers %s" -# utilisé pour les changements de voie pour les sorties? -#. TRANSLATORS: Don't forget the ending space -msgid "easily " -msgstr "légèrement " +#, c-format +msgid "Follow the road for the next %s" +msgstr "Suivez la route sur %s" -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " -msgstr "fortement " +msgid "Enter the roundabout soon" +msgstr "Préparez vous à vous engager dans le rond-point" -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " +#. TRANSLATORS: %s is the distance to the roundabout +#, c-format +msgid "Enter the roundabout %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " -msgstr "" +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" +msgstr "puis sortez du rond-point à la %1$s %2$s" -msgid "When possible, please turn around" -msgstr "Dès que possible, faites demi-tour" +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "Leave the roundabout at the %1$s %2$s" +msgstr "Sortez du rond-point à la %1$s %2$s" -msgid "Enter the roundabout soon" -msgstr "Préparez vous à vous engager dans le rond-point" +msgid "soon" +msgstr "bientôt" -#. TRANSLATORS: %s is the distance to the roundabout +msgid "now" +msgstr "maintenant" + +msgid "then" +msgstr "puis" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "Enter the roundabout %s" +msgid "then merge%1$s|right" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "then leave the roundabout at the %s" +msgid "Merge %1$s%2$s|right" msgstr "" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Leave the roundabout at the %s" +msgid "then merge%1$s|left" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Follow the road for the next %s" -msgstr "Suivez la route sur %s" +msgid "Merge %1$s%2$s|left" +msgstr "" -msgid "soon" -msgstr "bientôt" +msgid "on your left" +msgstr "" -#. TRANSLATORS: First argument is the how manieth street to take, second the direction +msgid "on your right" +msgstr "" + +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "Take the %1$s road to the %2$s" -msgstr "Prenez la %1$s route vers la %2$s" +msgid "Take exit %1$s %2$s %3$s" +msgstr "Prenez la sortie %1$s %2$s %3$s" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "after %i roads" -msgstr "après %i rues" +msgid "Take the exit %1$s %2$s%3$s" +msgstr "Prenez la sortie %1$s %2$s%3$s" -msgid "now" -msgstr "maintenant" +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" +msgstr "à l'èchangeur" +msgid "at exit" +msgstr "à la sortie" + +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "then take the %1$s road to the %2$s" +msgid "then continue straight%1$s" msgstr "" -msgid "error" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" msgstr "" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "Turn %1$s%2$s %3$s%4$s" +msgid "then keep right%1$s" msgstr "" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +msgid "Keep right %1$s%2$s%3$s" msgstr "" +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "You have reached your destination %s" -msgstr "Vous êtes arrivé à destination : %s" +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +# tournez à droite +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "à droite" + +# tournez à gauche +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "à gauche" + +# utilisé pour les changements de voie pour les sorties? +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "légèrement " + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "fortement " + +#, c-format +msgid "Take the %1$s road to the %2$s" +msgstr "Prenez la %1$s route vers la %2$s" + +#, c-format +msgid "after %i roads" +msgstr "après %i rues" + +# espace important après le 2 +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination +#, c-format +msgid "Turn %1$s%2$s %3$s%4$s" +msgstr "" + +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "puis faites demi-tour" + +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. +#, c-format +msgid "Make a U-turn %1$s|left" +msgstr "Faites demi-tour %1$s" + +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" +msgstr "puis faites demi-tour" + +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. +#, c-format +msgid "Make a U-turn %1$s|right" +msgstr "Faites demi-tour %1$s" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" +msgstr "suivez" msgid "then you have reached your destination." msgstr "ensuite vous serez à destination" +#. TRANSLATORS: the arg. is distance +#, c-format +msgid "You have reached your destination %s" +msgstr "Vous êtes arrivé à destination %s" + +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "Echangeur" + +msgid "Exit" +msgstr "Sortie" + #. Android resource: @strings/position_popup_title msgid "Position" msgstr "Position" @@ -1806,10 +1934,10 @@ msgstr "" msgid "Enter Coordinates" msgstr "" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/fy.po.in b/po/fy.po.in index 12da38587..ff727f4c3 100644 --- a/po/fy.po.in +++ b/po/fy.po.in @@ -3,19 +3,19 @@ # This file is distributed under the same license as the navit package. # Many thanks to the contributors of this translation: # 205 https://launchpad.net/~205-z - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2011-08-12 12:18+0000\n" "Last-Translator: 205 <Unknown>\n" "Language-Team: Frisian <fy@li.org>\n" +"Language: fy\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"Language: \n" msgid "Running from source directory\n" msgstr "" @@ -132,30 +132,53 @@ msgid_plural "in %d kilometers" msgstr[0] "" msgstr[1] "" -msgid "exit" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" msgstr "" -msgid "into the ramp" +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" +msgid "%sinto %s%s%s" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" +msgid "%sinto %s%s%s|masculine form" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" +msgid "%sinto %s%s%s|feminine form" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" +msgid "%sinto %s%s%s|neuter form" msgstr "" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) @@ -163,92 +186,196 @@ msgstr "" msgid "%sinto the %s" msgstr "" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" +msgid "When possible, please turn around" msgstr "" -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "easily " +#, c-format +msgid "Follow the road for the next %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " +msgid "Enter the roundabout soon" +msgstr "" + +#. TRANSLATORS: %s is the distance to the roundabout +#, c-format +msgid "Enter the roundabout %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "Leave the roundabout at the %1$s %2$s" msgstr "" -msgid "When possible, please turn around" +msgid "soon" msgstr "" -msgid "Enter the roundabout soon" +msgid "now" msgstr "" -#. TRANSLATORS: %s is the distance to the roundabout +msgid "then" +msgstr "" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "Enter the roundabout %s" +msgid "then merge%1$s|right" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "then leave the roundabout at the %s" +msgid "Merge %1$s%2$s|right" msgstr "" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Leave the roundabout at the %s" +msgid "then merge%1$s|left" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Follow the road for the next %s" +msgid "Merge %1$s%2$s|left" msgstr "" -msgid "soon" +msgid "on your left" +msgstr "" + +msgid "on your right" msgstr "" -#. TRANSLATORS: First argument is the how manieth street to take, second the direction +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "Take the %1$s road to the %2$s" +msgid "Take exit %1$s %2$s %3$s" msgstr "" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "after %i roads" +msgid "Take the exit %1$s %2$s%3$s" msgstr "" -msgid "now" +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" msgstr "" +msgid "at exit" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "then take the %1$s road to the %2$s" +msgid "then continue straight%1$s" msgstr "" -msgid "error" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" msgstr "" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep right%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep right %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "" + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "" + +#, c-format +msgid "Take the %1$s road to the %2$s" +msgstr "" + +#, c-format +msgid "after %i roads" +msgstr "" + +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination #, c-format msgid "Turn %1$s%2$s %3$s%4$s" msgstr "" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "" + +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +msgid "Make a U-turn %1$s|left" +msgstr "" + +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" msgstr "" +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "You have reached your destination %s" +msgid "Make a U-turn %1$s|right" +msgstr "" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" msgstr "" msgid "then you have reached your destination." msgstr "" +#. TRANSLATORS: the arg. is distance +#, c-format +msgid "You have reached your destination %s" +msgstr "" + +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "" + +msgid "Exit" +msgstr "" + #. Android resource: @strings/position_popup_title msgid "Position" msgstr "" @@ -1802,10 +1929,10 @@ msgstr "" msgid "Enter Coordinates" msgstr "" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/gl.po.in b/po/gl.po.in index 1d36677d1..376d1d0a4 100644 --- a/po/gl.po.in +++ b/po/gl.po.in @@ -6,19 +6,19 @@ # Miguel Anxo Bouzada https://launchpad.net/~mbouzada # Xosé https://launchpad.net/~ubuntu-galizaweb # andreout https://launchpad.net/~andre-outeiro - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2013-09-28 01:42+0000\n" "Last-Translator: andreout <andre@outeiro.com>\n" "Language-Team: Galician <gl@li.org>\n" +"Language: gl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"Language: gl\n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -136,30 +136,53 @@ msgid_plural "in %d kilometers" msgstr[0] "nun quilómetro" msgstr[1] "en %d quilómetros" -msgid "exit" -msgstr "saída" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "" -msgid "into the ramp" +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "na rampa" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" +msgid "%sinto %s%s%s" msgstr "%s na rúa %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" +msgid "%sinto %s%s%s|masculine form" msgstr "%s no %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" +msgid "%sinto %s%s%s|feminine form" msgstr "%s na %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" +msgid "%sinto %s%s%s|neuter form" msgstr "%s no %s%s%s" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) @@ -167,57 +190,134 @@ msgstr "%s no %s%s%s" msgid "%sinto the %s" msgstr "%s na %s" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "á dereita" +msgid "When possible, please turn around" +msgstr "Cando sexa posible, dea a volta" -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "á esquerda" +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" +msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "easily " -msgstr "suavemente " +#, c-format +msgid "Follow the road for the next %s" +msgstr "Siga a estrada durante os próximos %s" -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " -msgstr "bruscamente " +msgid "Enter the roundabout soon" +msgstr "Métase pronto na rotonda" -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " +#. TRANSLATORS: %s is the distance to the roundabout +#, c-format +msgid "Enter the roundabout %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" +msgstr "logo saia da rotonda pola %1$s %2$s" + +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "Leave the roundabout at the %1$s %2$s" +msgstr "Saia da rotonda pola %1$s %2$s" + +msgid "soon" +msgstr "cedo" + +msgid "now" +msgstr "agora" + +msgid "then" +msgstr "logo" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|right" msgstr "" -msgid "When possible, please turn around" -msgstr "Cando sexa posible, dea a volta" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|right" +msgstr "" -msgid "Enter the roundabout soon" -msgstr "Métase pronto na rotonda" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|left" +msgstr "" -#. TRANSLATORS: %s is the distance to the roundabout +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Enter the roundabout %s" +msgid "Merge %1$s%2$s|left" +msgstr "" + +msgid "on your left" +msgstr "" + +msgid "on your right" msgstr "" +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "then leave the roundabout at the %s" +msgid "Take exit %1$s %2$s %3$s" +msgstr "Tome a saida %1$s %2$s %3$s" + +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination +#, c-format +msgid "Take the exit %1$s %2$s%3$s" +msgstr "Tome a saida %1$s %2$s%3$s" + +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" msgstr "" +msgid "at exit" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "Leave the roundabout at the %s" +msgid "then continue straight%1$s" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination #, c-format -msgid "Follow the road for the next %s" -msgstr "Siga a estrada durante os próximos %s" +msgid "Continue straight %1$s%2$s%3$s" +msgstr "" -msgid "soon" -msgstr "cedo" +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep right%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep right %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "á dereita" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "á esquerda" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "suavemente " + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "bruscamente " -#. TRANSLATORS: First argument is the how manieth street to take, second the direction #, c-format msgid "Take the %1$s road to the %2$s" msgstr "Tome a estrada %1$s cara o %2$s" @@ -226,32 +326,59 @@ msgstr "Tome a estrada %1$s cara o %2$s" msgid "after %i roads" msgstr "despois de %i estradas" -msgid "now" -msgstr "agora" - +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination #, c-format -msgid "then take the %1$s road to the %2$s" -msgstr "" +msgid "Turn %1$s%2$s %3$s%4$s" +msgstr "Xire %1$s%2$s %3$s%4$s" -msgid "error" -msgstr "" +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "logo dea a volta" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "Turn %1$s%2$s %3$s%4$s" -msgstr "" +msgid "Make a U-turn %1$s|left" +msgstr "Dea a volta %1$s" + +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" +msgstr "logo dea a volta" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +msgid "Make a U-turn %1$s|right" +msgstr "Dea a volta %1$s" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" msgstr "" +msgid "then you have reached your destination." +msgstr "despois xa chega ao seu destino" + +#. TRANSLATORS: the arg. is distance #, c-format msgid "You have reached your destination %s" msgstr "Chegou ao seu destino %s" -msgid "then you have reached your destination." -msgstr "despois xa chega ao seu destino" +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "" + +msgid "Exit" +msgstr "Saída" #. Android resource: @strings/position_popup_title msgid "Position" @@ -1806,10 +1933,10 @@ msgstr "" msgid "Enter Coordinates" msgstr "" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/he.po.in b/po/he.po.in index f0785bcbe..b95ac602b 100644 --- a/po/he.po.in +++ b/po/he.po.in @@ -8,19 +8,19 @@ # Nadav https://launchpad.net/~nadavz # Yaron https://launchpad.net/~sh-yaron # rintintin https://launchpad.net/~yonatanhak-gmail - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2014-05-26 10:31+0000\n" "Last-Translator: Yaron <sh.yaron@gmail.com>\n" "Language-Team: Hebrew <he@li.org>\n" +"Language: he\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"Language: he\n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -138,88 +138,188 @@ msgid_plural "in %d kilometers" msgstr[0] "בעוד קילומטר אחד" msgstr[1] "בעוד %d קילומטרים" -msgid "exit" -msgstr "יציאה" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "" -msgid "into the ramp" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "" + +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "אל הרמפה" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" -msgstr "%s אל רחוב %s %s %s" +msgid "%sinto %s%s%s" +msgstr "%s אל רחוב %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" -msgstr "%s אל רחוב %s %s %s" +msgid "%sinto %s%s%s|masculine form" +msgstr "%s אל רחוב %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" -msgstr "%s אל רחוב %s %s %s" +msgid "%sinto %s%s%s|feminine form" +msgstr "%s אל רחוב %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" -msgstr "%s אל רחוב %s %s %s" +msgid "%sinto %s%s%s|neuter form" +msgstr "%s אל רחוב %s%s%s" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) #, c-format msgid "%sinto the %s" msgstr "%sאל תוך ה%s" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "ימינה" +msgid "When possible, please turn around" +msgstr "כשיתאפשר לך, פנה חזרה" -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "שמאלה" +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" +msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "easily " -msgstr "מעט " +#, c-format +msgid "Follow the road for the next %s" +msgstr "המשך בדרך זו למשך %s" -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " -msgstr "בצורה חדה " +msgid "Enter the roundabout soon" +msgstr "הכנס לכיכר הקרובה" -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " +#. TRANSLATORS: %s is the distance to the roundabout +#, c-format +msgid "Enter the roundabout %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" +msgstr "אחר כך צא מהכיכר ב%1$s %2$s" + +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "Leave the roundabout at the %1$s %2$s" +msgstr "צא מהכיכר ב%1$s %2$s" + +msgid "soon" +msgstr "בקרוב" + +msgid "now" +msgstr "כעת" + +msgid "then" msgstr "" -msgid "When possible, please turn around" -msgstr "כשיתאפשר לך, פנה חזרה" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|right" +msgstr "" -msgid "Enter the roundabout soon" -msgstr "הכנס לכיכר הקרובה" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|right" +msgstr "" -#. TRANSLATORS: %s is the distance to the roundabout +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Enter the roundabout %s" +msgid "then merge%1$s|left" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "then leave the roundabout at the %s" +msgid "Merge %1$s%2$s|left" msgstr "" +msgid "on your left" +msgstr "" + +msgid "on your right" +msgstr "" + +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "Leave the roundabout at the %s" +msgid "Take exit %1$s %2$s %3$s" msgstr "" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "Follow the road for the next %s" -msgstr "המשך בדרך זו למשך %s" +msgid "Take the exit %1$s %2$s%3$s" +msgstr "" -msgid "soon" -msgstr "בקרוב" +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" +msgstr "" + +msgid "at exit" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then continue straight%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep right%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep right %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "ימינה" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "שמאלה" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "מעט " + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "בצורה חדה " -#. TRANSLATORS: First argument is the how manieth street to take, second the direction #, c-format msgid "Take the %1$s road to the %2$s" msgstr "קח את הכביש ה%1$s אל %2$s" @@ -228,32 +328,59 @@ msgstr "קח את הכביש ה%1$s אל %2$s" msgid "after %i roads" msgstr "לאחר %i כבישים" -msgid "now" -msgstr "כעת" +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination +#, c-format +msgid "Turn %1$s%2$s %3$s%4$s" +msgstr "פנה %1$s %2$s %4$s %3$s" + +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "" +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "then take the %1$s road to the %2$s" +msgid "Make a U-turn %1$s|left" msgstr "" -msgid "error" +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" msgstr "" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "Turn %1$s%2$s %3$s%4$s" +msgid "Make a U-turn %1$s|right" msgstr "" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination -#, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" msgstr "" +msgid "then you have reached your destination." +msgstr "ואז הגעת ליעד." + +#. TRANSLATORS: the arg. is distance #, c-format msgid "You have reached your destination %s" msgstr "הגעת ליעדך %s" -msgid "then you have reached your destination." -msgstr "ואז הגעת ליעד." +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "" + +msgid "Exit" +msgstr "יציאה" #. Android resource: @strings/position_popup_title msgid "Position" @@ -1808,10 +1935,10 @@ msgstr "" msgid "Enter Coordinates" msgstr "נא להזין נקודות ציון" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/hi.po.in b/po/hi.po.in index f7f57bcec..392ace61b 100644 --- a/po/hi.po.in +++ b/po/hi.po.in @@ -4,19 +4,19 @@ # Many thanks to the contributors of this translation: # KaZeR https://launchpad.net/~kazer # desh deep https://launchpad.net/~singhdeepdesh - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2014-11-15 22:03+0000\n" "Last-Translator: KaZeR <Unknown>\n" "Language-Team: Hindi <hi@li.org>\n" +"Language: hi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"Language: hi\n" msgid "Running from source directory\n" msgstr "" @@ -133,64 +133,72 @@ msgid_plural "in %d kilometers" msgstr[0] "ek kilometer mein" msgstr[1] "%d kilometero mein" -msgid "exit" -msgstr "nikas" - -msgid "into the ramp" -msgstr "dhalan mein" - -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name #, c-format -msgid "%sinto the street %s%s%s" -msgstr "%s sheher mein%s%s%s" +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name #, c-format -msgid "%sinto the %s%s%s|male form" +msgid "%1$sonto %2$s" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" +msgid "%1$sonto %2$s|masculine form" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" +msgid "%1$sonto %2$s|feminine form" msgstr "" -#. TRANSLATORS: gives the name of the next road to turn into (into the E17) +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s" +msgid "%1$sonto %2$s|neuter form" msgstr "" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "दायाँ" +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" +msgstr "dhalan mein" -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "बांया" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name +#, c-format +msgid "%sinto %s%s%s" +msgstr "%ssheher mein %s%s%s" -#. TRANSLATORS: Don't forget the ending space -msgid "easily " -msgstr "आसानी से " +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%sinto %s%s%s|masculine form" +msgstr "%ssheher mein %s%s%s" -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " -msgstr "दृढ़ता से " +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%sinto %s%s%s|feminine form" +msgstr "%ssheher mein %s%s%s" -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " -msgstr "" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%sinto %s%s%s|neuter form" +msgstr "%ssheher mein %s%s%s" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: gives the name of the next road to turn into (into the E17) +#, c-format +msgid "%sinto the %s" msgstr "" msgid "When possible, please turn around" msgstr "जब संभव हो, कृपया चारों ओर मोड़" +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" +msgstr "" + +#, c-format +msgid "Follow the road for the next %s" +msgstr "अगले%s के लिए सड़क का पालन करें" + msgid "Enter the roundabout soon" msgstr "" @@ -199,57 +207,176 @@ msgstr "" msgid "Enter the roundabout %s" msgstr "" +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow #, c-format -msgid "then leave the roundabout at the %s" +msgid "then leave the roundabout at the %1$s %2$s" +msgstr "तो %1$s %2$s के राउंडअबाउट छोड़" + +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "Leave the roundabout at the %1$s %2$s" +msgstr "%1$s %2$s के राउंडअबाउट छोड़ें" + +msgid "soon" +msgstr "जल्दी" + +msgid "now" +msgstr "अब" + +msgid "then" +msgstr "तो" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|right" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "Leave the roundabout at the %s" +msgid "Merge %1$s%2$s|right" msgstr "" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Follow the road for the next %s" -msgstr "अगले%s के लिए सड़क का पालन करें" +msgid "then merge%1$s|left" +msgstr "" -msgid "soon" -msgstr "जल्दी" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|left" +msgstr "" + +msgid "on your left" +msgstr "" -#. TRANSLATORS: First argument is the how manieth street to take, second the direction +msgid "on your right" +msgstr "" + +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "Take the %1$s road to the %2$s" -msgstr "%1$s %2$s के लिए सड़क ले लो" +msgid "Take exit %1$s %2$s %3$s" +msgstr "" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "after %i roads" -msgstr "%i के बाद सड़कों" +msgid "Take the exit %1$s %2$s%3$s" +msgstr "" -msgid "now" -msgstr "अब" +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" +msgstr "" + +msgid "at exit" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then continue straight%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep right%1$s" +msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination #, c-format -msgid "then take the %1$s road to the %2$s" +msgid "Keep right %1$s%2$s%3$s" msgstr "" -msgid "error" +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep left%1$s" msgstr "" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "दायाँ" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "बांया" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "आसानी से " + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "दृढ़ता से " + +#, c-format +msgid "Take the %1$s road to the %2$s" +msgstr "%1$s %2$s के लिए सड़क ले लो" + +#, c-format +msgid "after %i roads" +msgstr "%i के बाद सड़कों" + +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination #, c-format msgid "Turn %1$s%2$s %3$s%4$s" msgstr "" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "तो चारों ओर मोड़" + +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +msgid "Make a U-turn %1$s|left" +msgstr "चारों ओर मोड़ %1$s" + +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" +msgstr "तो चारों ओर मोड़" + +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. +#, c-format +msgid "Make a U-turn %1$s|right" +msgstr "चारों ओर मोड़ %1$s" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" +msgstr "" + +msgid "then you have reached your destination." msgstr "" +#. TRANSLATORS: the arg. is distance #, c-format msgid "You have reached your destination %s" msgstr "" -msgid "then you have reached your destination." +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" msgstr "" +msgid "Exit" +msgstr "Nikas" + #. Android resource: @strings/position_popup_title msgid "Position" msgstr "" @@ -1803,10 +1930,10 @@ msgstr "" msgid "Enter Coordinates" msgstr "" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/hr.po.in b/po/hr.po.in index e3a2980b9..d3e1bb430 100644 --- a/po/hr.po.in +++ b/po/hr.po.in @@ -6,20 +6,20 @@ # Marjan Vrban https://launchpad.net/~mvrban # gogo https://launchpad.net/~trebelnik-stefina # klajo https://launchpad.net/~klaudio - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2015-03-06 22:33+0000\n" "Last-Translator: gogo <trebelnik2@gmail.com>\n" "Language-Team: Croatian <hr@li.org>\n" +"Language: hr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " -"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"Language: hr\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -139,88 +139,188 @@ msgstr[0] "za %d kilometar" msgstr[1] "za %d kilometara" msgstr[2] "za %d kilometara" -msgid "exit" -msgstr "izlaz" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" -msgid "into the ramp" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "" + +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "na rampu" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" +msgid "%sinto %s%s%s" msgstr "%su ulicu %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" -msgstr "%su %s%s%s|male form" +msgid "%sinto %s%s%s|masculine form" +msgstr "%su %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" -msgstr "%su %s%s%s|female form" +msgid "%sinto %s%s%s|feminine form" +msgstr "%su %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" -msgstr "%su %s%s%s|neutral form" +msgid "%sinto %s%s%s|neuter form" +msgstr "%su %s%s%s" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) #, c-format msgid "%sinto the %s" msgstr "%su %s" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "desno" +msgid "When possible, please turn around" +msgstr "Ako je moguće okrenite se" -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "lijevo" +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" +msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "easily " -msgstr "jednostavno " +#, c-format +msgid "Follow the road for the next %s" +msgstr "Pratite cestu za idući %s" -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " -msgstr "teško " +msgid "Enter the roundabout soon" +msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " +#. TRANSLATORS: %s is the distance to the roundabout +#, c-format +msgid "Enter the roundabout %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" +msgstr "onda napustite kružni tok na %1$s %2$s" + +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "Leave the roundabout at the %1$s %2$s" +msgstr "Napustite kružni tok na %1$s %2$s" + +msgid "soon" +msgstr "uskoro" + +msgid "now" +msgstr "sada" + +msgid "then" +msgstr "onda" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|right" msgstr "" -msgid "When possible, please turn around" -msgstr "Ako je moguće okrenite se" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|right" +msgstr "" -msgid "Enter the roundabout soon" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|left" msgstr "" -#. TRANSLATORS: %s is the distance to the roundabout +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Enter the roundabout %s" +msgid "Merge %1$s%2$s|left" msgstr "" +msgid "on your left" +msgstr "" + +msgid "on your right" +msgstr "" + +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "then leave the roundabout at the %s" +msgid "Take exit %1$s %2$s %3$s" msgstr "" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "Leave the roundabout at the %s" +msgid "Take the exit %1$s %2$s%3$s" +msgstr "" + +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" +msgstr "" + +msgid "at exit" msgstr "" +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "Follow the road for the next %s" -msgstr "Pratite cestu za idući %s" +msgid "then continue straight%1$s" +msgstr "" -msgid "soon" -msgstr "uskoro" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep right%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep right %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "desno" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "lijevo" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "jednostavno " + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "teško " -#. TRANSLATORS: First argument is the how manieth street to take, second the direction #, c-format msgid "Take the %1$s road to the %2$s" msgstr "Vozite cestom %1$s do %2$s" @@ -229,32 +329,59 @@ msgstr "Vozite cestom %1$s do %2$s" msgid "after %i roads" msgstr "nakon %i ceste" -msgid "now" -msgstr "sada" - +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination #, c-format -msgid "then take the %1$s road to the %2$s" -msgstr "" +msgid "Turn %1$s%2$s %3$s%4$s" +msgstr "Krenite %1$s%2$s %3$s%4$s" -msgid "error" -msgstr "" +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "onda okrenite se" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "Turn %1$s%2$s %3$s%4$s" -msgstr "" +msgid "Make a U-turn %1$s|left" +msgstr "Okrenite se %1$s" + +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" +msgstr "onda okrenite se" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +msgid "Make a U-turn %1$s|right" +msgstr "Okrenite se %1$s" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" msgstr "" +msgid "then you have reached your destination." +msgstr "nakon toga ste stigli do cilja" + +#. TRANSLATORS: the arg. is distance #, c-format msgid "You have reached your destination %s" msgstr "Stigli ste na cilj %s" -msgid "then you have reached your destination." -msgstr "nakon toga ste stigli do cilja" +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "" + +msgid "Exit" +msgstr "Izlaz" #. Android resource: @strings/position_popup_title msgid "Position" @@ -1809,10 +1936,10 @@ msgstr "" msgid "Enter Coordinates" msgstr "" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/hu.po.in b/po/hu.po.in index 891ef5c22..ef830e6ad 100644 --- a/po/hu.po.in +++ b/po/hu.po.in @@ -9,19 +9,19 @@ # WintermuteHun https://launchpad.net/~wintermute-valodi # dandor https://launchpad.net/~dandorfs # kalmarzs https://launchpad.net/~kalmarzs - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2014-05-12 16:58+0000\n" "Last-Translator: György Balló <ballogyor@gmail.com>\n" "Language-Team: Hungarian <hu@li.org>\n" +"Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"Language: hu\n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -139,30 +139,53 @@ msgid_plural "in %d kilometers" msgstr[0] "egy kilométer után" msgstr[1] "%d kilométer után" -msgid "exit" -msgstr "kijárat" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" -msgid "into the ramp" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "" + +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "a felhajtóra" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" +msgid "%sinto %s%s%s" msgstr "%sa(z) %s%s%s utcába" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" +msgid "%sinto %s%s%s|masculine form" msgstr "%sa(z) %s%s%s útra" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" +msgid "%sinto %s%s%s|feminine form" msgstr "%sa(z) %s%s%s útra" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" +msgid "%sinto %s%s%s|neuter form" msgstr "%sa(z) %s%s%s útra" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) @@ -170,32 +193,17 @@ msgstr "%sa(z) %s%s%s útra" msgid "%sinto the %s" msgstr "%shajtson rá a(z) %s útra" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "jobbra" - -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "balra" - -#. TRANSLATORS: Don't forget the ending space -msgid "easily " -msgstr "enyhén " - -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " -msgstr "élesen " - -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " -msgstr "" +msgid "When possible, please turn around" +msgstr "Amint lehet, fordujon meg" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" msgstr "" -msgid "When possible, please turn around" -msgstr "Amint lehet, fordujon meg" +#, c-format +msgid "Follow the road for the next %s" +msgstr "Haladjon az úton a következő %sig" msgid "Enter the roundabout soon" msgstr "Hajtson be a körforgalomba hamarosan." @@ -205,57 +213,176 @@ msgstr "Hajtson be a körforgalomba hamarosan." msgid "Enter the roundabout %s" msgstr "Hajtson be a körforgalomba %s" +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" +msgstr "majd hagyja el a körforgalmat a(z) %1$s %2$s" + +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow #, c-format -msgid "then leave the roundabout at the %s" +msgid "Leave the roundabout at the %1$s %2$s" +msgstr "Hagyja el a körforgalmat a(z) %1$s %2$s" + +msgid "soon" +msgstr "hamarosan" + +msgid "now" +msgstr "most" + +msgid "then" +msgstr "aztán" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|right" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "Leave the roundabout at the %s" +msgid "Merge %1$s%2$s|right" msgstr "" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Follow the road for the next %s" -msgstr "Haladjon az úton a következő %sig" +msgid "then merge%1$s|left" +msgstr "" -msgid "soon" -msgstr "hamarosan" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|left" +msgstr "" + +msgid "on your left" +msgstr "" -#. TRANSLATORS: First argument is the how manieth street to take, second the direction +msgid "on your right" +msgstr "" + +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "Take the %1$s road to the %2$s" -msgstr "A(z) %1$s útnál forduljon %2$s" +msgid "Take exit %1$s %2$s %3$s" +msgstr "" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "after %i roads" -msgstr "%i út után" +msgid "Take the exit %1$s %2$s%3$s" +msgstr "" -msgid "now" -msgstr "most" +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" +msgstr "" +msgid "at exit" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "then take the %1$s road to the %2$s" +msgid "then continue straight%1$s" msgstr "" -msgid "error" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" msgstr "" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "Turn %1$s%2$s %3$s%4$s" +msgid "then keep right%1$s" msgstr "" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +msgid "Keep right %1$s%2$s%3$s" msgstr "" +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "You have reached your destination %s" -msgstr "Elérte az úticélját: %s" +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "jobbra" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "balra" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "enyhén " + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "élesen " + +#, c-format +msgid "Take the %1$s road to the %2$s" +msgstr "A(z) %1$s útnál forduljon %2$s" + +#, c-format +msgid "after %i roads" +msgstr "%i út után" + +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination +#, c-format +msgid "Turn %1$s%2$s %3$s%4$s" +msgstr "Forduljon %1$s%2$s %3$s%4$s" + +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "aztán fordujon meg" + +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. +#, c-format +msgid "Make a U-turn %1$s|left" +msgstr "Fordujon meg %1$s" + +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" +msgstr "aztán fordujon meg" + +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. +#, c-format +msgid "Make a U-turn %1$s|right" +msgstr "Fordujon meg %1$s" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" +msgstr "" msgid "then you have reached your destination." msgstr "majd eléri az úticélját." +#. TRANSLATORS: the arg. is distance +#, c-format +msgid "You have reached your destination %s" +msgstr "Elérte az úticélját: %s" + +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "" + +msgid "Exit" +msgstr "Kijárat" + #. Android resource: @strings/position_popup_title msgid "Position" msgstr "Pozíció" @@ -1811,10 +1938,10 @@ msgstr "Útvonalpontok" msgid "Enter Coordinates" msgstr "Koordináták megadása" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/id.po.in b/po/id.po.in index baa203780..ff4f490c9 100644 --- a/po/id.po.in +++ b/po/id.po.in @@ -6,19 +6,19 @@ # KaZeR https://launchpad.net/~kazer # M Bambang I https://launchpad.net/~mbi-lawang # Steve Kartantya https://launchpad.net/~jack-haz - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2013-09-28 01:43+0000\n" "Last-Translator: KaZeR <Unknown>\n" "Language-Team: Indonesian <id@li.org>\n" +"Language: id\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"Language: id\n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -135,30 +135,53 @@ msgid "in one kilometer" msgid_plural "in %d kilometers" msgstr[0] "dalam %d kilometer" -msgid "exit" -msgstr "keluar" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" -msgid "into the ramp" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "" + +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "menuju jalur yang melandai" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" -msgstr "%s menuju jalan %s%s%s" +msgid "%sinto %s%s%s" +msgstr "%smenuju ke %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" -msgstr "%smenuju ke%s%s%s" +msgid "%sinto %s%s%s|masculine form" +msgstr "%smenuju ke %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" +msgid "%sinto %s%s%s|feminine form" msgstr "%smenuju ke %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" +msgid "%sinto %s%s%s|neuter form" msgstr "%smenuju ke %s%s%s" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) @@ -166,57 +189,134 @@ msgstr "%smenuju ke %s%s%s" msgid "%sinto the %s" msgstr "%smenuju ke %s" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "kanan" +msgid "When possible, please turn around" +msgstr "Bila memungkinkan, balik arah" -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "Kiri" +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" +msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "easily " -msgstr "dengan mudah " +#, c-format +msgid "Follow the road for the next %s" +msgstr "ikuti jalan untuk ke tujuan berikutnya %s" -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " -msgstr "Sangat " +msgid "Enter the roundabout soon" +msgstr "segera memasuki bundaran" -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " +#. TRANSLATORS: %s is the distance to the roundabout +#, c-format +msgid "Enter the roundabout %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" +msgstr "kemudian tinggalkan bundaran pada %1$s %2$s" + +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "Leave the roundabout at the %1$s %2$s" +msgstr "Tinggalkan bundaran pada %1$s %2$s" + +msgid "soon" +msgstr "segera" + +msgid "now" +msgstr "saat ini" + +msgid "then" +msgstr "kemudian" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|right" msgstr "" -msgid "When possible, please turn around" -msgstr "bila memungkinkan, balik arah" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|right" +msgstr "" -msgid "Enter the roundabout soon" -msgstr "segera memasuki bundaran" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|left" +msgstr "" -#. TRANSLATORS: %s is the distance to the roundabout +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Enter the roundabout %s" +msgid "Merge %1$s%2$s|left" +msgstr "" + +msgid "on your left" msgstr "" +msgid "on your right" +msgstr "" + +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "then leave the roundabout at the %s" +msgid "Take exit %1$s %2$s %3$s" msgstr "" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "Leave the roundabout at the %s" +msgid "Take the exit %1$s %2$s%3$s" +msgstr "" + +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" msgstr "" +msgid "at exit" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "Follow the road for the next %s" -msgstr "ikuti jalan untuk ke tujuan berikutnya %s" +msgid "then continue straight%1$s" +msgstr "" -msgid "soon" -msgstr "segera" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep right%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep right %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "kanan" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "Kiri" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "dengan mudah " + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "Sangat " -#. TRANSLATORS: First argument is the how manieth street to take, second the direction #, c-format msgid "Take the %1$s road to the %2$s" msgstr "Ambil %1$s jalan ke %2$s" @@ -225,32 +325,59 @@ msgstr "Ambil %1$s jalan ke %2$s" msgid "after %i roads" msgstr "setelah %i jalan" -msgid "now" -msgstr "saat ini" - +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination #, c-format -msgid "then take the %1$s road to the %2$s" -msgstr "" +msgid "Turn %1$s%2$s %3$s%4$s" +msgstr "Beloklah %1$s%2$s %3$s%4$s" -msgid "error" -msgstr "" +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "kemudian balik arah" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "Turn %1$s%2$s %3$s%4$s" -msgstr "" +msgid "Make a U-turn %1$s|left" +msgstr "Balik arah %1$s" + +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" +msgstr "kemudian balik arah" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +msgid "Make a U-turn %1$s|right" +msgstr "Balik arah %1$s" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" msgstr "" +msgid "then you have reached your destination." +msgstr "kini anda telah sampai pada tujuan" + +#. TRANSLATORS: the arg. is distance #, c-format msgid "You have reached your destination %s" msgstr "anda telah sampai pada tujuan %s" -msgid "then you have reached your destination." -msgstr "kini anda telah sampai pada tujuan" +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "" + +msgid "Exit" +msgstr "Keluar" #. Android resource: @strings/position_popup_title msgid "Position" @@ -1805,10 +1932,10 @@ msgstr "" msgid "Enter Coordinates" msgstr "" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/it.po.in b/po/it.po.in index 0970b1e38..8fd8f6186 100644 --- a/po/it.po.in +++ b/po/it.po.in @@ -18,19 +18,19 @@ # giardia https://launchpad.net/~fabriziosm # jackyes https://launchpad.net/~jackthebest # tomas https://launchpad.net/~tracks-tomyt - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2014-11-15 00:53+0000\n" "Last-Translator: giardia <Unknown>\n" "Language-Team: Italiano\n" +"Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"Language: \n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -148,30 +148,53 @@ msgid_plural "in %d kilometers" msgstr[0] "tra un chilometro" msgstr[1] "tra %d chilometri" -msgid "exit" -msgstr "uscire" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "%1$ssulla %2$s%3$s%4$s" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "%1$ssulla strada %2$s" -msgid "into the ramp" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "%1$ssul %2$s" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "%1$ssulla %2$s" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "%1$ssulla strada %2$s" + +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "nella rampa" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" +msgid "%sinto %s%s%s" msgstr "%sin %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" +msgid "%sinto %s%s%s|masculine form" msgstr "%sin %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" +msgid "%sinto %s%s%s|feminine form" msgstr "%sin %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" +msgid "%sinto %s%s%s|neuter form" msgstr "%sin %s%s%s" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) @@ -179,33 +202,18 @@ msgstr "%sin %s%s%s" msgid "%sinto the %s" msgstr "%sin %s" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "destra" - -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "sinistra" - -#. TRANSLATORS: Don't forget the ending space -msgid "easily " -msgstr "leggermente " - -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " -msgstr "decisamente " - -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " -msgstr "" - -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " -msgstr "" - msgid "When possible, please turn around" msgstr "Appena possibile, invertire il senso di marcia" +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" +msgstr "verso %s" + +#, c-format +msgid "Follow the road for the next %s" +msgstr "Seguire la strada per i prossimi %s" + msgid "Enter the roundabout soon" msgstr "Tra poco si entrerà in rotonda" @@ -214,22 +222,114 @@ msgstr "Tra poco si entrerà in rotonda" msgid "Enter the roundabout %s" msgstr "Imboccare la rotonda %s" +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow #, c-format -msgid "then leave the roundabout at the %s" -msgstr "" - -#, c-format -msgid "Leave the roundabout at the %s" -msgstr "" +msgid "then leave the roundabout at the %1$s %2$s" +msgstr "e alla rotonda prendere la %1$s %2$s" +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow #, c-format -msgid "Follow the road for the next %s" -msgstr "Seguire la strada per i prossimi %s" +msgid "Leave the roundabout at the %1$s %2$s" +msgstr "Alla rotonda prendere la %1$s %2$s" msgid "soon" msgstr "tra poco" -#. TRANSLATORS: First argument is the how manieth street to take, second the direction +msgid "now" +msgstr "adesso" + +msgid "then" +msgstr "poi" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|right" +msgstr "poi entrare%1$s" + +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|right" +msgstr "Entrare %1$s%2$s" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|left" +msgstr "poi entrare%1$s" + +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|left" +msgstr "Entrare %1$s%2$s" + +msgid "on your left" +msgstr "a sinistra" + +msgid "on your right" +msgstr "a destra" + +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance +#, c-format +msgid "Take exit %1$s %2$s %3$s" +msgstr "Prendere l'uscita %1$s %2$s %3$s" + +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination +#, c-format +msgid "Take the exit %1$s %2$s%3$s" +msgstr "Prendere l'uscita %1$s %2$s%3$s" + +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" +msgstr "all'intersezione" + +msgid "at exit" +msgstr "all'uscita" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then continue straight%1$s" +msgstr "poi procedere dritto%1$s" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" +msgstr "Procedere dritto %1$s%2$s%3$s" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep right%1$s" +msgstr "poi tenere la destra%1$s" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep right %1$s%2$s%3$s" +msgstr "Tenere la destra %1$s%2$s%3$s" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep left%1$s" +msgstr "poi tenere la sinistra%1$s" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "Tenere la sinistra %1$s%2$s%3$s" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "destra" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "sinistra" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "leggermente " + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "decisamente " + #, c-format msgid "Take the %1$s road to the %2$s" msgstr "Prendere la %1$s strada a %2$s" @@ -238,32 +338,59 @@ msgstr "Prendere la %1$s strada a %2$s" msgid "after %i roads" msgstr "tra %i strade" -msgid "now" -msgstr "adesso" - +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination #, c-format -msgid "then take the %1$s road to the %2$s" -msgstr "" +msgid "Turn %1$s%2$s %3$s%4$s" +msgstr "Svoltare %1$s %2$s %3$s %4$s" -msgid "error" -msgstr "" +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "poi invertire il senso di marcia" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "Turn %1$s%2$s %3$s%4$s" -msgstr "" +msgid "Make a U-turn %1$s|left" +msgstr "Invertire il senso di marcia %1$s" + +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" +msgstr "poi invertire il senso di marcia" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" -msgstr "" +msgid "Make a U-turn %1$s|right" +msgstr "Invertire il senso di marcia %1$s" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" +msgstr "seguire" +msgid "then you have reached your destination." +msgstr "poi sarete arrivati a destinazione" + +#. TRANSLATORS: the arg. is distance #, c-format msgid "You have reached your destination %s" msgstr "Siete arrivati a destinazione %s" -msgid "then you have reached your destination." -msgstr "poi sarete arrivati a destinazione" +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "Intersezione" + +msgid "Exit" +msgstr "Uscita" #. Android resource: @strings/position_popup_title msgid "Position" @@ -1470,10 +1597,10 @@ msgid "Opens address search dialog" msgstr "Apri la finestra di ricerca indirizzo" msgid "_POI search" -msgstr "_ricerca POI" +msgstr "_Ricerca POI" msgid "Opens POI search dialog" -msgstr "Apre finestra di ricerca POI" +msgstr "Apri la finestra di ricerca POI" msgid "_Stop Navigation" msgstr "Interrompi la navigazione" @@ -1546,7 +1673,7 @@ msgid "Cinema" msgstr "Cinema" msgid "Train station" -msgstr "Stazione del treno" +msgstr "Stazione ferroviaria" msgid "School" msgstr "Scuola" @@ -1583,16 +1710,16 @@ msgid "Set next visit to %ld, %ld \n" msgstr "Imposta la prossima tappa a %ld, %ld \n" msgid "POI search" -msgstr "ricerca POI" +msgstr "Ricerca POI" msgid "Select a category" -msgstr "Seleziona una categoria" +msgstr "Selezionare una categoria" msgid "Select a distance to look for (km)" -msgstr "Seleziona la distanza in cui cercare (km)" +msgstr "Selezionare la distanza in cui cercare (km)" msgid "Select a POI" -msgstr "Seleziona un POI" +msgstr "Selezionare un POI" msgid " " msgstr " " @@ -1604,7 +1731,7 @@ msgid "Direction" msgstr "Direzione" msgid "Distance(m)" -msgstr "Distanza(m)" +msgstr "Distanza (m)" msgid "Name" msgstr "Nome" @@ -1822,10 +1949,10 @@ msgstr "Waypoints" msgid "Enter Coordinates" msgstr "Inserire Coordinate" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" @@ -1938,7 +2065,7 @@ msgid "" msgstr "" msgid "Cancel" -msgstr "Cancella" +msgstr "Annulla" msgid "filenamePath" msgstr "" @@ -2377,8 +2504,8 @@ msgid "" "Former\n" "Destinations" msgstr "" -"Precedenti\n" -"Destinazioni" +"Destinazioni\n" +"precedenti" msgid "Coordinates" msgstr "Coordinate" @@ -2495,7 +2622,7 @@ msgstr "Scarica mappe" #. Android resource: @strings/optionsmenu_toggle_poi msgid "Toggle POIs" -msgstr "Attiva/Disattiva Punti Di Interesse" +msgstr "Mostra/nascondi POI" #. Android resource: @strings/optionsmenu_exit_navit msgid "Exit Navit" diff --git a/po/ja.po.in b/po/ja.po.in index 4055f7f42..f8af5015d 100644 --- a/po/ja.po.in +++ b/po/ja.po.in @@ -4,19 +4,19 @@ # Many thanks to the contributors of this translation: # KaZeR https://launchpad.net/~kazer # MontBlanc https://launchpad.net/~osm-gatinho - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2013-09-28 01:43+0000\n" "Last-Translator: KaZeR <Unknown>\n" "Language-Team: Japanese <ja@li.org>\n" +"Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"Language: ja\n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -134,30 +134,53 @@ msgid_plural "in %d kilometers" msgstr[0] "" msgstr[1] "" -msgid "exit" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" msgstr "" -msgid "into the ramp" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "" + +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" +msgid "%sinto %s%s%s" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" +msgid "%sinto %s%s%s|masculine form" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" +msgid "%sinto %s%s%s|feminine form" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" +msgid "%sinto %s%s%s|neuter form" msgstr "" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) @@ -165,90 +188,194 @@ msgstr "" msgid "%sinto the %s" msgstr "" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "右" +msgid "When possible, please turn around" +msgstr "" -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "左" +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" +msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "easily " +#, c-format +msgid "Follow the road for the next %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " +msgid "Enter the roundabout soon" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " +#. TRANSLATORS: %s is the distance to the roundabout +#, c-format +msgid "Enter the roundabout %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" msgstr "" -msgid "When possible, please turn around" +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "Leave the roundabout at the %1$s %2$s" msgstr "" -msgid "Enter the roundabout soon" +msgid "soon" +msgstr "まもなく" + +msgid "now" +msgstr "今" + +msgid "then" msgstr "" -#. TRANSLATORS: %s is the distance to the roundabout +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "Enter the roundabout %s" +msgid "then merge%1$s|right" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "then leave the roundabout at the %s" +msgid "Merge %1$s%2$s|right" msgstr "" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Leave the roundabout at the %s" +msgid "then merge%1$s|left" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Follow the road for the next %s" +msgid "Merge %1$s%2$s|left" msgstr "" -msgid "soon" -msgstr "まもなく" +msgid "on your left" +msgstr "" + +msgid "on your right" +msgstr "" -#. TRANSLATORS: First argument is the how manieth street to take, second the direction +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "Take the %1$s road to the %2$s" +msgid "Take exit %1$s %2$s %3$s" msgstr "" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "after %i roads" +msgid "Take the exit %1$s %2$s%3$s" msgstr "" -msgid "now" -msgstr "今" +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" +msgstr "" + +msgid "at exit" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then continue straight%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep right%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep right %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "右" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "左" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "" + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "" #, c-format -msgid "then take the %1$s road to the %2$s" +msgid "Take the %1$s road to the %2$s" msgstr "" -msgid "error" +#, c-format +msgid "after %i roads" msgstr "" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination #, c-format msgid "Turn %1$s%2$s %3$s%4$s" msgstr "" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "" + +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +msgid "Make a U-turn %1$s|left" msgstr "" +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" +msgstr "" + +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. +#, c-format +msgid "Make a U-turn %1$s|right" +msgstr "" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" +msgstr "" + +msgid "then you have reached your destination." +msgstr "" + +#. TRANSLATORS: the arg. is distance #, c-format msgid "You have reached your destination %s" msgstr "目的地の%sにつきました" -msgid "then you have reached your destination." +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "" + +msgid "Exit" msgstr "" #. Android resource: @strings/position_popup_title @@ -1804,10 +1931,10 @@ msgstr "" msgid "Enter Coordinates" msgstr "" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/jv.po.in b/po/jv.po.in index 168abde6b..e7edaa51c 100644 --- a/po/jv.po.in +++ b/po/jv.po.in @@ -3,27 +3,21 @@ # This file is distributed under the same license as the navit package. # Many thanks to the contributors of this translation: # Leonardus Priyo Handono https://launchpad.net/~leonardus-ymail - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2013-09-28 01:43+0000\n" "Last-Translator: KaZeR <Unknown>\n" "Language-Team: Javanese <jv@li.org>\n" +"Language: jv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 0;\n" -"Language: jv\n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" -msgid "exit" -msgstr "metu" - -msgid "now" -msgstr "saiki" - msgid "Running from source directory\n" msgstr "" @@ -139,85 +133,188 @@ msgid_plural "in %d kilometers" msgstr[0] "" msgstr[1] "ing %d kilometer" -msgid "into the ramp" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "" + +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" +msgid "%sinto %s%s%s" msgstr "%s ing dalan %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" +msgid "%sinto %s%s%s|masculine form" msgstr "%s ing dalan %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" +msgid "%sinto %s%s%s|feminine form" msgstr "%s ing dalan %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" +msgid "%sinto %s%s%s|neuter form" msgstr "%s ing dalan %s%s%s" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) #, c-format msgid "%sinto the %s" -msgstr "%s ing dalan %s" +msgstr "%sing dalan %s" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "nengen" +msgid "When possible, please turn around" +msgstr "Yen biso, mutero" -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "ngiwa" +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" +msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "easily " -msgstr "kanthi gampang " +#, c-format +msgid "Follow the road for the next %s" +msgstr "Tetep ing dalan iki nganti %s" -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " +msgid "Enter the roundabout soon" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " +#. TRANSLATORS: %s is the distance to the roundabout +#, c-format +msgid "Enter the roundabout %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" +msgstr "terus metu soko puteran ing cawang kaping %1$s %2$s" + +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "Leave the roundabout at the %1$s %2$s" +msgstr "Metu soko puteran ing cawang kaping %1$s %2$s" + +msgid "soon" +msgstr "sedhelo maneh" + +msgid "now" +msgstr "saiki" + +msgid "then" +msgstr "terus" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|right" msgstr "" -msgid "When possible, please turn around" -msgstr "Yen biso, mutero" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|right" +msgstr "" -msgid "Enter the roundabout soon" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|left" msgstr "" -#. TRANSLATORS: %s is the distance to the roundabout +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Enter the roundabout %s" +msgid "Merge %1$s%2$s|left" +msgstr "" + +msgid "on your left" +msgstr "" + +msgid "on your right" msgstr "" +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "then leave the roundabout at the %s" +msgid "Take exit %1$s %2$s %3$s" msgstr "" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "Leave the roundabout at the %s" +msgid "Take the exit %1$s %2$s%3$s" +msgstr "" + +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" msgstr "" +msgid "at exit" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "Follow the road for the next %s" -msgstr "tetep ing dalan iki nganti %s" +msgid "then continue straight%1$s" +msgstr "" -msgid "soon" -msgstr "sedhelo maneh" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep right%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep right %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "nengen" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "ngiwa" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "kanthi gampang " + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "" -#. TRANSLATORS: First argument is the how manieth street to take, second the direction #, c-format msgid "Take the %1$s road to the %2$s" msgstr "Jupuk dalan kaping %1$s ing %2$s" @@ -226,30 +323,60 @@ msgstr "Jupuk dalan kaping %1$s ing %2$s" msgid "after %i roads" msgstr "sakwise %i dalan" +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination #, c-format -msgid "then take the %1$s road to the %2$s" +msgid "Turn %1$s%2$s %3$s%4$s" msgstr "" -msgid "error" +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" msgstr "" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "Turn %1$s%2$s %3$s%4$s" +msgid "Make a U-turn %1$s|left" msgstr "" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination -#, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" msgstr "" +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "You have reached your destination %s" +msgid "Make a U-turn %1$s|right" +msgstr "" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" msgstr "" msgid "then you have reached your destination." msgstr "terus panjenengan tekan tujuan" +#. TRANSLATORS: the arg. is distance +#, c-format +msgid "You have reached your destination %s" +msgstr "" + +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "" + +msgid "Exit" +msgstr "Metu" + #. Android resource: @strings/position_popup_title msgid "Position" msgstr "dunung" @@ -1803,10 +1930,10 @@ msgstr "" msgid "Enter Coordinates" msgstr "" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/kk.po.in b/po/kk.po.in index c05ead996..4909a444e 100644 --- a/po/kk.po.in +++ b/po/kk.po.in @@ -2,19 +2,19 @@ # Copyright (C) 2006-2014 The Navit Team # This file is distributed under the same license as the navit package. # Many thanks to the contributors of this translation: - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2010-02-24 19:32+0000\n" "Last-Translator: \n" "Language-Team: Kazakh <kk@li.org>\n" +"Language: kk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"Language: kk\n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -132,30 +132,53 @@ msgid_plural "in %d kilometers" msgstr[0] "" msgstr[1] "" -msgid "exit" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" msgstr "" -msgid "into the ramp" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "" + +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" +msgid "%sinto %s%s%s" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" +msgid "%sinto %s%s%s|masculine form" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" +msgid "%sinto %s%s%s|feminine form" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" +msgid "%sinto %s%s%s|neuter form" msgstr "" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) @@ -163,90 +186,194 @@ msgstr "" msgid "%sinto the %s" msgstr "" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" +msgid "When possible, please turn around" msgstr "" -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "easily " +#, c-format +msgid "Follow the road for the next %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " +msgid "Enter the roundabout soon" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " +#. TRANSLATORS: %s is the distance to the roundabout +#, c-format +msgid "Enter the roundabout %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" msgstr "" -msgid "When possible, please turn around" +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "Leave the roundabout at the %1$s %2$s" msgstr "" -msgid "Enter the roundabout soon" +msgid "soon" msgstr "" -#. TRANSLATORS: %s is the distance to the roundabout +msgid "now" +msgstr "" + +msgid "then" +msgstr "" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "Enter the roundabout %s" +msgid "then merge%1$s|right" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "then leave the roundabout at the %s" +msgid "Merge %1$s%2$s|right" msgstr "" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Leave the roundabout at the %s" +msgid "then merge%1$s|left" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Follow the road for the next %s" +msgid "Merge %1$s%2$s|left" msgstr "" -msgid "soon" +msgid "on your left" +msgstr "" + +msgid "on your right" msgstr "" -#. TRANSLATORS: First argument is the how manieth street to take, second the direction +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "Take the %1$s road to the %2$s" +msgid "Take exit %1$s %2$s %3$s" msgstr "" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "after %i roads" +msgid "Take the exit %1$s %2$s%3$s" msgstr "" -msgid "now" +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" +msgstr "" + +msgid "at exit" msgstr "" +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "then take the %1$s road to the %2$s" +msgid "then continue straight%1$s" msgstr "" -msgid "error" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep right%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep right %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "" + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "" + +#, c-format +msgid "Take the %1$s road to the %2$s" +msgstr "" + +#, c-format +msgid "after %i roads" msgstr "" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination #, c-format msgid "Turn %1$s%2$s %3$s%4$s" msgstr "" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "" + +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. +#, c-format +msgid "Make a U-turn %1$s|left" +msgstr "" + +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" +msgstr "" + +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +msgid "Make a U-turn %1$s|right" +msgstr "" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" msgstr "" +msgid "then you have reached your destination." +msgstr "" + +#. TRANSLATORS: the arg. is distance #, c-format msgid "You have reached your destination %s" msgstr "" -msgid "then you have reached your destination." +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "" + +msgid "Exit" msgstr "" #. Android resource: @strings/position_popup_title @@ -1802,10 +1929,10 @@ msgstr "" msgid "Enter Coordinates" msgstr "" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/kn.po.in b/po/kn.po.in index 6dab7049a..fc338b9b1 100644 --- a/po/kn.po.in +++ b/po/kn.po.in @@ -3,19 +3,19 @@ # This file is distributed under the same license as the navit package. # Many thanks to the contributors of this translation: # Mahesh Venom https://launchpad.net/~mahesh-venom-73 - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2014-06-21 16:42+0000\n" "Last-Translator: Mahesh Venom <mahesh.venom.73@gmail.com>\n" "Language-Team: Kannada <kn@li.org>\n" +"Language: kn\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"Language: kn\n" msgid "Running from source directory\n" msgstr "" @@ -132,30 +132,53 @@ msgid_plural "in %d kilometers" msgstr[0] "" msgstr[1] "" -msgid "exit" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" msgstr "" -msgid "into the ramp" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "" + +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" +msgid "%sinto %s%s%s" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" +msgid "%sinto %s%s%s|masculine form" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" +msgid "%sinto %s%s%s|feminine form" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" +msgid "%sinto %s%s%s|neuter form" msgstr "" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) @@ -163,90 +186,194 @@ msgstr "" msgid "%sinto the %s" msgstr "" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" +msgid "When possible, please turn around" msgstr "" -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "easily " +#, c-format +msgid "Follow the road for the next %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " +msgid "Enter the roundabout soon" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " +#. TRANSLATORS: %s is the distance to the roundabout +#, c-format +msgid "Enter the roundabout %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" msgstr "" -msgid "When possible, please turn around" +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "Leave the roundabout at the %1$s %2$s" msgstr "" -msgid "Enter the roundabout soon" +msgid "soon" msgstr "" -#. TRANSLATORS: %s is the distance to the roundabout +msgid "now" +msgstr "" + +msgid "then" +msgstr "" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "Enter the roundabout %s" +msgid "then merge%1$s|right" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "then leave the roundabout at the %s" +msgid "Merge %1$s%2$s|right" msgstr "" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Leave the roundabout at the %s" +msgid "then merge%1$s|left" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Follow the road for the next %s" +msgid "Merge %1$s%2$s|left" msgstr "" -msgid "soon" +msgid "on your left" +msgstr "" + +msgid "on your right" msgstr "" -#. TRANSLATORS: First argument is the how manieth street to take, second the direction +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "Take the %1$s road to the %2$s" +msgid "Take exit %1$s %2$s %3$s" msgstr "" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "after %i roads" +msgid "Take the exit %1$s %2$s%3$s" msgstr "" -msgid "now" +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" +msgstr "" + +msgid "at exit" msgstr "" +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "then take the %1$s road to the %2$s" +msgid "then continue straight%1$s" msgstr "" -msgid "error" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep right%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep right %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "" + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "" + +#, c-format +msgid "Take the %1$s road to the %2$s" +msgstr "" + +#, c-format +msgid "after %i roads" msgstr "" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination #, c-format msgid "Turn %1$s%2$s %3$s%4$s" msgstr "" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "" + +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. +#, c-format +msgid "Make a U-turn %1$s|left" +msgstr "" + +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" +msgstr "" + +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +msgid "Make a U-turn %1$s|right" +msgstr "" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" msgstr "" +msgid "then you have reached your destination." +msgstr "" + +#. TRANSLATORS: the arg. is distance #, c-format msgid "You have reached your destination %s" msgstr "" -msgid "then you have reached your destination." +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "" + +msgid "Exit" msgstr "" #. Android resource: @strings/position_popup_title @@ -1802,10 +1929,10 @@ msgstr "" msgid "Enter Coordinates" msgstr "" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/ko.po.in b/po/ko.po.in index f2daa3502..97bb5cda1 100644 --- a/po/ko.po.in +++ b/po/ko.po.in @@ -3,14 +3,15 @@ # This file is distributed under the same license as the navit package. # Many thanks to the contributors of this translation: # Seungjun, Lee https://launchpad.net/~cybercorean - msgid "" msgstr "" -"Project-Id-Version: navit\n" -"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" +"Project-Id-Version: navit 0.5.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2015-04-03 14:35+0000\n" "Last-Translator: Seungjun, Lee <cybercorean@gmail.com>\n" "Language-Team: Korean <ko@li.org>\n" +"Language: ko\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -127,30 +128,53 @@ msgid "in one kilometer" msgid_plural "in %d kilometers" msgstr[0] "%d 킬로미터 후에" -msgid "exit" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" msgstr "" -msgid "into the ramp" +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" +msgid "%sinto %s%s%s" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" +msgid "%sinto %s%s%s|masculine form" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" +msgid "%sinto %s%s%s|feminine form" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" +msgid "%sinto %s%s%s|neuter form" msgstr "" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) @@ -158,92 +182,196 @@ msgstr "" msgid "%sinto the %s" msgstr "" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" +msgid "When possible, please turn around" msgstr "" -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "easily " +#, c-format +msgid "Follow the road for the next %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " +msgid "Enter the roundabout soon" +msgstr "" + +#. TRANSLATORS: %s is the distance to the roundabout +#, c-format +msgid "Enter the roundabout %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "Leave the roundabout at the %1$s %2$s" msgstr "" -msgid "When possible, please turn around" +msgid "soon" msgstr "" -msgid "Enter the roundabout soon" +msgid "now" msgstr "" -#. TRANSLATORS: %s is the distance to the roundabout +msgid "then" +msgstr "" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "Enter the roundabout %s" +msgid "then merge%1$s|right" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "then leave the roundabout at the %s" +msgid "Merge %1$s%2$s|right" msgstr "" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Leave the roundabout at the %s" +msgid "then merge%1$s|left" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Follow the road for the next %s" +msgid "Merge %1$s%2$s|left" msgstr "" -msgid "soon" +msgid "on your left" +msgstr "" + +msgid "on your right" msgstr "" -#. TRANSLATORS: First argument is the how manieth street to take, second the direction +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "Take the %1$s road to the %2$s" +msgid "Take exit %1$s %2$s %3$s" msgstr "" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "after %i roads" +msgid "Take the exit %1$s %2$s%3$s" msgstr "" -msgid "now" +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" msgstr "" +msgid "at exit" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "then take the %1$s road to the %2$s" +msgid "then continue straight%1$s" msgstr "" -msgid "error" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" msgstr "" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep right%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep right %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "" + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "" + +#, c-format +msgid "Take the %1$s road to the %2$s" +msgstr "" + +#, c-format +msgid "after %i roads" +msgstr "" + +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination #, c-format msgid "Turn %1$s%2$s %3$s%4$s" msgstr "" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "" + +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +msgid "Make a U-turn %1$s|left" +msgstr "" + +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" msgstr "" +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "You have reached your destination %s" +msgid "Make a U-turn %1$s|right" +msgstr "" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" msgstr "" msgid "then you have reached your destination." msgstr "" +#. TRANSLATORS: the arg. is distance +#, c-format +msgid "You have reached your destination %s" +msgstr "" + +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "" + +msgid "Exit" +msgstr "" + #. Android resource: @strings/position_popup_title msgid "Position" msgstr "" @@ -1797,10 +1925,10 @@ msgstr "" msgid "Enter Coordinates" msgstr "" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/ku.po.in b/po/ku.po.in index e6b942a76..842f62b1d 100644 --- a/po/ku.po.in +++ b/po/ku.po.in @@ -3,19 +3,19 @@ # This file is distributed under the same license as the navit package. # Many thanks to the contributors of this translation: # kosar https://launchpad.net/~kosar-belana - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2013-06-22 22:57+0000\n" "Last-Translator: kosar <kosar.belana@gmail.com>\n" "Language-Team: Kurdish <ku@li.org>\n" +"Language: ku\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"Language: ku\n" msgid "Running from source directory\n" msgstr "" @@ -132,30 +132,53 @@ msgid_plural "in %d kilometers" msgstr[0] "" msgstr[1] "" -msgid "exit" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" msgstr "" -msgid "into the ramp" +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" +msgid "%sinto %s%s%s" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" +msgid "%sinto %s%s%s|masculine form" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" +msgid "%sinto %s%s%s|feminine form" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" +msgid "%sinto %s%s%s|neuter form" msgstr "" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) @@ -163,92 +186,196 @@ msgstr "" msgid "%sinto the %s" msgstr "" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "ڕاست" +msgid "When possible, please turn around" +msgstr "" -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "چەپ" +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" +msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "easily " +#, c-format +msgid "Follow the road for the next %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " +msgid "Enter the roundabout soon" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " +#. TRANSLATORS: %s is the distance to the roundabout +#, c-format +msgid "Enter the roundabout %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" msgstr "" -msgid "When possible, please turn around" +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "Leave the roundabout at the %1$s %2$s" msgstr "" -msgid "Enter the roundabout soon" +msgid "soon" msgstr "" -#. TRANSLATORS: %s is the distance to the roundabout +msgid "now" +msgstr "ئێستا" + +msgid "then" +msgstr "" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "Enter the roundabout %s" +msgid "then merge%1$s|right" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "then leave the roundabout at the %s" +msgid "Merge %1$s%2$s|right" msgstr "" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Leave the roundabout at the %s" +msgid "then merge%1$s|left" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Follow the road for the next %s" +msgid "Merge %1$s%2$s|left" msgstr "" -msgid "soon" +msgid "on your left" msgstr "" -#. TRANSLATORS: First argument is the how manieth street to take, second the direction +msgid "on your right" +msgstr "" + +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "Take the %1$s road to the %2$s" +msgid "Take exit %1$s %2$s %3$s" msgstr "" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "after %i roads" +msgid "Take the exit %1$s %2$s%3$s" msgstr "" -msgid "now" -msgstr "ئێستا" +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" +msgstr "" + +msgid "at exit" +msgstr "" +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "then take the %1$s road to the %2$s" +msgid "then continue straight%1$s" msgstr "" -msgid "error" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep right%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep right %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep left%1$s" msgstr "" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "ڕاست" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "چەپ" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "" + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "" + +#, c-format +msgid "Take the %1$s road to the %2$s" +msgstr "" + +#, c-format +msgid "after %i roads" +msgstr "" + +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination #, c-format msgid "Turn %1$s%2$s %3$s%4$s" msgstr "" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "" + +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +msgid "Make a U-turn %1$s|left" msgstr "" +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" +msgstr "" + +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "You have reached your destination %s" +msgid "Make a U-turn %1$s|right" +msgstr "" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" msgstr "" msgid "then you have reached your destination." msgstr "" +#. TRANSLATORS: the arg. is distance +#, c-format +msgid "You have reached your destination %s" +msgstr "" + +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "" + +msgid "Exit" +msgstr "" + #. Android resource: @strings/position_popup_title msgid "Position" msgstr "" @@ -1802,10 +1929,10 @@ msgstr "" msgid "Enter Coordinates" msgstr "" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/lb.po.in b/po/lb.po.in index 38c40d506..00e4513e5 100644 --- a/po/lb.po.in +++ b/po/lb.po.in @@ -3,19 +3,19 @@ # This file is distributed under the same license as the navit package. # Many thanks to the contributors of this translation: # Kevin G https://launchpad.net/~kev912002 - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2011-09-29 17:56+0000\n" "Last-Translator: Kevin G <Unknown>\n" "Language-Team: Luxembourgish <lb@li.org>\n" +"Language: lb\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"Language: \n" msgid "Running from source directory\n" msgstr "Aus dem Quellverzeechnis starten\n" @@ -132,123 +132,250 @@ msgid_plural "in %d kilometers" msgstr[0] "An engem Kilometer" msgstr[1] "An %d Kilometer" -msgid "exit" -msgstr "Verlossen" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "%1$sop d' %2$s%3$s%4$s" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "%1$sop d' Stross %2$s" -msgid "into the ramp" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "%1$sop den %2$s" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "%1$sop d' %2$s" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "%1$sop d' %2$s" + +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "op d' Opfahrt" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" +msgid "%sinto %s%s%s" msgstr "%sop d' Stross %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" +msgid "%sinto %s%s%s|masculine form" msgstr "%sop den %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" +msgid "%sinto %s%s%s|feminine form" msgstr "%sop d' %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" -msgstr "" +msgid "%sinto %s%s%s|neuter form" +msgstr "%sop d' %s%s%s" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) #, c-format msgid "%sinto the %s" msgstr "%sop d' %s" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "riets" +msgid "When possible, please turn around" +msgstr "Wann meiglech, wannechglift dreinen" -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "lenks" +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" +msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "easily " -msgstr "liicht " +#, c-format +msgid "Follow the road for the next %s" +msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " -msgstr "schaarf " +msgid "Enter the roundabout soon" +msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " +#. TRANSLATORS: %s is the distance to the roundabout +#, c-format +msgid "Enter the roundabout %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" msgstr "" -msgid "When possible, please turn around" -msgstr "Wann meiglech, wannechglift dreinen" +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "Leave the roundabout at the %1$s %2$s" +msgstr "" -msgid "Enter the roundabout soon" +msgid "soon" msgstr "" -#. TRANSLATORS: %s is the distance to the roundabout +msgid "now" +msgstr "" + +msgid "then" +msgstr "" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "Enter the roundabout %s" +msgid "then merge%1$s|right" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "then leave the roundabout at the %s" +msgid "Merge %1$s%2$s|right" msgstr "" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Leave the roundabout at the %s" +msgid "then merge%1$s|left" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Follow the road for the next %s" +msgid "Merge %1$s%2$s|left" msgstr "" -msgid "soon" +msgid "on your left" +msgstr "" + +msgid "on your right" msgstr "" -#. TRANSLATORS: First argument is the how manieth street to take, second the direction +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "Take the %1$s road to the %2$s" +msgid "Take exit %1$s %2$s %3$s" msgstr "" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "after %i roads" +msgid "Take the exit %1$s %2$s%3$s" msgstr "" -msgid "now" +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" msgstr "" +msgid "at exit" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "then take the %1$s road to the %2$s" +msgid "then continue straight%1$s" msgstr "" -msgid "error" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep right%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep right %1$s%2$s%3$s" msgstr "" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "riets" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "lenks" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "liicht " + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "schaarf " + +#, c-format +msgid "Take the %1$s road to the %2$s" +msgstr "" + +#, c-format +msgid "after %i roads" +msgstr "" + +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination #, c-format msgid "Turn %1$s%2$s %3$s%4$s" msgstr "" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "" + +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +msgid "Make a U-turn %1$s|left" +msgstr "Dreinen %1$s" + +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" msgstr "" +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "You have reached your destination %s" +msgid "Make a U-turn %1$s|right" +msgstr "Dreinen %1$s" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" msgstr "" msgid "then you have reached your destination." msgstr "" +#. TRANSLATORS: the arg. is distance +#, c-format +msgid "You have reached your destination %s" +msgstr "" + +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "Verdeeler" + +msgid "Exit" +msgstr "Ausfaart" + #. Android resource: @strings/position_popup_title msgid "Position" msgstr "" @@ -1802,10 +1929,10 @@ msgstr "" msgid "Enter Coordinates" msgstr "" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/lt.po.in b/po/lt.po.in index 362028448..7ea709581 100644 --- a/po/lt.po.in +++ b/po/lt.po.in @@ -7,20 +7,20 @@ # Mantas Kriaučiūnas https://launchpad.net/~mantas # Rytis Ūsalis https://launchpad.net/~rytis-usalis # laimonas https://launchpad.net/~laimonas-mockus - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2015-04-15 00:07+0000\n" "Last-Translator: KaZeR <Unknown>\n" "Language-Team: Lithuanian <lt@li.org>\n" +"Language: lt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " -"(n%100<10 || n%100>=20) ? 1 : 2;\n" -"Language: lt\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n" +"%100<10 || n%100>=20) ? 1 : 2;\n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -84,11 +84,11 @@ msgstr "už %d m" #, c-format msgid "%d feet" -msgstr "" +msgstr "%d pėdos" #, c-format msgid "in %d feet" -msgstr "" +msgstr "už %d pėdų" #, c-format msgid "%d meters" @@ -100,11 +100,11 @@ msgstr "už %d metrų" #, c-format msgid "%d.%d miles" -msgstr "" +msgstr "%d.%d mylios" #, c-format msgid "in %d.%d miles" -msgstr "" +msgstr "už %d.%d mylių" #, c-format msgid "%d.%d kilometers" @@ -124,8 +124,9 @@ msgstr[2] "%d mylių" #, c-format msgid "in one mile" msgid_plural "in %d miles" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "už %d mylios" +msgstr[1] "už %d mylių" +msgstr[2] "už %d mylių" #, c-format msgid "one kilometer" @@ -141,63 +142,71 @@ msgstr[0] "už %d kilometro" msgstr[1] "už %d kilometrų" msgstr[2] "už %d kilometrų" -msgid "exit" -msgstr "išvažiavimas" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "%1$sį %2$s%3$s%4$s" -msgid "into the ramp" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "%1$sį %2$s" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "%1$sį %2$s" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "%1$sį %2$s" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "%1$sį %2$s" + +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "į rampą" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" -msgstr "%s į gatvę %s%s%s" +msgid "%sinto %s%s%s" +msgstr "%sį %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" -msgstr "%s į %s%s%s" +msgid "%sinto %s%s%s|masculine form" +msgstr "%sį %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" -msgstr "%s į %s%s%s" +msgid "%sinto %s%s%s|feminine form" +msgstr "%sį %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" -msgstr "%s į %s%s%s" +msgid "%sinto %s%s%s|neuter form" +msgstr "%sį %s%s%s" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) #, c-format msgid "%sinto the %s" -msgstr "%s į %s" - -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "dešinėn" - -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "kairėn" +msgstr "%sį %s" -#. TRANSLATORS: Don't forget the ending space -msgid "easily " -msgstr "lengvai " - -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " -msgstr "stipriai " - -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " -msgstr "" +msgid "When possible, please turn around" +msgstr "Kai įmanoma, apsisukite" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " -msgstr "" +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" +msgstr "link %s" -msgid "When possible, please turn around" -msgstr "kai įmanoma, apsisukite" +#, c-format +msgid "Follow the road for the next %s" +msgstr "Laikykitės kelio sekančius %s" msgid "Enter the roundabout soon" msgstr "Netrukus įsukite į žiedą" @@ -205,24 +214,116 @@ msgstr "Netrukus įsukite į žiedą" #. TRANSLATORS: %s is the distance to the roundabout #, c-format msgid "Enter the roundabout %s" -msgstr "" +msgstr "Įsukite į žiedą %s" + +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" +msgstr "tada išsukite iš žiedo %1$s išvažiavime %2$s" + +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "Leave the roundabout at the %1$s %2$s" +msgstr "Išsukite iš žiedo %1$s išvažiavime %2$s" + +msgid "soon" +msgstr "netrukus" + +msgid "now" +msgstr "dabar" + +msgid "then" +msgstr "tada" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|right" +msgstr "tada užvažiuokite už%1$s" + +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|right" +msgstr "Užvažiuokite už%1$s%2$s" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|left" +msgstr "tada užvažiuokite už%1$s" + +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|left" +msgstr "Užvažiuokite už%1$s%2$s" + +msgid "on your left" +msgstr "kairėje" + +msgid "on your right" +msgstr "dešinėje" + +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance +#, c-format +msgid "Take exit %1$s %2$s %3$s" +msgstr "Išvažiuokite per išvažiavimą %1$s %2$s %3$s" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "then leave the roundabout at the %s" +msgid "Take the exit %1$s %2$s%3$s" +msgstr "Išvažiuokite per išvažiavimą %1$s %2$s%3$s" + +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" +msgstr "sankryžoje" + +msgid "at exit" +msgstr "išvažiavime" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then continue straight%1$s" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination #, c-format -msgid "Leave the roundabout at the %s" +msgid "Continue straight %1$s%2$s%3$s" msgstr "" +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "Follow the road for the next %s" -msgstr "Laikykitės kelio sekančius %s" +msgid "then keep right%1$s" +msgstr "tada laikykitės dešinės%1$s" -msgid "soon" -msgstr "netrukus" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep right %1$s%2$s%3$s" +msgstr "Laikykitės dešinės %1$s%2$s%3$s" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep left%1$s" +msgstr "tada laikykitės kairės%1$s" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "Laikykitės kairės %1$s%2$s%3$s" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "dešinėn" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "kairėn" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "lengvai " + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "stipriai " -#. TRANSLATORS: First argument is the how manieth street to take, second the direction #, c-format msgid "Take the %1$s road to the %2$s" msgstr "Važiuokite %1$s keliu į %2$s" @@ -231,32 +332,59 @@ msgstr "Važiuokite %1$s keliu į %2$s" msgid "after %i roads" msgstr "už %i kelių" -msgid "now" -msgstr "dabar" - +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination #, c-format -msgid "then take the %1$s road to the %2$s" -msgstr "" +msgid "Turn %1$s%2$s %3$s%4$s" +msgstr "Pasukite %1$s%2$s %3$s%4$s" -msgid "error" -msgstr "" +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "tada apsisukite" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "Turn %1$s%2$s %3$s%4$s" -msgstr "" +msgid "Make a U-turn %1$s|left" +msgstr "Apsisukite %1$s" + +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" +msgstr "tada apsisukite" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" -msgstr "" +msgid "Make a U-turn %1$s|right" +msgstr "Apsisukite %1$s" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" +msgstr "laikykitės kelio" + +msgid "then you have reached your destination." +msgstr "tada jūs pasiekėte kelionės tikslą." +#. TRANSLATORS: the arg. is distance #, c-format msgid "You have reached your destination %s" msgstr "Jūs pasiekėte tikslą %s" -msgid "then you have reached your destination." -msgstr "tada jūs pasiekėte kelionės tikslą." +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "Sankryža" + +msgid "Exit" +msgstr "Išvažiavimas" #. Android resource: @strings/position_popup_title msgid "Position" @@ -291,16 +419,16 @@ msgid "Waypoint %d" msgstr "" msgid "Visit before..." -msgstr "" +msgstr "Lankyti prieš..." msgid "Set as position" -msgstr "Nustatykite poziciją" +msgstr "Nustatyti poziciją" msgid "Set as destination" -msgstr "Nustatykite tikslą" +msgstr "Nustatyti tikslą" msgid "Add as bookmark" -msgstr "Pridėkite žymę" +msgstr "Pridėti žymę" #, c-format msgid "Point 0x%x 0x%x" @@ -308,7 +436,7 @@ msgstr "Taškas 0x%x 0x%x" #, c-format msgid "Screen coord : %d %d" -msgstr "Ekrano koordinatės : %d %d" +msgstr "Ekrano koordinatės : %d %d" #. 020 msgid "Andorra" @@ -1350,7 +1478,7 @@ msgstr "nežinoma gatvė" #. Safe cast: attr_generic_set_attr does not modify its parameter. msgid "Unnamed vehicle" -msgstr "" +msgstr "Bevardė transporto priemonė" msgid "Failed to write bookmarks file" msgstr "" @@ -1415,7 +1543,7 @@ msgid "_Route" msgstr "Parinkti kelią" msgid "_Former Destinations" -msgstr "Ankstesnės vietos" +msgstr "Ankstesni tikslai" msgid "_Bookmarks" msgstr "Adresynas" @@ -1460,10 +1588,10 @@ msgid "Opens address search dialog" msgstr "Atidaro adreso paieškos dialogą" msgid "_POI search" -msgstr "" +msgstr "Lankytinų vietų paieška" msgid "Opens POI search dialog" -msgstr "" +msgstr "Atidaro lankytinų vietų paieškos dialogą" msgid "_Stop Navigation" msgstr "Stabdyti navigaciją" @@ -1508,7 +1636,7 @@ msgid "Data" msgstr "Duomenys" msgid "Pharmacy" -msgstr "" +msgstr "Vaistinė" msgid "Restaurant" msgstr "Restoranas" @@ -1544,20 +1672,20 @@ msgid "Police" msgstr "Policija" msgid "Justice" -msgstr "" +msgstr "Teismas" msgid "Taxi" msgstr "Taksi" msgid "Shopping" -msgstr "" +msgstr "Parduotuvė" msgid "Distance from screen center (km)" -msgstr "" +msgstr "Atstumas nuo ekrano vidaus (km)" #, c-format msgid "POI %s. %s" -msgstr "" +msgstr "Lankytina vieta %s. %s" #, c-format msgid "Set destination to %ld, %ld \n" @@ -1565,23 +1693,23 @@ msgstr "Nustatyti tikslą į %ld, %ld \n" #, c-format msgid "Set map to %ld, %ld \n" -msgstr "" +msgstr "Nustatyti žemėlapį į %ld, %ld \n" #, c-format msgid "Set next visit to %ld, %ld \n" msgstr "" msgid "POI search" -msgstr "" +msgstr "Lankytinų vietų paieška" msgid "Select a category" msgstr "Pasirinkite kategoriją" msgid "Select a distance to look for (km)" -msgstr "" +msgstr "Išrinkite atstumą, kuriame ieškoti (km)" msgid "Select a POI" -msgstr "" +msgstr "Išrinkite lankytiną vietą" msgid " " msgstr " " @@ -1596,10 +1724,10 @@ msgid "Distance(m)" msgstr "Atstumas (m)" msgid "Name" -msgstr "" +msgstr "Vardas" msgid "Visit Before" -msgstr "" +msgstr "Aplankyi prieš" msgid "N" msgstr "Š" @@ -1672,7 +1800,7 @@ msgid "View Attributes" msgstr "Rodyti savybes" msgid "Set as position (and deactivate vehicle)" -msgstr "" +msgstr "Nustatyti poziciją (išjungdamas transporto priemonę)" msgid "POIs" msgstr "Lankytinos vietos" @@ -1681,10 +1809,10 @@ msgid "View on map" msgstr "Rodyti žemėlapyje" msgid "Remove search results from the map" -msgstr "" +msgstr "Pašalinti paieškos rezultatas nuo žemėlapio" msgid "Show results on the map" -msgstr "" +msgstr "Rodyti rezultatus žemelapyje" msgid "Cut Bookmark" msgstr "Iškirpti žymą" @@ -1717,7 +1845,7 @@ msgid "Replace with waypoints" msgstr "" msgid "Delete Folder" -msgstr "Trinti aplanką" +msgstr "Pašalinti katalogą" #. Adds the Bookmark folders msgid "Add Bookmark folder" @@ -1739,7 +1867,7 @@ msgid "Map Download" msgstr "" msgid "Active" -msgstr "" +msgstr "Aktyvus" msgid "Download Enabled" msgstr "" @@ -1796,7 +1924,7 @@ msgstr "Apie Navit" #. Authors msgid "By" -msgstr "" +msgstr "Sukūrė" #. Contributors msgid "And all the Navit Team" @@ -1809,19 +1937,19 @@ msgid "Waypoints" msgstr "" msgid "Enter Coordinates" -msgstr "" +msgstr "Įvėskite koordinates" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" -msgstr "" +msgstr "Platuma Ilguma" msgid "Enter coordinates, for example:" -msgstr "" +msgstr "Įvėskitė koordinates, pvz.:" msgid "Vehicle" msgstr "Transporto priemonė" @@ -1857,10 +1985,10 @@ msgid "Show Locale" msgstr "" msgid "Former Destinations" -msgstr "Ankstesnės vietos" +msgstr "Ankstesni tikslai" msgid "- No former destinations available -" -msgstr "" +msgstr "- Nėra ankstesnių tikslų -" msgid "Message" msgstr "Žinutė" @@ -1869,7 +1997,7 @@ msgid "Back" msgstr "Grįžti" msgid "Back to map" -msgstr "Grižti į žemėlapį" +msgstr "Grįžti į žemėlapį" msgid "Main Menu" msgstr "Pagrindinis meniu" @@ -1884,7 +2012,7 @@ msgid "Prev" msgstr "" msgid "Return to route!" -msgstr "" +msgstr "Grįžti į maršrutą!" #. warning told msgid "Look out! Camera!" @@ -1892,22 +2020,22 @@ msgstr "" #. warning told msgid "Please decrease your speed" -msgstr "" +msgstr "Prašom sumažinti greitį" msgid "partial match" msgstr "" #. Android resource: @strings/address_search_button msgid "Search" -msgstr "" +msgstr "Paieška" #. Android resource: @strings/address_search_towns msgid "Towns" -msgstr "" +msgstr "Miestai" #. Android resource: @strings/position_popup_drive_here msgid "Route to here" -msgstr "" +msgstr "Maršrutas iki čia" msgid "Map data (c) OpenStreetMap contributors, ODBL" msgstr "" @@ -1919,7 +2047,7 @@ msgid "" msgstr "" msgid "Downloaded maps" -msgstr "" +msgstr "Atsisiųsti žemėlapiai" msgid "" "Sorry, we currently do not support maps above 3.8G on Android, please select " @@ -2052,7 +2180,7 @@ msgid "Baden-Wuerttemberg" msgstr "" msgid "Bayern" -msgstr "" +msgstr "Bavarija" msgid "Mittelfranken" msgstr "" @@ -2366,6 +2494,8 @@ msgid "" "Former\n" "Destinations" msgstr "" +"Ankstesni\n" +"tikslai" msgid "Coordinates" msgstr "Koordinatės" @@ -2406,7 +2536,7 @@ msgid "NMEA Data" msgstr "" msgid "car_shortest" -msgstr "" +msgstr "Automobilis (trumpiausias maršrutas)" msgid "car_avoid_tolls" msgstr "" @@ -2459,11 +2589,11 @@ msgstr "Daugiau informacijos" #. Android resource: @strings/optionsmenu_zoom_in msgid "Zoom in" -msgstr "Artinti" +msgstr "Padidinti" #. Android resource: @strings/optionsmenu_zoom_out msgid "Zoom out" -msgstr "Tolinti" +msgstr "Sumažinti" #. Android resource: @strings/optionsmenu_download_maps msgid "Download maps" @@ -2471,7 +2601,7 @@ msgstr "Atsisiųsti žemėlapius" #. Android resource: @strings/optionsmenu_toggle_poi msgid "Toggle POIs" -msgstr "" +msgstr "Rodyti/slėpti lankytinas vietas" #. Android resource: @strings/optionsmenu_exit_navit msgid "Exit Navit" @@ -2487,7 +2617,7 @@ msgstr "" #. Android resource: @strings/map_delete msgid "Delete this map?" -msgstr "Ištrinti šį žemėlapį?" +msgstr "Pašalinti šį žemėlapį?" #. Android resource: @strings/map_download_downloading msgid "Downloading:" @@ -2511,7 +2641,7 @@ msgstr "" #. Android resource: @strings/address_search_title msgid "Address search" -msgstr "Ieškoti adreso" +msgstr "Adresų paieška" #. Android resource: @strings/address_enter_destination msgid "Enter destination" diff --git a/po/lv.po.in b/po/lv.po.in index 2c36124d5..ce0d282ad 100644 --- a/po/lv.po.in +++ b/po/lv.po.in @@ -6,19 +6,19 @@ # KaZeR https://launchpad.net/~kazer # Stendec https://launchpad.net/~stendec # sieks https://launchpad.net/~sieks - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2015-01-05 13:24+0000\n" "Last-Translator: Stendec <Unknown>\n" "Language-Team: Latvian <lv@li.org>\n" +"Language: lv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2;\n" -"Language: lv\n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -140,30 +140,53 @@ msgstr[0] "pēc %d kilometra" msgstr[1] "pēc %d kilometriem" msgstr[2] "pēc %d kilometriem" -msgid "exit" -msgstr "nobraukt nost" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" -msgid "into the ramp" -msgstr "uz rampas" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "" + +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" +msgstr "uz uzbrauktuves" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" -msgstr "%suz ielu %s%s%s" +msgid "%sinto %s%s%s" +msgstr "%suz %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" +msgid "%sinto %s%s%s|masculine form" msgstr "%suz %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" +msgid "%sinto %s%s%s|feminine form" msgstr "%suz %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" +msgid "%sinto %s%s%s|neuter form" msgstr "%suz %s%s%s" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) @@ -171,32 +194,17 @@ msgstr "%suz %s%s%s" msgid "%sinto the %s" msgstr "Uz %spagriezties pa %s" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "pa labi" - -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "pa kreisi" - -#. TRANSLATORS: Don't forget the ending space -msgid "easily " -msgstr "nedaudz " - -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " -msgstr "strauji " - -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " -msgstr "" +msgid "When possible, please turn around" +msgstr "Kad iespējams apgriezieties" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" msgstr "" -msgid "When possible, please turn around" -msgstr "Kad iespējams apgriezieties" +#, c-format +msgid "Follow the road for the next %s" +msgstr "Turpiniet pa šo ceļu %s" msgid "Enter the roundabout soon" msgstr "Drīzumā uzbraukt uz apļa" @@ -206,57 +214,176 @@ msgstr "Drīzumā uzbraukt uz apļa" msgid "Enter the roundabout %s" msgstr "Uzbraukt uz apļa pēc %s" +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" +msgstr "pēc tam izbraukt no apļa pa %1$s %2$s" + +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow #, c-format -msgid "then leave the roundabout at the %s" +msgid "Leave the roundabout at the %1$s %2$s" +msgstr "Nobraukt no apļa pa %1$s %2$s" + +msgid "soon" +msgstr "drīz" + +msgid "now" +msgstr "tagad" + +msgid "then" +msgstr "pēc tam" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|right" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "Leave the roundabout at the %s" +msgid "Merge %1$s%2$s|right" msgstr "" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Follow the road for the next %s" -msgstr "Turpiniet pa šo ceļu %s" +msgid "then merge%1$s|left" +msgstr "" -msgid "soon" -msgstr "drīz" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|left" +msgstr "" -#. TRANSLATORS: First argument is the how manieth street to take, second the direction +msgid "on your left" +msgstr "" + +msgid "on your right" +msgstr "" + +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "Take the %1$s road to the %2$s" -msgstr "Pagriežaties %1$s ceļā pa %2$s" +msgid "Take exit %1$s %2$s %3$s" +msgstr "" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "after %i roads" -msgstr "pēc %i ceļiem" +msgid "Take the exit %1$s %2$s%3$s" +msgstr "" -msgid "now" -msgstr "tagad" +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" +msgstr "" +msgid "at exit" +msgstr "nobrauktuvē" + +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "then take the %1$s road to the %2$s" +msgid "then continue straight%1$s" msgstr "" -msgid "error" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" msgstr "" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "Turn %1$s%2$s %3$s%4$s" +msgid "then keep right%1$s" msgstr "" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +msgid "Keep right %1$s%2$s%3$s" msgstr "" +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "You have reached your destination %s" -msgstr "Jūs esat sasniedzis galamērķi %s" +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "pa labi" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "pa kreisi" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "nedaudz " + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "strauji " + +#, c-format +msgid "Take the %1$s road to the %2$s" +msgstr "Pagriežaties %1$s ceļā pa %2$s" + +#, c-format +msgid "after %i roads" +msgstr "pēc %i ceļiem" + +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination +#, c-format +msgid "Turn %1$s%2$s %3$s%4$s" +msgstr "Pagriezties %1$s%2$s %3$s%4$s" + +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "pēc tam apgriezieties" + +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. +#, c-format +msgid "Make a U-turn %1$s|left" +msgstr "Apgriezieties %1$s" + +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" +msgstr "pēc tam apgriezieties" + +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. +#, c-format +msgid "Make a U-turn %1$s|right" +msgstr "Apgriezieties %1$s" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" +msgstr "turpiniet" msgid "then you have reached your destination." msgstr "tad Jūs sasniegsiet glamērķi" +#. TRANSLATORS: the arg. is distance +#, c-format +msgid "You have reached your destination %s" +msgstr "Jūs esat sasniedzis galamērķi %s" + +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "" + +msgid "Exit" +msgstr "Nobrauktuve" + #. Android resource: @strings/position_popup_title msgid "Position" msgstr "Pozīcija" @@ -1812,10 +1939,10 @@ msgstr "Pieturpunkti" msgid "Enter Coordinates" msgstr "Ievadiet Koordinātes" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/mk.po.in b/po/mk.po.in index d3d48a420..862017b4f 100644 --- a/po/mk.po.in +++ b/po/mk.po.in @@ -6,19 +6,19 @@ # Naum Spaseski https://launchpad.net/~naum-spaseski-gmail # Robert Mileski https://launchpad.net/~mileski # goran.cvetkovski https://launchpad.net/~goran-cvetkovski - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2013-12-10 00:53+0000\n" "Last-Translator: KaZeR <Unknown>\n" "Language-Team: Macedonian <mk@li.org>\n" +"Language: mk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n" -"Language: mk\n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -136,30 +136,53 @@ msgid_plural "in %d kilometers" msgstr[0] "после %d километри" msgstr[1] "после %d километри" -msgid "exit" -msgstr "излез" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" -msgid "into the ramp" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "" + +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "на рампа" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" -msgstr "%sна улица %s%s%s" +msgid "%sinto %s%s%s" +msgstr "%sна %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" +msgid "%sinto %s%s%s|masculine form" msgstr "%sна %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" +msgid "%sinto %s%s%s|feminine form" msgstr "%sна %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" +msgid "%sinto %s%s%s|neuter form" msgstr "%sна %s%s%s" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) @@ -167,57 +190,134 @@ msgstr "%sна %s%s%s" msgid "%sinto the %s" msgstr "%sна %s" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "на десно" +msgid "When possible, please turn around" +msgstr "Кога можете, свртете" -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "на лево" +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" +msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "easily " -msgstr "лесно " +#, c-format +msgid "Follow the road for the next %s" +msgstr "Следете го патот следните %s" -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " -msgstr "силно " +msgid "Enter the roundabout soon" +msgstr "Наскоро влегувате во кружен тек" -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " +#. TRANSLATORS: %s is the distance to the roundabout +#, c-format +msgid "Enter the roundabout %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" +msgstr "потоа излегувате од кружен тек на %1$s %2$s" + +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "Leave the roundabout at the %1$s %2$s" +msgstr "Излегувате од кружен тек на %1$s %2$s" + +msgid "soon" +msgstr "наскоро" + +msgid "now" +msgstr "сега" + +msgid "then" +msgstr "тогаш" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|right" msgstr "" -msgid "When possible, please turn around" -msgstr "Кога можете, свртете" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|right" +msgstr "" -msgid "Enter the roundabout soon" -msgstr "Наскоро влегувате во кружен тек" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|left" +msgstr "" -#. TRANSLATORS: %s is the distance to the roundabout +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Enter the roundabout %s" +msgid "Merge %1$s%2$s|left" +msgstr "" + +msgid "on your left" msgstr "" +msgid "on your right" +msgstr "" + +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "then leave the roundabout at the %s" +msgid "Take exit %1$s %2$s %3$s" msgstr "" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "Leave the roundabout at the %s" +msgid "Take the exit %1$s %2$s%3$s" +msgstr "" + +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" msgstr "" +msgid "at exit" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "Follow the road for the next %s" -msgstr "Следете го патот следните %s" +msgid "then continue straight%1$s" +msgstr "" -msgid "soon" -msgstr "наскоро" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep right%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep right %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "на десно" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "на лево" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "лесно " + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "силно " -#. TRANSLATORS: First argument is the how manieth street to take, second the direction #, c-format msgid "Take the %1$s road to the %2$s" msgstr "Продолжи по %1$s патот до %2$s" @@ -226,32 +326,59 @@ msgstr "Продолжи по %1$s патот до %2$s" msgid "after %i roads" msgstr "после %i патишта" -msgid "now" -msgstr "сега" - +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination #, c-format -msgid "then take the %1$s road to the %2$s" -msgstr "" +msgid "Turn %1$s%2$s %3$s%4$s" +msgstr "Свртете %1$s%2$s %3$s%4$s" -msgid "error" -msgstr "" +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "тогаш свртете" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "Turn %1$s%2$s %3$s%4$s" -msgstr "" +msgid "Make a U-turn %1$s|left" +msgstr "Свртете %1$s" + +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" +msgstr "тогаш свртете" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +msgid "Make a U-turn %1$s|right" +msgstr "Свртете %1$s" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" msgstr "" +msgid "then you have reached your destination." +msgstr "потоа пристигате на одредиштето." + +#. TRANSLATORS: the arg. is distance #, c-format msgid "You have reached your destination %s" msgstr "Стигнавте на целта %s" -msgid "then you have reached your destination." -msgstr "потоа пристигате на одредиштето." +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "" + +msgid "Exit" +msgstr "Излез" #. Android resource: @strings/position_popup_title msgid "Position" @@ -1322,8 +1449,7 @@ msgstr "" #. We have not found an existing config file from all possibilities msgid "No config file navit.xml, navit.xml.local found\n" -msgstr "" -"Не е пронајден документ за конфигурација navit.xml, navit.xml.local\n" +msgstr "Не е пронајден документ за конфигурација navit.xml, navit.xml.local\n" #, c-format msgid "Error parsing config file '%s': %s\n" @@ -1809,10 +1935,10 @@ msgstr "" msgid "Enter Coordinates" msgstr "" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/ml.po.in b/po/ml.po.in index 6ddae3c97..615f0fb8c 100644 --- a/po/ml.po.in +++ b/po/ml.po.in @@ -4,14 +4,15 @@ # Many thanks to the contributors of this translation: # Faju https://launchpad.net/~gotoarunk # Sunil K https://launchpad.net/~sunilk - msgid "" msgstr "" -"Project-Id-Version: navit\n" -"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" +"Project-Id-Version: navit 0.5.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2015-03-18 13:32+0000\n" "Last-Translator: Sunil K <Unknown>\n" "Language-Team: Malayalam <ml@li.org>\n" +"Language: ml\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -132,63 +133,71 @@ msgid_plural "in %d kilometers" msgstr[0] "ഒരു കിലോമീറ്ററില്" msgstr[1] "%d കിലോമീറ്ററില്" -msgid "exit" -msgstr "പുറത്തേക്ക്" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "" -msgid "into the ramp" -msgstr "ചരുവിലേക്ക് പോവുക" +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" +msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" -msgstr "%s തെരുവിലേക്ക് %s%s%s" +msgid "%sinto %s%s%s" +msgstr "%sകഴിഞ്ഞു %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" -msgstr "%s കഴിഞ്ഞു %s %s %s" +msgid "%sinto %s%s%s|masculine form" +msgstr "%sകഴിഞ്ഞു %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" -msgstr "%sകഴിഞ്ഞു %s %s %s" +msgid "%sinto %s%s%s|feminine form" +msgstr "%sകഴിഞ്ഞു %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" -msgstr "%sകഴിഞ്ഞു %s %s %s" +msgid "%sinto %s%s%s|neuter form" +msgstr "%sകഴിഞ്ഞു %s%s%s" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) #, c-format msgid "%sinto the %s" msgstr "%s-ല് %s -ലേക്ക് തിരിയുക" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "വലത്തോട്ട്" - -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "ഇടത്തോട്ട്" - -#. TRANSLATORS: Don't forget the ending space -msgid "easily " -msgstr "ചെറുതായ് " - -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " -msgstr "നന്നായി " - -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " -msgstr "" +msgid "When possible, please turn around" +msgstr "സാധിക്കുന്നിടത്ത് വച്ച്,തിരിച്ചു പോവുക" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" msgstr "" -msgid "When possible, please turn around" -msgstr "സാധിക്കുന്നിടത്ത് വച്ച്,തിരിച്ചു പോവുക" +#, c-format +msgid "Follow the road for the next %s" +msgstr "ഈ വഴിയിലുടെ അടുത്ത %s പോവുക" msgid "Enter the roundabout soon" msgstr "റൗണ്ടാനയിലേക്ക് ഉടനെ കയറുക" @@ -198,22 +207,114 @@ msgstr "റൗണ്ടാനയിലേക്ക് ഉടനെ കയറു msgid "Enter the roundabout %s" msgstr "%s റൗണ്ടാനയിലേക്ക് കേറുക" +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow #, c-format -msgid "then leave the roundabout at the %s" +msgid "then leave the roundabout at the %1$s %2$s" +msgstr "%1$s- ല് റൗണ്ടാനയില് നിന്നും പുറത്തോട്ട് പോവുക %2$s" + +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "Leave the roundabout at the %1$s %2$s" +msgstr "%1$s-ലൂടെ റൗണ്ടാനയില് നിന്നും പുറത്തു പോവുകാ %2$s" + +msgid "soon" +msgstr "അല്പസമയത്തിനുള്ളില്" + +msgid "now" +msgstr "ഇപ്പോള്" + +msgid "then" msgstr "" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "Leave the roundabout at the %s" +msgid "then merge%1$s|right" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "Follow the road for the next %s" -msgstr "ഈ വഴിയിലുടെ അടുത്ത %s പോവുക" +msgid "Merge %1$s%2$s|right" +msgstr "" -msgid "soon" -msgstr "അല്പസമയത്തിനുള്ളില്" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|left" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|left" +msgstr "" + +msgid "on your left" +msgstr "" + +msgid "on your right" +msgstr "" + +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance +#, c-format +msgid "Take exit %1$s %2$s %3$s" +msgstr "" + +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination +#, c-format +msgid "Take the exit %1$s %2$s%3$s" +msgstr "" + +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" +msgstr "" + +msgid "at exit" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then continue straight%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep right%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep right %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "വലത്തോട്ട്" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "ഇടത്തോട്ട്" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "ചെറുതായ് " + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "നന്നായി " -#. TRANSLATORS: First argument is the how manieth street to take, second the direction #, c-format msgid "Take the %1$s road to the %2$s" msgstr "%2$s %1$s-മത്തെ പാത എടുക്കുക" @@ -222,32 +323,59 @@ msgstr "%2$s %1$s-മത്തെ പാത എടുക്കുക" msgid "after %i roads" msgstr "%i വഴികൾക്കു ശേഷം" -msgid "now" -msgstr "ഇപ്പോള്" +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination +#, c-format +msgid "Turn %1$s%2$s %3$s%4$s" +msgstr "%4$s ലേക്ക് %3$s %2$s %1$s തിരിയുക" + +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "" +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "then take the %1$s road to the %2$s" +msgid "Make a U-turn %1$s|left" msgstr "" -msgid "error" +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" msgstr "" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "Turn %1$s%2$s %3$s%4$s" +msgid "Make a U-turn %1$s|right" msgstr "" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination -#, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" msgstr "" +msgid "then you have reached your destination." +msgstr "അപ്പോള് നിങ്ങള് ലക്ഷ്യത്തിലെത്തും" + +#. TRANSLATORS: the arg. is distance #, c-format msgid "You have reached your destination %s" msgstr "നിങ്ങള് %s ലക്ഷ്യത്തിലെത്തിയിരിക്കുന്നു" -msgid "then you have reached your destination." -msgstr "അപ്പോള് നിങ്ങള് ലക്ഷ്യത്തിലെത്തും" +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "" + +msgid "Exit" +msgstr "പുറത്തേക്ക്" #. Android resource: @strings/position_popup_title msgid "Position" @@ -1334,8 +1462,7 @@ msgstr "'%s' കോണ്ഫിഗറേഷന് ഫയലില് msgid "" "Internal initialization failed, exiting. Check previous error messages.\n" -msgstr "" -"പിഴവ് സംഭവിച്ചു. നിര്ത്തുന്നു. ദയവായ് മുന് സന്ദേശങ്ങള് പരിശോധിക്കുക\n" +msgstr "പിഴവ് സംഭവിച്ചു. നിര്ത്തുന്നു. ദയവായ് മുന് സന്ദേശങ്ങള് പരിശോധിക്കുക\n" msgid "unknown street" msgstr "പേരില്ലാത്ത തെരുവ്" @@ -1803,10 +1930,10 @@ msgstr "വഴിത്തിരിവുകള്" msgid "Enter Coordinates" msgstr "കോഓര്ഡിനേറ്റുകള് ചേര്ക്കുക" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" @@ -2448,8 +2575,8 @@ msgid "" msgstr "" "നാവിറ്റ് ഉപയോഗിക്കുന്നതിനു നന്നീ\n" "\n" -"തുടങ്ങുവാന് നാവിറ്റ് മെനുവില് നിന്നും ഭൂപടം ഡൗണ്ലോഡ് ചെയ്യാനുള്ള ഓപ്ഷ്ന് " -"തെരഞ്ഞെടുക്കുക, (ഫയല് വളരെ വലുതായതിനാല് വൈഫൈ \n" +"തുടങ്ങുവാന് നാവിറ്റ് മെനുവില് നിന്നും ഭൂപടം ഡൗണ്ലോഡ് ചെയ്യാനുള്ള ഓപ്ഷ്ന് തെരഞ്ഞെടുക്കുക, (ഫയല് വളരെ " +"വലുതായതിനാല് വൈഫൈ \n" "\n" "കണക്ഷന് ഉപയോഗിക്കുന്നത് ഉചിതമായിരിക്കും)\n" "\n" diff --git a/po/mn.po.in b/po/mn.po.in index 022e669b9..ee5982e70 100644 --- a/po/mn.po.in +++ b/po/mn.po.in @@ -3,14 +3,15 @@ # This file is distributed under the same license as the navit package. # Many thanks to the contributors of this translation: # Enkhbold https://launchpad.net/~enkhbold-baatar - msgid "" msgstr "" -"Project-Id-Version: navit\n" -"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" +"Project-Id-Version: navit 0.5.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2015-03-11 06:11+0000\n" "Last-Translator: Enkhbold <enkhbold_baatar@yahoo.com>\n" "Language-Team: Mongolian <mn@li.org>\n" +"Language: mn\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -131,30 +132,53 @@ msgid_plural "in %d kilometers" msgstr[0] "" msgstr[1] "" -msgid "exit" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" msgstr "" -msgid "into the ramp" +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" +msgid "%sinto %s%s%s" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" +msgid "%sinto %s%s%s|masculine form" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" +msgid "%sinto %s%s%s|feminine form" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" +msgid "%sinto %s%s%s|neuter form" msgstr "" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) @@ -162,92 +186,196 @@ msgstr "" msgid "%sinto the %s" msgstr "" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" +msgid "When possible, please turn around" msgstr "" -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "easily " +#, c-format +msgid "Follow the road for the next %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " +msgid "Enter the roundabout soon" +msgstr "" + +#. TRANSLATORS: %s is the distance to the roundabout +#, c-format +msgid "Enter the roundabout %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "Leave the roundabout at the %1$s %2$s" msgstr "" -msgid "When possible, please turn around" +msgid "soon" msgstr "" -msgid "Enter the roundabout soon" +msgid "now" msgstr "" -#. TRANSLATORS: %s is the distance to the roundabout +msgid "then" +msgstr "" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "Enter the roundabout %s" +msgid "then merge%1$s|right" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "then leave the roundabout at the %s" +msgid "Merge %1$s%2$s|right" msgstr "" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Leave the roundabout at the %s" +msgid "then merge%1$s|left" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Follow the road for the next %s" +msgid "Merge %1$s%2$s|left" msgstr "" -msgid "soon" +msgid "on your left" +msgstr "" + +msgid "on your right" msgstr "" -#. TRANSLATORS: First argument is the how manieth street to take, second the direction +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "Take the %1$s road to the %2$s" +msgid "Take exit %1$s %2$s %3$s" msgstr "" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "after %i roads" +msgid "Take the exit %1$s %2$s%3$s" msgstr "" -msgid "now" +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" msgstr "" +msgid "at exit" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "then take the %1$s road to the %2$s" +msgid "then continue straight%1$s" msgstr "" -msgid "error" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" msgstr "" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep right%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep right %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "" + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "" + +#, c-format +msgid "Take the %1$s road to the %2$s" +msgstr "" + +#, c-format +msgid "after %i roads" +msgstr "" + +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination #, c-format msgid "Turn %1$s%2$s %3$s%4$s" msgstr "" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "" + +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +msgid "Make a U-turn %1$s|left" +msgstr "" + +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" msgstr "" +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "You have reached your destination %s" +msgid "Make a U-turn %1$s|right" +msgstr "" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" msgstr "" msgid "then you have reached your destination." msgstr "" +#. TRANSLATORS: the arg. is distance +#, c-format +msgid "You have reached your destination %s" +msgstr "" + +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "" + +msgid "Exit" +msgstr "" + #. Android resource: @strings/position_popup_title msgid "Position" msgstr "" @@ -1801,10 +1929,10 @@ msgstr "" msgid "Enter Coordinates" msgstr "" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/mr.po.in b/po/mr.po.in index 9af2aec7e..6780e22b4 100644 --- a/po/mr.po.in +++ b/po/mr.po.in @@ -3,19 +3,19 @@ # This file is distributed under the same license as the navit package. # Many thanks to the contributors of this translation: # nagesh https://launchpad.net/~nageshpachorkar - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2013-02-18 10:23+0000\n" "Last-Translator: nagesh <nageshpachorkar@gmail.com>\n" "Language-Team: Marathi <mr@li.org>\n" +"Language: mr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"Language: mr\n" msgid "Running from source directory\n" msgstr "" @@ -132,30 +132,53 @@ msgid_plural "in %d kilometers" msgstr[0] "" msgstr[1] "" -msgid "exit" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" msgstr "" -msgid "into the ramp" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "" + +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" +msgid "%sinto %s%s%s" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" +msgid "%sinto %s%s%s|masculine form" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" +msgid "%sinto %s%s%s|feminine form" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" +msgid "%sinto %s%s%s|neuter form" msgstr "" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) @@ -163,90 +186,194 @@ msgstr "" msgid "%sinto the %s" msgstr "" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" +msgid "When possible, please turn around" msgstr "" -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "easily " +#, c-format +msgid "Follow the road for the next %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " +msgid "Enter the roundabout soon" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " +#. TRANSLATORS: %s is the distance to the roundabout +#, c-format +msgid "Enter the roundabout %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" msgstr "" -msgid "When possible, please turn around" +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "Leave the roundabout at the %1$s %2$s" msgstr "" -msgid "Enter the roundabout soon" +msgid "soon" msgstr "" -#. TRANSLATORS: %s is the distance to the roundabout +msgid "now" +msgstr "" + +msgid "then" +msgstr "" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "Enter the roundabout %s" +msgid "then merge%1$s|right" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "then leave the roundabout at the %s" +msgid "Merge %1$s%2$s|right" msgstr "" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Leave the roundabout at the %s" +msgid "then merge%1$s|left" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Follow the road for the next %s" +msgid "Merge %1$s%2$s|left" msgstr "" -msgid "soon" +msgid "on your left" +msgstr "" + +msgid "on your right" msgstr "" -#. TRANSLATORS: First argument is the how manieth street to take, second the direction +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "Take the %1$s road to the %2$s" +msgid "Take exit %1$s %2$s %3$s" msgstr "" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "after %i roads" +msgid "Take the exit %1$s %2$s%3$s" msgstr "" -msgid "now" +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" +msgstr "" + +msgid "at exit" msgstr "" +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "then take the %1$s road to the %2$s" +msgid "then continue straight%1$s" msgstr "" -msgid "error" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep right%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep right %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "" + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "" + +#, c-format +msgid "Take the %1$s road to the %2$s" +msgstr "" + +#, c-format +msgid "after %i roads" msgstr "" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination #, c-format msgid "Turn %1$s%2$s %3$s%4$s" msgstr "" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "" + +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. +#, c-format +msgid "Make a U-turn %1$s|left" +msgstr "" + +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" +msgstr "" + +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +msgid "Make a U-turn %1$s|right" +msgstr "" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" msgstr "" +msgid "then you have reached your destination." +msgstr "" + +#. TRANSLATORS: the arg. is distance #, c-format msgid "You have reached your destination %s" msgstr "" -msgid "then you have reached your destination." +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "" + +msgid "Exit" msgstr "" #. Android resource: @strings/position_popup_title @@ -1802,10 +1929,10 @@ msgstr "" msgid "Enter Coordinates" msgstr "" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/nb.po.in b/po/nb.po.in index ba45b76e6..a8a130972 100644 --- a/po/nb.po.in +++ b/po/nb.po.in @@ -8,19 +8,19 @@ # Skippern https://launchpad.net/~gay-today # Thor H. Johansen https://launchpad.net/~thorhajo # burner https://launchpad.net/~bendik-xplore - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2013-09-28 01:44+0000\n" "Last-Translator: KaZeR <Unknown>\n" "Language-Team: Bendik Brenne <bendik@xplore.nu>\n" +"Language: nb\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"Language: \n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -138,30 +138,53 @@ msgid_plural "in %d kilometers" msgstr[0] "om en kilometer" msgstr[1] "om %d kilometer" -msgid "exit" -msgstr "avkjørsel" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "" -msgid "into the ramp" +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "ut på akselerasjonsfeltet" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" +msgid "%sinto %s%s%s" msgstr "%sinn på gaten %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" +msgid "%sinto %s%s%s|masculine form" msgstr "%sinn på %s%s%sen" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" +msgid "%sinto %s%s%s|feminine form" msgstr "%sinn på %s%s%sa" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" +msgid "%sinto %s%s%s|neuter form" msgstr "%sin på %s%s%set" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) @@ -169,32 +192,17 @@ msgstr "%sin på %s%s%set" msgid "%sinto the %s" msgstr "%sinn på %s" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "høyre" - -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "venstre" - -#. TRANSLATORS: Don't forget the ending space -msgid "easily " -msgstr "slakt " - -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " -msgstr "skarpt " - -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " -msgstr "" +msgid "When possible, please turn around" +msgstr "Snu når det er mulig" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" msgstr "" -msgid "When possible, please turn around" -msgstr "Snu når det er mulig" +#, c-format +msgid "Follow the road for the next %s" +msgstr "Følg veien de neste %s" msgid "Enter the roundabout soon" msgstr "Kjør inn i rundkjøringen snart" @@ -202,59 +210,178 @@ msgstr "Kjør inn i rundkjøringen snart" #. TRANSLATORS: %s is the distance to the roundabout #, c-format msgid "Enter the roundabout %s" +msgstr "Kjør inn i rundkjøringen %s" + +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" +msgstr "forlat så rundkjøringen ut %1$s %2$s" + +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "Leave the roundabout at the %1$s %2$s" +msgstr "Forlat rundkjøringen ut %1$s %2$s" + +msgid "soon" +msgstr "snart" + +msgid "now" +msgstr "nå" + +msgid "then" +msgstr "så" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|right" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "then leave the roundabout at the %s" +msgid "Merge %1$s%2$s|right" msgstr "" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Leave the roundabout at the %s" +msgid "then merge%1$s|left" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Follow the road for the next %s" -msgstr "Følg veien de neste %s" +msgid "Merge %1$s%2$s|left" +msgstr "" -msgid "soon" -msgstr "snart" +msgid "on your left" +msgstr "" + +msgid "on your right" +msgstr "" -#. TRANSLATORS: First argument is the how manieth street to take, second the direction +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "Take the %1$s road to the %2$s" -msgstr "Ta den %1$s veien mot %2$s" +msgid "Take exit %1$s %2$s %3$s" +msgstr "" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "after %i roads" -msgstr "etter %i avkjøringer" +msgid "Take the exit %1$s %2$s%3$s" +msgstr "" -msgid "now" -msgstr "nå" +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" +msgstr "" +msgid "at exit" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "then take the %1$s road to the %2$s" +msgid "then continue straight%1$s" msgstr "" -msgid "error" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" msgstr "" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "Turn %1$s%2$s %3$s%4$s" +msgid "then keep right%1$s" msgstr "" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +msgid "Keep right %1$s%2$s%3$s" msgstr "" +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "You have reached your destination %s" -msgstr "Du har nådd ditt reisemål %s" +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "høyre" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "venstre" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "slakt " + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "skarpt " + +#, c-format +msgid "Take the %1$s road to the %2$s" +msgstr "Ta den %1$s veien mot %2$s" + +#, c-format +msgid "after %i roads" +msgstr "etter %i avkjøringer" + +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination +#, c-format +msgid "Turn %1$s%2$s %3$s%4$s" +msgstr "Sving %1$s til %2$s om %3$s %4$s" + +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "snu så" + +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. +#, c-format +msgid "Make a U-turn %1$s|left" +msgstr "Snu %1$s" + +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" +msgstr "snu så" + +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. +#, c-format +msgid "Make a U-turn %1$s|right" +msgstr "Snu %1$s" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" +msgstr "følg" msgid "then you have reached your destination." msgstr "så har du nådd ditt reisemål." +#. TRANSLATORS: the arg. is distance +#, c-format +msgid "You have reached your destination %s" +msgstr "Du har nådd ditt reisemål %s" + +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "" + +msgid "Exit" +msgstr "Avkjørsel" + #. Android resource: @strings/position_popup_title msgid "Position" msgstr "Posisjon" @@ -1808,10 +1935,10 @@ msgstr "" msgid "Enter Coordinates" msgstr "" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/nds.po.in b/po/nds.po.in index 88b3484b8..6b4664eea 100644 --- a/po/nds.po.in +++ b/po/nds.po.in @@ -9,19 +9,19 @@ # Roschkor https://launchpad.net/~bound-one2000 # everyone https://launchpad.net/~anonymus1338 # fred husche https://launchpad.net/~paidmailacc - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2013-09-28 01:42+0000\n" "Last-Translator: KaZeR <Unknown>\n" "Language-Team: German, Low <nds@li.org>\n" +"Language: nds\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"Language: \n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -139,88 +139,188 @@ msgid_plural "in %d kilometers" msgstr[0] "in einem Kilometer" msgstr[1] "in %d Kilometern" -msgid "exit" -msgstr "Ausfahrt" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" -msgid "into the ramp" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "" + +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "auf die Auffahrt" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" -msgstr "%s in die Straße %s %s %s" +msgid "%sinto %s%s%s" +msgstr "%sin die Straße %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" -msgstr "%s in den %s%s%s" +msgid "%sinto %s%s%s|masculine form" +msgstr "%sin den %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" -msgstr "%s in die %s%s%s" +msgid "%sinto %s%s%s|feminine form" +msgstr "%sin die %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" -msgstr "%s in das %s%s%s" +msgid "%sinto %s%s%s|neuter form" +msgstr "%sin das %s%s%s" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) #, c-format msgid "%sinto the %s" -msgstr "%s in die %s" +msgstr "%sin die %s" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "Rechts" +msgid "When possible, please turn around" +msgstr "Wenn möglich, bitte wenden" -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "links" +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" +msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "easily " -msgstr "einfach " +#, c-format +msgid "Follow the road for the next %s" +msgstr "Der Straße %s folgen" -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " -msgstr "straf " +msgid "Enter the roundabout soon" +msgstr "In Kürze in den Kreisverkehr einfahren" -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " +#. TRANSLATORS: %s is the distance to the roundabout +#, c-format +msgid "Enter the roundabout %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" +msgstr "dann den Kreisverkehr an der %1$s %2$s verlassen" + +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "Leave the roundabout at the %1$s %2$s" +msgstr "Den Kreisverkehr an der %1$s %2$s verlassen" + +msgid "soon" +msgstr "in Kürze" + +msgid "now" +msgstr "jetzt" + +msgid "then" +msgstr "dann" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|right" msgstr "" -msgid "When possible, please turn around" -msgstr "Wenn möglich, bitte wenden" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|right" +msgstr "" -msgid "Enter the roundabout soon" -msgstr "In Kürze in den Kreisverkehr einfahren" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|left" +msgstr "" -#. TRANSLATORS: %s is the distance to the roundabout +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Enter the roundabout %s" +msgid "Merge %1$s%2$s|left" +msgstr "" + +msgid "on your left" msgstr "" +msgid "on your right" +msgstr "" + +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "then leave the roundabout at the %s" +msgid "Take exit %1$s %2$s %3$s" msgstr "" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "Leave the roundabout at the %s" +msgid "Take the exit %1$s %2$s%3$s" +msgstr "" + +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" msgstr "" +msgid "at exit" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "Follow the road for the next %s" -msgstr "Der Straße %s folgen" +msgid "then continue straight%1$s" +msgstr "" -msgid "soon" -msgstr "in Kürze" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep right%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep right %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "Rechts" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "links" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "einfach " + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "straf " -#. TRANSLATORS: First argument is the how manieth street to take, second the direction #, c-format msgid "Take the %1$s road to the %2$s" msgstr "Die %1$s Straße zur %2$s nehmen" @@ -229,32 +329,59 @@ msgstr "Die %1$s Straße zur %2$s nehmen" msgid "after %i roads" msgstr "nach %i Straßen" -msgid "now" -msgstr "jetzt" +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination +#, c-format +msgid "Turn %1$s%2$s %3$s%4$s" +msgstr "In %3$s %1$s%2$s %4$s abbiegen" + +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "" +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "then take the %1$s road to the %2$s" +msgid "Make a U-turn %1$s|left" msgstr "" -msgid "error" +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" msgstr "" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "Turn %1$s%2$s %3$s%4$s" +msgid "Make a U-turn %1$s|right" msgstr "" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination -#, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" msgstr "" +msgid "then you have reached your destination." +msgstr "Dann haben Sie Ihr Ziel erreicht" + +#. TRANSLATORS: the arg. is distance #, c-format msgid "You have reached your destination %s" msgstr "Sie haben Ihr Ziel erreicht %s" -msgid "then you have reached your destination." -msgstr "Dann haben Sie Ihr Ziel erreicht" +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "" + +msgid "Exit" +msgstr "Ausfahrt" #. Android resource: @strings/position_popup_title msgid "Position" @@ -1809,10 +1936,10 @@ msgstr "" msgid "Enter Coordinates" msgstr "" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/nl.po.in b/po/nl.po.in index 1f41b3fca..817fd491e 100644 --- a/po/nl.po.in +++ b/po/nl.po.in @@ -20,24 +20,21 @@ # jan https://launchpad.net/~jandegr1 # rob https://launchpad.net/~rvdb # worldcitizen https://launchpad.net/~joop-boonen - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2015-04-09 12:39+0000\n" "Last-Translator: jan <jandegr1@hotmail.com>\n" "Language-Team: afaber\n" +"Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"Language: \n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" -msgid "soon" -msgstr "straks" - msgid "Running from source directory\n" msgstr "Gestart vanuit de bronmap\n" @@ -153,30 +150,53 @@ msgid_plural "in %d kilometers" msgstr[0] "na één kilometer" msgstr[1] "na %d kilometer" -msgid "exit" -msgstr "afslag" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "" -msgid "into the ramp" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "" + +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "naar de oprit" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" -msgstr "%sde straat %s%s%s in" +msgid "%sinto %s%s%s" +msgstr "%sde %s%s%s in" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" +msgid "%sinto %s%s%s|masculine form" msgstr "%sde %s%s%s in" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" +msgid "%sinto %s%s%s|feminine form" msgstr "%sde %s%s%s in" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" +msgid "%sinto %s%s%s|neuter form" msgstr "%sde %s%s%s in" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) @@ -184,32 +204,17 @@ msgstr "%sde %s%s%s in" msgid "%sinto the %s" msgstr "%snaar de %s" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "rechts" - -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "links" - -#. TRANSLATORS: Don't forget the ending space -msgid "easily " -msgstr "flauw " - -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " -msgstr "scherp " - -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " -msgstr "zeer scherp " +msgid "When possible, please turn around" +msgstr "Indien mogelijk omkeren" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" msgstr "" -msgid "When possible, please turn around" -msgstr "Indien mogelijk omkeren" +#, c-format +msgid "Follow the road for the next %s" +msgstr "Volg de weg gedurende %s" msgid "Enter the roundabout soon" msgstr "U rijdt zodadelijk de rotonde op" @@ -219,19 +224,114 @@ msgstr "U rijdt zodadelijk de rotonde op" msgid "Enter the roundabout %s" msgstr "neem de rotonde %s" +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow #, c-format -msgid "then leave the roundabout at the %s" -msgstr "daarna de rotonde verlaten bij de %s" +msgid "then leave the roundabout at the %1$s %2$s" +msgstr "daarna de rotonde verlaten bij de %1$s %2$s" +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow #, c-format -msgid "Leave the roundabout at the %s" -msgstr "Verlaat de rotonde bij de %s" +msgid "Leave the roundabout at the %1$s %2$s" +msgstr "Verlaat de rotonde bij de %1$s %2$s" +msgid "soon" +msgstr "straks" + +msgid "now" +msgstr "nu" + +msgid "then" +msgstr "daarna" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "Follow the road for the next %s" -msgstr "Volg de weg gedurende %s" +msgid "then merge%1$s|right" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|right" +msgstr "" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|left" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|left" +msgstr "" + +msgid "on your left" +msgstr "" + +msgid "on your right" +msgstr "" + +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance +#, c-format +msgid "Take exit %1$s %2$s %3$s" +msgstr "" + +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination +#, c-format +msgid "Take the exit %1$s %2$s%3$s" +msgstr "" + +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" +msgstr "" + +msgid "at exit" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then continue straight%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep right%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep right %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "rechts" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "links" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "flauw " + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "scherp " -#. TRANSLATORS: First argument is the how manieth street to take, second the direction #, c-format msgid "Take the %1$s road to the %2$s" msgstr "Neem de %1$s straat naar %2$s" @@ -240,32 +340,59 @@ msgstr "Neem de %1$s straat naar %2$s" msgid "after %i roads" msgstr "na %i wegen" -msgid "now" -msgstr "nu" - +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination #, c-format -msgid "then take the %1$s road to the %2$s" -msgstr "neem daarna de %1$s straat naar %2$s" +msgid "Turn %1$s%2$s %3$s%4$s" +msgstr "Ga %3$s %1$s naar %2$s %4$s" -msgid "error" -msgstr "" +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "daarna omkeren" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "Turn %1$s%2$s %3$s%4$s" -msgstr "Ga %3$s%1$s naar %2$s%4$s" +msgid "Make a U-turn %1$s|left" +msgstr "Omkeren %1$s" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" +msgstr "daarna omkeren" + +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" -msgstr "daarna ga %3$s%1$s naar %2$s%4$s" +msgid "Make a U-turn %1$s|right" +msgstr "Omkeren %1$s" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" +msgstr "volg" + +msgid "then you have reached your destination." +msgstr "daarna heeft u uw bestemming bereikt." +#. TRANSLATORS: the arg. is distance #, c-format msgid "You have reached your destination %s" msgstr "Bestemming %s bereikt" -msgid "then you have reached your destination." -msgstr "daarna heeft u uw bestemming bereikt." +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "Knooppunt" + +msgid "Exit" +msgstr "Afslag" #. Android resource: @strings/position_popup_title msgid "Position" @@ -1825,10 +1952,10 @@ msgstr "route punten" msgid "Enter Coordinates" msgstr "voer coordinaten in" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" @@ -2660,5 +2787,5 @@ msgid "" "Should we ask the system to show voice download dialog?" msgstr "" "Navit kan elke tekst naar spraak-engine geïnstalleerd op uw apparaat " -"gebruiken . De momenteel geselecteerde engine meldt dat het niet in uw taal " -"kan spreken . Wil U de spraak download dialoog van Uw toestel starten?" +"gebruiken. De momenteel geselecteerde engine meldt dat het niet in uw taal " +"kan spreken. Wil U de spraak download dialoog van Uw toestel starten?" diff --git a/po/nn.po.in b/po/nn.po.in index 3e58d6bcb..6622d8bb0 100644 --- a/po/nn.po.in +++ b/po/nn.po.in @@ -4,19 +4,19 @@ # Many thanks to the contributors of this translation: # KaZeR https://launchpad.net/~kazer # Skippern https://launchpad.net/~gay-today - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2013-09-28 01:44+0000\n" "Last-Translator: KaZeR <Unknown>\n" "Language-Team: Norwegian Nynorsk <nn@li.org>\n" +"Language: nn\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"Language: nn\n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -134,30 +134,53 @@ msgid_plural "in %d kilometers" msgstr[0] "om ein kilometer" msgstr[1] "om %d kilometer" -msgid "exit" -msgstr "avkjøyring" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "" -msgid "into the ramp" +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" +msgid "%sinto %s%s%s" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" +msgid "%sinto %s%s%s|masculine form" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" +msgid "%sinto %s%s%s|feminine form" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" +msgid "%sinto %s%s%s|neuter form" msgstr "" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) @@ -165,57 +188,134 @@ msgstr "" msgid "%sinto the %s" msgstr "%sinn på %s" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "høgre" +msgid "When possible, please turn around" +msgstr "" -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "venstre" +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" +msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "easily " -msgstr "slakt " +#, c-format +msgid "Follow the road for the next %s" +msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " -msgstr "krapt " +msgid "Enter the roundabout soon" +msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " +#. TRANSLATORS: %s is the distance to the roundabout +#, c-format +msgid "Enter the roundabout %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" msgstr "" -msgid "When possible, please turn around" +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "Leave the roundabout at the %1$s %2$s" msgstr "" -msgid "Enter the roundabout soon" +msgid "soon" +msgstr "snart" + +msgid "now" +msgstr "no" + +msgid "then" msgstr "" -#. TRANSLATORS: %s is the distance to the roundabout +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "Enter the roundabout %s" +msgid "then merge%1$s|right" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "then leave the roundabout at the %s" +msgid "Merge %1$s%2$s|right" msgstr "" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Leave the roundabout at the %s" +msgid "then merge%1$s|left" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Follow the road for the next %s" +msgid "Merge %1$s%2$s|left" msgstr "" -msgid "soon" -msgstr "snart" +msgid "on your left" +msgstr "" + +msgid "on your right" +msgstr "" + +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance +#, c-format +msgid "Take exit %1$s %2$s %3$s" +msgstr "" + +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination +#, c-format +msgid "Take the exit %1$s %2$s%3$s" +msgstr "" + +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" +msgstr "" + +msgid "at exit" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then continue straight%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep right%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep right %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "høgre" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "venstre" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "slakt " + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "krapt " -#. TRANSLATORS: First argument is the how manieth street to take, second the direction #, c-format msgid "Take the %1$s road to the %2$s" msgstr "Ta den %1$s vegen mot %2$s" @@ -224,33 +324,60 @@ msgstr "Ta den %1$s vegen mot %2$s" msgid "after %i roads" msgstr "" -msgid "now" -msgstr "no" - +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination #, c-format -msgid "then take the %1$s road to the %2$s" +msgid "Turn %1$s%2$s %3$s%4$s" msgstr "" -msgid "error" +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" msgstr "" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "Turn %1$s%2$s %3$s%4$s" +msgid "Make a U-turn %1$s|left" msgstr "" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" +msgstr "" + +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +msgid "Make a U-turn %1$s|right" msgstr "" +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" +msgstr "" + +msgid "then you have reached your destination." +msgstr "" + +#. TRANSLATORS: the arg. is distance #, c-format msgid "You have reached your destination %s" msgstr "" -msgid "then you have reached your destination." +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" msgstr "" +msgid "Exit" +msgstr "Avkjøyring" + #. Android resource: @strings/position_popup_title msgid "Position" msgstr "Posisjon" @@ -1804,10 +1931,10 @@ msgstr "" msgid "Enter Coordinates" msgstr "" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/pl.po.in b/po/pl.po.in index 388786ab3..015d7dbb7 100644 --- a/po/pl.po.in +++ b/po/pl.po.in @@ -15,20 +15,20 @@ # linek10 https://launchpad.net/~zbyszekm # skrzat https://launchpad.net/~skrzat # Łukasz Semler https://launchpad.net/~lukasz-semler - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2013-11-04 21:48+0000\n" "Last-Translator: DarkAlexis <Unknown>\n" "Language-Team: Translators\n" +"Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2;\n" -"Language: \n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -150,63 +150,71 @@ msgstr[0] "za jeden kilometr" msgstr[1] "za %d kilometry" msgstr[2] "za %d kilometrów" -msgid "exit" -msgstr "zjazd" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "" -msgid "into the ramp" +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "na wjazd" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" -msgstr "%s w ulicę %s%s%s" +msgid "%sinto %s%s%s" +msgstr "%sw %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" -msgstr "%sw %s%s%s|męski rodzaj" +msgid "%sinto %s%s%s|masculine form" +msgstr "%sw %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" -msgstr "%sw %s%s%s|żeński rodzaj" +msgid "%sinto %s%s%s|feminine form" +msgstr "%sw %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" -msgstr "%sw %s%s%s|neutralny rodzaj" +msgid "%sinto %s%s%s|neuter form" +msgstr "%sw %s%s%s" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) #, c-format msgid "%sinto the %s" msgstr "%s do %s" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "w prawo" - -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "w lewo" - -#. TRANSLATORS: Don't forget the ending space -msgid "easily " -msgstr "lekko " - -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " -msgstr "silnie " - -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " -msgstr "" +msgid "When possible, please turn around" +msgstr "Zawróc, gdy będzie to możliwe" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" msgstr "" -msgid "When possible, please turn around" -msgstr "Zawróc, gdy będzie to możliwe" +#, c-format +msgid "Follow the road for the next %s" +msgstr "Jedź tą drogą do następnego %s" msgid "Enter the roundabout soon" msgstr "Wjazd na rondo wkrótce" @@ -216,57 +224,176 @@ msgstr "Wjazd na rondo wkrótce" msgid "Enter the roundabout %s" msgstr "Wjazd na rondo %s" +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" +msgstr "następnie zjedź z ronda na %1$s %2$s" + +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "Leave the roundabout at the %1$s %2$s" +msgstr "Zjedź z ronda na %1$s %2$s" + +msgid "soon" +msgstr "wkrótce" + +msgid "now" +msgstr "teraz" + +msgid "then" +msgstr "następnie" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "then leave the roundabout at the %s" +msgid "then merge%1$s|right" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "Leave the roundabout at the %s" +msgid "Merge %1$s%2$s|right" msgstr "" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Follow the road for the next %s" -msgstr "Jedź tą drogą do następnego %s" +msgid "then merge%1$s|left" +msgstr "" -msgid "soon" -msgstr "wkrótce" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|left" +msgstr "" -#. TRANSLATORS: First argument is the how manieth street to take, second the direction +msgid "on your left" +msgstr "" + +msgid "on your right" +msgstr "" + +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "Take the %1$s road to the %2$s" -msgstr "Jedź drogą %1$s do %2$s" +msgid "Take exit %1$s %2$s %3$s" +msgstr "" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "after %i roads" -msgstr "po drodze %i" +msgid "Take the exit %1$s %2$s%3$s" +msgstr "" -msgid "now" -msgstr "teraz" +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" +msgstr "" +msgid "at exit" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "then take the %1$s road to the %2$s" +msgid "then continue straight%1$s" msgstr "" -msgid "error" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" msgstr "" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "Turn %1$s%2$s %3$s%4$s" +msgid "then keep right%1$s" msgstr "" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +msgid "Keep right %1$s%2$s%3$s" msgstr "" +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "You have reached your destination %s" -msgstr "Dotarłeś do celu %s" +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "w prawo" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "w lewo" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "lekko " + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "silnie " + +#, c-format +msgid "Take the %1$s road to the %2$s" +msgstr "Jedź drogą %1$s do %2$s" + +#, c-format +msgid "after %i roads" +msgstr "po drodze %i" + +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination +#, c-format +msgid "Turn %1$s%2$s %3$s%4$s" +msgstr "Skręć %1$s%2$s %3$s%4$s" + +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "następnie zawróc" + +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. +#, c-format +msgid "Make a U-turn %1$s|left" +msgstr "Zawróc %1$s" + +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" +msgstr "następnie zawróc" + +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. +#, c-format +msgid "Make a U-turn %1$s|right" +msgstr "Zawróc %1$s" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" +msgstr "" msgid "then you have reached your destination." msgstr "następnie dojechałeś do celu." +#. TRANSLATORS: the arg. is distance +#, c-format +msgid "You have reached your destination %s" +msgstr "Dotarłeś do celu %s" + +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "Węzeł" + +msgid "Exit" +msgstr "Zjazd" + #. Android resource: @strings/position_popup_title msgid "Position" msgstr "Położenie" @@ -1822,10 +1949,10 @@ msgstr "Punkty trasy" msgid "Enter Coordinates" msgstr "Wprowadź współrzędne" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/pms.po.in b/po/pms.po.in index dc8b2115f..27d952ab8 100644 --- a/po/pms.po.in +++ b/po/pms.po.in @@ -3,19 +3,19 @@ # This file is distributed under the same license as the navit package. # Many thanks to the contributors of this translation: # Simone Briatore https://launchpad.net/~simone-bri - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2012-09-14 10:28+0000\n" "Last-Translator: Simone Briatore <simone.bri@alice.it>\n" "Language-Team: Piemontese <pms@li.org>\n" +"Language: pms\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"Language: \n" msgid "Running from source directory\n" msgstr "" @@ -132,30 +132,53 @@ msgid_plural "in %d kilometers" msgstr[0] "" msgstr[1] "" -msgid "exit" -msgstr "surtia" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "" -msgid "into the ramp" +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "in tla rampa" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" +msgid "%sinto %s%s%s" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" +msgid "%sinto %s%s%s|masculine form" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" +msgid "%sinto %s%s%s|feminine form" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" +msgid "%sinto %s%s%s|neuter form" msgstr "" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) @@ -163,92 +186,196 @@ msgstr "" msgid "%sinto the %s" msgstr "" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" +msgid "When possible, please turn around" msgstr "" -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "easily " +#, c-format +msgid "Follow the road for the next %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " +msgid "Enter the roundabout soon" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " +#. TRANSLATORS: %s is the distance to the roundabout +#, c-format +msgid "Enter the roundabout %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" msgstr "" -msgid "When possible, please turn around" +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "Leave the roundabout at the %1$s %2$s" msgstr "" -msgid "Enter the roundabout soon" +msgid "soon" msgstr "" -#. TRANSLATORS: %s is the distance to the roundabout +msgid "now" +msgstr "" + +msgid "then" +msgstr "" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "Enter the roundabout %s" +msgid "then merge%1$s|right" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "then leave the roundabout at the %s" +msgid "Merge %1$s%2$s|right" msgstr "" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Leave the roundabout at the %s" +msgid "then merge%1$s|left" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Follow the road for the next %s" +msgid "Merge %1$s%2$s|left" msgstr "" -msgid "soon" +msgid "on your left" +msgstr "" + +msgid "on your right" msgstr "" -#. TRANSLATORS: First argument is the how manieth street to take, second the direction +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "Take the %1$s road to the %2$s" +msgid "Take exit %1$s %2$s %3$s" msgstr "" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "after %i roads" +msgid "Take the exit %1$s %2$s%3$s" msgstr "" -msgid "now" +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" +msgstr "" + +msgid "at exit" msgstr "" +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "then take the %1$s road to the %2$s" +msgid "then continue straight%1$s" msgstr "" -msgid "error" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep right%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep right %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep left%1$s" msgstr "" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "" + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "" + +#, c-format +msgid "Take the %1$s road to the %2$s" +msgstr "" + +#, c-format +msgid "after %i roads" +msgstr "" + +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination #, c-format msgid "Turn %1$s%2$s %3$s%4$s" msgstr "" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "" + +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +msgid "Make a U-turn %1$s|left" msgstr "" +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" +msgstr "" + +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "You have reached your destination %s" +msgid "Make a U-turn %1$s|right" +msgstr "" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" msgstr "" msgid "then you have reached your destination." msgstr "" +#. TRANSLATORS: the arg. is distance +#, c-format +msgid "You have reached your destination %s" +msgstr "" + +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "" + +msgid "Exit" +msgstr "Surtia" + #. Android resource: @strings/position_popup_title msgid "Position" msgstr "" @@ -1802,10 +1929,10 @@ msgstr "" msgid "Enter Coordinates" msgstr "" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/pt.po.in b/po/pt.po.in index a9c9a606b..401058041 100644 --- a/po/pt.po.in +++ b/po/pt.po.in @@ -14,19 +14,19 @@ # brukutu https://launchpad.net/~brukutu99 # eSkiSo https://launchpad.net/~wise-gdr # lezurdis https://launchpad.net/~f-dos-santos - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2013-12-01 01:04+0000\n" "Last-Translator: Sérgio Marques <Unknown>\n" "Language-Team: Portuguese <pt@li.org>\n" +"Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"Language: pt\n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -144,63 +144,71 @@ msgid_plural "in %d kilometers" msgstr[0] "a um quilómetro" msgstr[1] "a %d quilómetros" -msgid "exit" -msgstr "sair" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" -msgid "into the ramp" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "" + +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "na subida" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" -msgstr "%s para a rua %s%s%s" +msgid "%sinto %s%s%s" +msgstr "%spara a rua %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" +msgid "%sinto %s%s%s|masculine form" msgstr "%s no %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" +msgid "%sinto %s%s%s|feminine form" msgstr "%s na %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" +msgid "%sinto %s%s%s|neuter form" msgstr "%s na %s%s%s" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) #, c-format msgid "%sinto the %s" -msgstr "%s na %s" - -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "direita" - -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "esquerda" - -#. TRANSLATORS: Don't forget the ending space -msgid "easily " -msgstr "facilmente " - -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " -msgstr "veementemente " +msgstr "%sna %s" -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " -msgstr "" +msgid "When possible, please turn around" +msgstr "Quando for possível, inverta o sentido de marcha" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" msgstr "" -msgid "When possible, please turn around" -msgstr "Quando for possível, inverta o sentido de marcha" +#, c-format +msgid "Follow the road for the next %s" +msgstr "Siga a estrada para a próxima %s" msgid "Enter the roundabout soon" msgstr "Entre na próxima rotunda" @@ -210,57 +218,176 @@ msgstr "Entre na próxima rotunda" msgid "Enter the roundabout %s" msgstr "Entre na próxima rotunda a %s" +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" +msgstr "e saia da rotunda na %1$s %2$s" + +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow #, c-format -msgid "then leave the roundabout at the %s" +msgid "Leave the roundabout at the %1$s %2$s" +msgstr "Saia da rotunda na %1$s %2$s" + +msgid "soon" +msgstr "logo" + +msgid "now" +msgstr "agora" + +msgid "then" +msgstr "depois" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|right" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "Leave the roundabout at the %s" +msgid "Merge %1$s%2$s|right" msgstr "" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Follow the road for the next %s" -msgstr "Siga a estrada para a próxima %s" +msgid "then merge%1$s|left" +msgstr "" -msgid "soon" -msgstr "logo" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|left" +msgstr "" + +msgid "on your left" +msgstr "" -#. TRANSLATORS: First argument is the how manieth street to take, second the direction +msgid "on your right" +msgstr "" + +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "Take the %1$s road to the %2$s" -msgstr "Apanhe a %1$s estrada para a %2$s" +msgid "Take exit %1$s %2$s %3$s" +msgstr "" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "after %i roads" -msgstr "depois de %i estradas" +msgid "Take the exit %1$s %2$s%3$s" +msgstr "" -msgid "now" -msgstr "agora" +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" +msgstr "" +msgid "at exit" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "then take the %1$s road to the %2$s" +msgid "then continue straight%1$s" msgstr "" -msgid "error" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" msgstr "" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "Turn %1$s%2$s %3$s%4$s" +msgid "then keep right%1$s" msgstr "" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +msgid "Keep right %1$s%2$s%3$s" msgstr "" +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "You have reached your destination %s" -msgstr "Chega ao seu destino em %s" +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "direita" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "esquerda" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "facilmente " + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "veementemente " + +#, c-format +msgid "Take the %1$s road to the %2$s" +msgstr "Apanhe a %1$s estrada para a %2$s" + +#, c-format +msgid "after %i roads" +msgstr "depois de %i estradas" + +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination +#, c-format +msgid "Turn %1$s%2$s %3$s%4$s" +msgstr "Vire %1$s%2$s %3$s%4$s" + +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "depois inverta o sentido de marcha" + +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. +#, c-format +msgid "Make a U-turn %1$s|left" +msgstr "Inverta o sentido de marcha %1$s" + +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" +msgstr "depois inverta o sentido de marcha" + +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. +#, c-format +msgid "Make a U-turn %1$s|right" +msgstr "Inverta o sentido de marcha %1$s" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" +msgstr "" msgid "then you have reached your destination." msgstr "depois chegou ao seu destino." +#. TRANSLATORS: the arg. is distance +#, c-format +msgid "You have reached your destination %s" +msgstr "Chega ao seu destino em %s" + +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "Trevo" + +msgid "Exit" +msgstr "Saída" + #. Android resource: @strings/position_popup_title msgid "Position" msgstr "Posição" @@ -1814,10 +1941,10 @@ msgstr "Pontos" msgid "Enter Coordinates" msgstr "Introduzir coordenadas" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/pt_BR.po.in b/po/pt_BR.po.in index 8030e7588..5b9d5760b 100644 --- a/po/pt_BR.po.in +++ b/po/pt_BR.po.in @@ -18,19 +18,19 @@ # hvera https://launchpad.net/~hamilton-listas # paulohm https://launchpad.net/~paulohm # pingflood https://launchpad.net/~pingflood - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2015-04-03 01:58+0000\n" "Last-Translator: Jairo Roberto Duarte <Unknown>\n" "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n" +"Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"Language: pt_BR\n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -148,30 +148,53 @@ msgid_plural "in %d kilometers" msgstr[0] "em um quilômetro" msgstr[1] "em %d quilômetros" -msgid "exit" -msgstr "saída" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" -msgid "into the ramp" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "" + +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "na rampa" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" +msgid "%sinto %s%s%s" msgstr "%sna %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" +msgid "%sinto %s%s%s|masculine form" msgstr "%sno %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" +msgid "%sinto %s%s%s|feminine form" msgstr "%sna %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" +msgid "%sinto %s%s%s|neuter form" msgstr "%sem %s%s%s" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) @@ -179,32 +202,17 @@ msgstr "%sem %s%s%s" msgid "%sinto the %s" msgstr "%sna %s" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "à direita" - -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "à esquerda" - -#. TRANSLATORS: Don't forget the ending space -msgid "easily " -msgstr "levemente " - -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " -msgstr "fortemente " - -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " -msgstr "" +msgid "When possible, please turn around" +msgstr "Quando possível, favor retornar" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" msgstr "" -msgid "When possible, please turn around" -msgstr "Quando possível, favor retornar" +#, c-format +msgid "Follow the road for the next %s" +msgstr "Continue na via por %s" msgid "Enter the roundabout soon" msgstr "Entre na rotatória em seguida" @@ -214,57 +222,176 @@ msgstr "Entre na rotatória em seguida" msgid "Enter the roundabout %s" msgstr "Entre na rotatória %s" +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" +msgstr "em seguida deixe a rotatória no %1$s %2$s" + +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow #, c-format -msgid "then leave the roundabout at the %s" +msgid "Leave the roundabout at the %1$s %2$s" +msgstr "Deixe a rotatória na %1$s %2$s" + +msgid "soon" +msgstr "em breve" + +msgid "now" +msgstr "agora" + +msgid "then" +msgstr "então" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|right" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "Leave the roundabout at the %s" +msgid "Merge %1$s%2$s|right" msgstr "" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Follow the road for the next %s" -msgstr "Continue na via por %s" +msgid "then merge%1$s|left" +msgstr "" -msgid "soon" -msgstr "em breve" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|left" +msgstr "" + +msgid "on your left" +msgstr "" -#. TRANSLATORS: First argument is the how manieth street to take, second the direction +msgid "on your right" +msgstr "" + +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "Take the %1$s road to the %2$s" -msgstr "Pegue a %1$s via para a %2$s" +msgid "Take exit %1$s %2$s %3$s" +msgstr "" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "after %i roads" -msgstr "após %i vias" +msgid "Take the exit %1$s %2$s%3$s" +msgstr "" -msgid "now" -msgstr "agora" +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" +msgstr "" +msgid "at exit" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "then take the %1$s road to the %2$s" +msgid "then continue straight%1$s" msgstr "" -msgid "error" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" msgstr "" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "Turn %1$s%2$s %3$s%4$s" +msgid "then keep right%1$s" msgstr "" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +msgid "Keep right %1$s%2$s%3$s" msgstr "" +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "You have reached your destination %s" -msgstr "Você chegará ao destino %s" +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "à direita" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "à esquerda" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "levemente " + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "fortemente " + +#, c-format +msgid "Take the %1$s road to the %2$s" +msgstr "Pegue a %1$s via para a %2$s" + +#, c-format +msgid "after %i roads" +msgstr "após %i vias" + +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination +#, c-format +msgid "Turn %1$s%2$s %3$s%4$s" +msgstr "Vire %1$s%2$s %3$s%4$s" + +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "então retornar" + +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. +#, c-format +msgid "Make a U-turn %1$s|left" +msgstr "Retornar %1$s" + +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" +msgstr "então retornar" + +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. +#, c-format +msgid "Make a U-turn %1$s|right" +msgstr "Retornar %1$s" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" +msgstr "" msgid "then you have reached your destination." msgstr "então você chegará ao destino." +#. TRANSLATORS: the arg. is distance +#, c-format +msgid "You have reached your destination %s" +msgstr "Você chegará ao destino %s" + +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "Trevo" + +msgid "Exit" +msgstr "Saída" + #. Android resource: @strings/position_popup_title msgid "Position" msgstr "Posição" @@ -1831,10 +1958,10 @@ msgstr "Pontos da via" msgid "Enter Coordinates" msgstr "Digite as coordenadas" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/ro.po.in b/po/ro.po.in index a4a986b10..b202d1962 100644 --- a/po/ro.po.in +++ b/po/ro.po.in @@ -11,20 +11,20 @@ # dodobird https://launchpad.net/~dorinnirod # fasiol https://launchpad.net/~fasiol2 # igorashu https://launchpad.net/~ionut-soare - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2013-09-28 01:44+0000\n" "Last-Translator: KaZeR <Unknown>\n" "Language-Team: Romanian <ro@li.org>\n" +"Language: ro\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 " "== 0) && (n != 0))) ? 2: 1));\n" -"Language: ro\n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -144,88 +144,188 @@ msgstr[0] "într-un kilometru" msgstr[1] "în %d kilometri" msgstr[2] "în %d de kilometri" -msgid "exit" -msgstr "ieșire" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "" -msgid "into the ramp" +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "pe rampă" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" -msgstr "%s pe strada %s%s%s" +msgid "%sinto %s%s%s" +msgstr "%spe %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" -msgstr "%s pe %s%s%s" +msgid "%sinto %s%s%s|masculine form" +msgstr "%spe %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" -msgstr "%s pe %s%s%s" +msgid "%sinto %s%s%s|feminine form" +msgstr "%spe %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" -msgstr "%s pe %s%s%s" +msgid "%sinto %s%s%s|neuter form" +msgstr "%spe %s%s%s" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) #, c-format msgid "%sinto the %s" -msgstr "%s spre %s" +msgstr "%sspre %s" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "la dreapta" +msgid "When possible, please turn around" +msgstr "Când este posibil, întoarceţi" -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "la stânga" +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" +msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "easily " -msgstr "uşor " +#, c-format +msgid "Follow the road for the next %s" +msgstr "Urmați drumul pentru încă %s" -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " -msgstr "strâns " +msgid "Enter the roundabout soon" +msgstr "Intrați în curând în giratoriu" + +#. TRANSLATORS: %s is the distance to the roundabout +#, c-format +msgid "Enter the roundabout %s" +msgstr "Intrați în giratoriu %s" + +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" +msgstr "apoi ieșiți din giratoriu la %1$s %2$s" + +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "Leave the roundabout at the %1$s %2$s" +msgstr "Ieșiți din giratoriu la %1$s %2$s" -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " +msgid "soon" +msgstr "curând" + +msgid "now" +msgstr "acum" + +msgid "then" +msgstr "apoi" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|right" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|right" msgstr "" -msgid "When possible, please turn around" -msgstr "Când este posibil, întoarceţi" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|left" +msgstr "" -msgid "Enter the roundabout soon" -msgstr "Intrați în curând în giratoriu" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|left" +msgstr "" -#. TRANSLATORS: %s is the distance to the roundabout +msgid "on your left" +msgstr "" + +msgid "on your right" +msgstr "" + +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "Enter the roundabout %s" +msgid "Take exit %1$s %2$s %3$s" msgstr "" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "then leave the roundabout at the %s" +msgid "Take the exit %1$s %2$s%3$s" +msgstr "" + +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" msgstr "" +msgid "at exit" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "Leave the roundabout at the %s" +msgid "then continue straight%1$s" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination #, c-format -msgid "Follow the road for the next %s" -msgstr "Urmați drumul pentru încă %s" +msgid "Continue straight %1$s%2$s%3$s" +msgstr "" -msgid "soon" -msgstr "curând" +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep right%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep right %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "la dreapta" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "la stânga" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "uşor " + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "strâns " -#. TRANSLATORS: First argument is the how manieth street to take, second the direction #, c-format msgid "Take the %1$s road to the %2$s" msgstr "Virați %2s pe %1s stradă" @@ -234,32 +334,59 @@ msgstr "Virați %2s pe %1s stradă" msgid "after %i roads" msgstr "după %i străzi" -msgid "now" -msgstr "acum" - +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination #, c-format -msgid "then take the %1$s road to the %2$s" -msgstr "" +msgid "Turn %1$s%2$s %3$s%4$s" +msgstr "Virați %1$s%2$s %3$s%4$s" -msgid "error" -msgstr "" +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "apoi întoarceţi" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "Turn %1$s%2$s %3$s%4$s" -msgstr "" +msgid "Make a U-turn %1$s|left" +msgstr "Întoarceţi %1$s" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" +msgstr "apoi întoarceţi" + +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +msgid "Make a U-turn %1$s|right" +msgstr "Întoarceţi %1$s" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" msgstr "" +msgid "then you have reached your destination." +msgstr "apoi ajungeți la destinație." + +#. TRANSLATORS: the arg. is distance #, c-format msgid "You have reached your destination %s" msgstr "Ați ajuns la destinație %s" -msgid "then you have reached your destination." -msgstr "apoi ajungeți la destinație." +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "Nod" + +msgid "Exit" +msgstr "Ieșire" #. Android resource: @strings/position_popup_title msgid "Position" @@ -1814,10 +1941,10 @@ msgstr "" msgid "Enter Coordinates" msgstr "" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/ru.po.in b/po/ru.po.in index 1cfa21cdc..3d3308d9d 100644 --- a/po/ru.po.in +++ b/po/ru.po.in @@ -25,20 +25,20 @@ # tryagain https://launchpad.net/~mdankov # zcc https://launchpad.net/~zcc # Павел https://launchpad.net/~pavel-sgn - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2015-04-20 20:06+0000\n" "Last-Translator: tryagain <mdankov@yandex.ru>\n" "Language-Team: Rustam T. Usmanov\n" +"Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " -"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"Language: ru\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -160,64 +160,72 @@ msgstr[0] "через %d километр" msgstr[1] "%d километра" msgstr[2] "%d километров" -msgid "exit" -msgstr "съезд" - -msgid "into the ramp" -msgstr "съезд на" - -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name #, c-format -msgid "%sinto the street %s%s%s" -msgstr "%s на улицу %s%s%s" +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name #, c-format -msgid "%sinto the %s%s%s|male form" -msgstr "%s на %s%s%s" +msgid "%1$sonto %2$s" +msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" -msgstr "%s на %s%s%s" +msgid "%1$sonto %2$s|masculine form" +msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" -msgstr "%s на %s%s%s" +msgid "%1$sonto %2$s|feminine form" +msgstr "" -#. TRANSLATORS: gives the name of the next road to turn into (into the E17) +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s" -msgstr "%s на %s" +msgid "%1$sonto %2$s|neuter form" +msgstr "" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "направо" +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" +msgstr "съезд на" -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "налево" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name +#, c-format +msgid "%sinto %s%s%s" +msgstr "%sна %s%s%s" -#. TRANSLATORS: Don't forget the ending space -msgid "easily " -msgstr "немного " +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%sinto %s%s%s|masculine form" +msgstr "%sна %s%s%s" -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " -msgstr "круто " +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%sinto %s%s%s|feminine form" +msgstr "%sна %s%s%s" -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " -msgstr "очень круто " +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%sinto %s%s%s|neuter form" +msgstr "%sна %s%s%s" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " -msgstr "неизвестно " +#. TRANSLATORS: gives the name of the next road to turn into (into the E17) +#, c-format +msgid "%sinto the %s" +msgstr "%sна %s" msgid "When possible, please turn around" msgstr "Развернитесь, пожалуйста, если это возможно" +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" +msgstr "" + +#, c-format +msgid "Follow the road for the next %s" +msgstr "Двигайтесь по дороге следующие %s" + msgid "Enter the roundabout soon" msgstr "Скоро круговое движение" @@ -226,22 +234,114 @@ msgstr "Скоро круговое движение" msgid "Enter the roundabout %s" msgstr "Через %s круговое движение" +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow #, c-format -msgid "then leave the roundabout at the %s" -msgstr "потом съезжайте с кругового движения на %s" +msgid "then leave the roundabout at the %1$s %2$s" +msgstr "потом съезжайте с кругового движения на %1$s %2$s" +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow #, c-format -msgid "Leave the roundabout at the %s" -msgstr "Съезжайте с кругового движения на %s" - -#, c-format -msgid "Follow the road for the next %s" -msgstr "Двигайтесь по дороге следующие %s" +msgid "Leave the roundabout at the %1$s %2$s" +msgstr "Съезжайте с кругового движения на %1$s %2$s" msgid "soon" msgstr "скоро" -#. TRANSLATORS: First argument is the how manieth street to take, second the direction +msgid "now" +msgstr "сейчас" + +msgid "then" +msgstr "потом" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|right" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|right" +msgstr "" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|left" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|left" +msgstr "" + +msgid "on your left" +msgstr "" + +msgid "on your right" +msgstr "" + +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance +#, c-format +msgid "Take exit %1$s %2$s %3$s" +msgstr "" + +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination +#, c-format +msgid "Take the exit %1$s %2$s%3$s" +msgstr "" + +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" +msgstr "" + +msgid "at exit" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then continue straight%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep right%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep right %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "направо" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "налево" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "немного " + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "круто " + #, c-format msgid "Take the %1$s road to the %2$s" msgstr "Выезжайте на %1$s дорогу в направлении %2$s" @@ -250,32 +350,59 @@ msgstr "Выезжайте на %1$s дорогу в направлении %2$s msgid "after %i roads" msgstr "после %i дорог" -msgid "now" -msgstr "сейчас" - +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination #, c-format -msgid "then take the %1$s road to the %2$s" -msgstr "затем выезжайте на дорогу %1$s в направлении %2$s" +msgid "Turn %1$s%2$s %3$s%4$s" +msgstr "Сверните %1$s%2$s %3$s%4$s" -msgid "error" -msgstr "ошибка" +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "потом развернитесь" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "Turn %1$s%2$s %3$s%4$s" -msgstr "Сверните %1$s%2$s %3$s%4$s" +msgid "Make a U-turn %1$s|left" +msgstr "Развернитесь %1$s" + +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" +msgstr "потом развернитесь" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" -msgstr "после чего поверните %1$s%2$s на %3$s%4$s" +msgid "Make a U-turn %1$s|right" +msgstr "Развернитесь %1$s" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" +msgstr "" + +msgid "then you have reached your destination." +msgstr "после чего вы прибудете в пункт назначения" +#. TRANSLATORS: the arg. is distance #, c-format msgid "You have reached your destination %s" msgstr "Вы прибыли в пункт назначения %s" -msgid "then you have reached your destination." -msgstr "после чего вы прибудете в пункт назначения" +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "Развязка" + +msgid "Exit" +msgstr "Съезд" #. Android resource: @strings/position_popup_title msgid "Position" @@ -1832,10 +1959,10 @@ msgstr "Маршрутные точки" msgid "Enter Coordinates" msgstr "Введите координаты" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/sc.po.in b/po/sc.po.in index bfe58fcb0..053fc9f36 100644 --- a/po/sc.po.in +++ b/po/sc.po.in @@ -3,19 +3,19 @@ # This file is distributed under the same license as the navit package. # Many thanks to the contributors of this translation: # Rex Sanna https://launchpad.net/~rex-sanna - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2011-02-05 18:46+0000\n" "Last-Translator: Rex Sanna <Unknown>\n" "Language-Team: Sardinian <sc@li.org>\n" +"Language: sc\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n!=1;\n" -"Language: sc\n" msgid "Running from source directory\n" msgstr "Leghende dae sos sorgentese\n" @@ -132,88 +132,188 @@ msgid_plural "in %d kilometers" msgstr[0] "in unu chilometru" msgstr[1] "in %d chilometroso" -msgid "exit" -msgstr "essi" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" -msgid "into the ramp" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "" + +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "in sa rampa" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" -msgstr "%s in s\\'istrada %s %s %s" +msgid "%sinto %s%s%s" +msgstr "%sin s\\'istrada %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" -msgstr "%s in su %s%s%s" +msgid "%sinto %s%s%s|masculine form" +msgstr "%sin su %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" -msgstr "%s in sa %s%s%s" +msgid "%sinto %s%s%s|feminine form" +msgstr "%sin sa %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" -msgstr "%s in su %s%s%s" +msgid "%sinto %s%s%s|neuter form" +msgstr "%sin su %s%s%s" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) #, c-format msgid "%sinto the %s" -msgstr "%s in sa %s" +msgstr "%sin sa %s" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "destra" +msgid "When possible, please turn around" +msgstr "Commente possibile torra in daesecusu" -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "manca" +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" +msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "easily " -msgstr "fatzilmente " +#, c-format +msgid "Follow the road for the next %s" +msgstr "Sichi s'istrada fintzasa a %s" -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " -msgstr "fortemente " +msgid "Enter the roundabout soon" +msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " +#. TRANSLATORS: %s is the distance to the roundabout +#, c-format +msgid "Enter the roundabout %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" +msgstr "tando lassa sa rotatoria a %1$s %2$s" + +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "Leave the roundabout at the %1$s %2$s" +msgstr "Lassa sa rotatoria a %1$s %2$s" + +msgid "soon" +msgstr "prestu" + +msgid "now" +msgstr "como" + +msgid "then" +msgstr "tando" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|right" msgstr "" -msgid "When possible, please turn around" -msgstr "Commente possibile torra in daesecusu" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|right" +msgstr "" -msgid "Enter the roundabout soon" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|left" msgstr "" -#. TRANSLATORS: %s is the distance to the roundabout +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Enter the roundabout %s" +msgid "Merge %1$s%2$s|left" msgstr "" +msgid "on your left" +msgstr "" + +msgid "on your right" +msgstr "" + +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "then leave the roundabout at the %s" +msgid "Take exit %1$s %2$s %3$s" msgstr "" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "Leave the roundabout at the %s" +msgid "Take the exit %1$s %2$s%3$s" +msgstr "" + +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" +msgstr "" + +msgid "at exit" msgstr "" +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "Follow the road for the next %s" -msgstr "Sichi s'istrada fintzasa a %s" +msgid "then continue straight%1$s" +msgstr "" -msgid "soon" -msgstr "prestu" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep right%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep right %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "destra" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "manca" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "fatzilmente " + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "fortemente " -#. TRANSLATORS: First argument is the how manieth street to take, second the direction #, c-format msgid "Take the %1$s road to the %2$s" msgstr "Pica sa %1$s istrada a %2$s" @@ -222,32 +322,59 @@ msgstr "Pica sa %1$s istrada a %2$s" msgid "after %i roads" msgstr "dopu %i istradasa" -msgid "now" -msgstr "como" - +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination #, c-format -msgid "then take the %1$s road to the %2$s" -msgstr "" +msgid "Turn %1$s%2$s %3$s%4$s" +msgstr "Zira %1$s%2$s %3$s%4$s" -msgid "error" -msgstr "" +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "tando torra in daesecusu" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "Turn %1$s%2$s %3$s%4$s" -msgstr "" +msgid "Make a U-turn %1$s|left" +msgstr "Torra in daesecusu %1$s" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" +msgstr "tando torra in daesecusu" + +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" -msgstr "" +msgid "Make a U-turn %1$s|right" +msgstr "Torra in daesecusu %1$s" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" +msgstr "sichi" + +msgid "then you have reached your destination." +msgstr "tando ses arribbau" +#. TRANSLATORS: the arg. is distance #, c-format msgid "You have reached your destination %s" msgstr "Ses arribbau a %s" -msgid "then you have reached your destination." -msgstr "tando ses arribbau" +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "" + +msgid "Exit" +msgstr "Essi" #. Android resource: @strings/position_popup_title msgid "Position" @@ -1802,10 +1929,10 @@ msgstr "" msgid "Enter Coordinates" msgstr "" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/si.po.in b/po/si.po.in index 9f75dcdd7..b9c3c4361 100644 --- a/po/si.po.in +++ b/po/si.po.in @@ -3,19 +3,19 @@ # This file is distributed under the same license as the navit package. # Many thanks to the contributors of this translation: # සපුමල් බණ්ඩාර https://launchpad.net/~sapumalbandaraucsc - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2013-06-02 06:14+0000\n" "Last-Translator: සපුමල් බණ්ඩාර <sapumalbandaraucsc@gmail.com>\n" "Language-Team: Sinhalese <si@li.org>\n" +"Language: si\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"Language: \n" msgid "Running from source directory\n" msgstr "මූල ඩිරෙක්ටරියෙන් විචලනය වේ\n" @@ -132,88 +132,188 @@ msgid_plural "in %d kilometers" msgstr[0] "කිලෝ මීටරයකින්" msgstr[1] "කිලෝ මීටර %d කින්" -msgid "exit" -msgstr "පිටවුම" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "" -msgid "into the ramp" +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "රැම්පය තුළට" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" -msgstr "%s %s %s %s මාර්ගය තුළට" +msgid "%sinto %s%s%s" +msgstr "%s %s %s %s තුළට" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" -msgstr "%s %s %s %s තුළට | පුරුෂ ආකාරය" +msgid "%sinto %s%s%s|masculine form" +msgstr "%s %s %s %s තුළට" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" -msgstr "%s %s %s %s තුළට | ස්ත්රී ආකාරය" +msgid "%sinto %s%s%s|feminine form" +msgstr "%s %s %s %s තුළට" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" -msgstr "%s %s %s %s තුළට | උදාසීන ආකාරය" +msgid "%sinto %s%s%s|neuter form" +msgstr "%s %s %s %s තුළට" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) #, c-format msgid "%sinto the %s" msgstr "%s %s තුළට" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "දකුණ" +msgid "When possible, please turn around" +msgstr "හැකියාව ඇතිවිට දී, කරුණාකර හැරෙන්න." -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "වම" +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" +msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "easily " -msgstr "පහසුවෙන් " +#, c-format +msgid "Follow the road for the next %s" +msgstr "මීළඟ %s දක්වා මාර්ගය හඹායන්න." -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " -msgstr "ශක්තිමත් ලෙස " +msgid "Enter the roundabout soon" +msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " +#. TRANSLATORS: %s is the distance to the roundabout +#, c-format +msgid "Enter the roundabout %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" +msgstr "එවිට %1$s %2$s හිදී වටරවුමෙන් ඉවත්වන්න." + +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "Leave the roundabout at the %1$s %2$s" +msgstr "%1$s %2$s හිදී වටරවුමෙන් ඉවත්වන්න." + +msgid "soon" +msgstr "ලඟදීම" + +msgid "now" +msgstr "දැන්" + +msgid "then" msgstr "" -msgid "When possible, please turn around" -msgstr "හැකියාව ඇතිවිට දී, කරුණාකර හැරෙන්න." +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|right" +msgstr "" -msgid "Enter the roundabout soon" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|right" msgstr "" -#. TRANSLATORS: %s is the distance to the roundabout +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Enter the roundabout %s" +msgid "then merge%1$s|left" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|left" +msgstr "" + +msgid "on your left" msgstr "" +msgid "on your right" +msgstr "" + +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "then leave the roundabout at the %s" +msgid "Take exit %1$s %2$s %3$s" msgstr "" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "Leave the roundabout at the %s" +msgid "Take the exit %1$s %2$s%3$s" +msgstr "" + +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" msgstr "" +msgid "at exit" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "Follow the road for the next %s" -msgstr "මීළඟ %s දක්වා මාර්ගය හඹායන්න." +msgid "then continue straight%1$s" +msgstr "" -msgid "soon" -msgstr "ලඟදීම" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep right%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep right %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "දකුණ" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "වම" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "පහසුවෙන් " + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "ශක්තිමත් ලෙස " -#. TRANSLATORS: First argument is the how manieth street to take, second the direction #, c-format msgid "Take the %1$s road to the %2$s" msgstr "ගන්න %1$s මාර්ගය %2$s ට" @@ -222,32 +322,59 @@ msgstr "ගන්න %1$s මාර්ගය %2$s ට" msgid "after %i roads" msgstr "මාර්ග %i පසු" -msgid "now" -msgstr "දැන්" +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination +#, c-format +msgid "Turn %1$s%2$s %3$s%4$s" +msgstr "%1$s%2$s %3$s%4$s හරවන්න" + +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "" +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "then take the %1$s road to the %2$s" +msgid "Make a U-turn %1$s|left" msgstr "" -msgid "error" +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" msgstr "" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "Turn %1$s%2$s %3$s%4$s" +msgid "Make a U-turn %1$s|right" msgstr "" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination -#, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" msgstr "" +msgid "then you have reached your destination." +msgstr "එවිට ඔබ ඔබේ ගමනාන්තයට ළඟා වී ඇත." + +#. TRANSLATORS: the arg. is distance #, c-format msgid "You have reached your destination %s" msgstr "ඔබ ඔබේ ගමනාන්තය වන %s ට ළඟා වී ඇත." -msgid "then you have reached your destination." -msgstr "එවිට ඔබ ඔබේ ගමනාන්තයට ළඟා වී ඇත." +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "" + +msgid "Exit" +msgstr "පිටවුම" #. Android resource: @strings/position_popup_title msgid "Position" @@ -1802,10 +1929,10 @@ msgstr "" msgid "Enter Coordinates" msgstr "" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/sk.po.in b/po/sk.po.in index 18a9c8fc8..3c19d800e 100644 --- a/po/sk.po.in +++ b/po/sk.po.in @@ -10,19 +10,19 @@ # helix84 https://launchpad.net/~helix84 # kayle.sk https://launchpad.net/~kayle.sk # laznik https://launchpad.net/~orders-strings - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2014-11-15 22:08+0000\n" "Last-Translator: GizmoSK <gizmosk@gmail.com>\n" "Language-Team: Slovenčina\n" +"Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n" -"Language: sk\n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -144,63 +144,71 @@ msgstr[0] "o %d kilometrov" msgstr[1] "o jeden kilometer" msgstr[2] "o %d kilometre" -msgid "exit" -msgstr "výjazd" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" -msgid "into the ramp" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "" + +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "na privádzač" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" -msgstr "%s do ulice %s%s%s" +msgid "%sinto %s%s%s" +msgstr "%sdo %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" -msgstr "%s do %s%s%s" +msgid "%sinto %s%s%s|masculine form" +msgstr "%sdo %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" -msgstr "%s do %s%s%s" +msgid "%sinto %s%s%s|feminine form" +msgstr "%sdo %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" -msgstr "%s do %s%s%s" +msgid "%sinto %s%s%s|neuter form" +msgstr "%sdo %s%s%s" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) #, c-format msgid "%sinto the %s" msgstr "%s na %s" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "vpravo" - -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "vľavo" - -#. TRANSLATORS: Don't forget the ending space -msgid "easily " -msgstr "mierne " - -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " -msgstr "prudko " - -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " -msgstr "" +msgid "When possible, please turn around" +msgstr "Ak to bude možné, prosím, otočte sa" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" msgstr "" -msgid "When possible, please turn around" -msgstr "Ak to bude možné, prosím, otočte sa" +#, c-format +msgid "Follow the road for the next %s" +msgstr "Pokračujte naďalej po ceste %s" msgid "Enter the roundabout soon" msgstr "Vstúpte do kruhového objazdu onedlho" @@ -210,57 +218,176 @@ msgstr "Vstúpte do kruhového objazdu onedlho" msgid "Enter the roundabout %s" msgstr "Vojdite do kruhového objazdu %s" +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" +msgstr "potom opustite kruhový objazd na %1$s %2$s" + +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow #, c-format -msgid "then leave the roundabout at the %s" +msgid "Leave the roundabout at the %1$s %2$s" +msgstr "Opustite kruhový objazd na %1$s %2$s" + +msgid "soon" +msgstr "onedlho" + +msgid "now" +msgstr "teraz" + +msgid "then" +msgstr "potom" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|right" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "Leave the roundabout at the %s" +msgid "Merge %1$s%2$s|right" msgstr "" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Follow the road for the next %s" -msgstr "Pokračujte naďalej po ceste %s" +msgid "then merge%1$s|left" +msgstr "" -msgid "soon" -msgstr "onedlho" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|left" +msgstr "" + +msgid "on your left" +msgstr "" -#. TRANSLATORS: First argument is the how manieth street to take, second the direction +msgid "on your right" +msgstr "" + +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "Take the %1$s road to the %2$s" -msgstr "Choďte %1$s cestou na %2$s" +msgid "Take exit %1$s %2$s %3$s" +msgstr "" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "after %i roads" -msgstr "po %i cestách" +msgid "Take the exit %1$s %2$s%3$s" +msgstr "" -msgid "now" -msgstr "teraz" +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" +msgstr "" +msgid "at exit" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "then take the %1$s road to the %2$s" +msgid "then continue straight%1$s" msgstr "" -msgid "error" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" msgstr "" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "Turn %1$s%2$s %3$s%4$s" +msgid "then keep right%1$s" msgstr "" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +msgid "Keep right %1$s%2$s%3$s" msgstr "" +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "You have reached your destination %s" -msgstr "Dorazili ste do svojho cieľa %s" +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "vpravo" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "vľavo" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "mierne " + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "prudko " + +#, c-format +msgid "Take the %1$s road to the %2$s" +msgstr "Choďte %1$s cestou na %2$s" + +#, c-format +msgid "after %i roads" +msgstr "po %i cestách" + +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination +#, c-format +msgid "Turn %1$s%2$s %3$s%4$s" +msgstr "Odbočte %1$s%2$s %3$s%4$s" + +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "potom otočte sa" + +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. +#, c-format +msgid "Make a U-turn %1$s|left" +msgstr "Otočte sa %1$s" + +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" +msgstr "potom otočte sa" + +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. +#, c-format +msgid "Make a U-turn %1$s|right" +msgstr "Otočte sa %1$s" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" +msgstr "" msgid "then you have reached your destination." msgstr "potom dosiahnete svoj cieľ cesty" +#. TRANSLATORS: the arg. is distance +#, c-format +msgid "You have reached your destination %s" +msgstr "Dorazili ste do svojho cieľa %s" + +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "Križovatka" + +msgid "Exit" +msgstr "Výjazd" + #. Android resource: @strings/position_popup_title msgid "Position" msgstr "Pozícia" @@ -1817,10 +1944,10 @@ msgstr "Body trasy" msgid "Enter Coordinates" msgstr "Vložte súradnice" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/sl.po.in b/po/sl.po.in index 57c9d794b..41e7cbc4f 100644 --- a/po/sl.po.in +++ b/po/sl.po.in @@ -5,20 +5,20 @@ # Gregor Koporec https://launchpad.net/~gregork8 # KaZeR https://launchpad.net/~kazer # Štefan Baebler https://launchpad.net/~stefanba - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2013-09-28 01:42+0000\n" "Last-Translator: KaZeR <Unknown>\n" "Language-Team: Slovenian <sl@li.org>\n" +"Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || " -"n%100==4 ? 3 : 0);\n" -"Language: sl\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n" +"%100==4 ? 3 : 0);\n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -140,30 +140,53 @@ msgstr[1] "Čez %d kilometer" msgstr[2] "Čez %d kilometra" msgstr[3] "Čez %d kilometre" -msgid "exit" -msgstr "odcep" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" -msgid "into the ramp" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "" + +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" +msgid "%sinto %s%s%s" msgstr "%sna %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" +msgid "%sinto %s%s%s|masculine form" msgstr "%sna %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" +msgid "%sinto %s%s%s|feminine form" msgstr "%sna %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" +msgid "%sinto %s%s%s|neuter form" msgstr "%sna %s%s%s" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) @@ -171,92 +194,196 @@ msgstr "%sna %s%s%s" msgid "%sinto the %s" msgstr "%sna %s" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "desno" +msgid "When possible, please turn around" +msgstr "Obrnite čim bo to mogoče" -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "levo" +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" +msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "easily " -msgstr "rahlo " +#, c-format +msgid "Follow the road for the next %s" +msgstr "Ostanite na tej cesti naslednjih %s" -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " -msgstr "ostro " +msgid "Enter the roundabout soon" +msgstr "Kmalu zapeljite v krožišče" -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " +#. TRANSLATORS: %s is the distance to the roundabout +#, c-format +msgid "Enter the roundabout %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" msgstr "" -msgid "When possible, please turn around" -msgstr "Obrnite čim bo to mogoče" +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "Leave the roundabout at the %1$s %2$s" +msgstr "" -msgid "Enter the roundabout soon" -msgstr "Kmalu zapeljite v krožišče" +msgid "soon" +msgstr "kmalu" -#. TRANSLATORS: %s is the distance to the roundabout +msgid "now" +msgstr "sedaj" + +msgid "then" +msgstr "nato" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "Enter the roundabout %s" +msgid "then merge%1$s|right" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "then leave the roundabout at the %s" +msgid "Merge %1$s%2$s|right" msgstr "" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Leave the roundabout at the %s" +msgid "then merge%1$s|left" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Follow the road for the next %s" -msgstr "Ostanite na tej cesti naslednjih %s" +msgid "Merge %1$s%2$s|left" +msgstr "" -msgid "soon" -msgstr "kmalu" +msgid "on your left" +msgstr "" -#. TRANSLATORS: First argument is the how manieth street to take, second the direction +msgid "on your right" +msgstr "" + +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "Take the %1$s road to the %2$s" -msgstr "Zavijte na %2$s v %1$so cesto" +msgid "Take exit %1$s %2$s %3$s" +msgstr "" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "after %i roads" -msgstr "čez %i cest" +msgid "Take the exit %1$s %2$s%3$s" +msgstr "" -msgid "now" -msgstr "sedaj" +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" +msgstr "" +msgid "at exit" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "then take the %1$s road to the %2$s" +msgid "then continue straight%1$s" msgstr "" -msgid "error" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" msgstr "" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "Turn %1$s%2$s %3$s%4$s" +msgid "then keep right%1$s" msgstr "" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +msgid "Keep right %1$s%2$s%3$s" msgstr "" +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "You have reached your destination %s" -msgstr "%s ste na cilju" +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "desno" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "levo" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "rahlo " + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "ostro " + +#, c-format +msgid "Take the %1$s road to the %2$s" +msgstr "Zavijte na %2$s v %1$so cesto" + +#, c-format +msgid "after %i roads" +msgstr "čez %i cest" + +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination +#, c-format +msgid "Turn %1$s%2$s %3$s%4$s" +msgstr "%3$s zavijte %1$s%2$s %4$s" + +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "nato obrnite čim" + +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. +#, c-format +msgid "Make a U-turn %1$s|left" +msgstr "Obrnite čim %1$s" + +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" +msgstr "nato obrnite čim" + +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. +#, c-format +msgid "Make a U-turn %1$s|right" +msgstr "Obrnite čim %1$s" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" +msgstr "" msgid "then you have reached your destination." msgstr "in ste na cilju." +#. TRANSLATORS: the arg. is distance +#, c-format +msgid "You have reached your destination %s" +msgstr "%s ste na cilju" + +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "Razcep" + +msgid "Exit" +msgstr "Odcep" + #. Android resource: @strings/position_popup_title msgid "Position" msgstr "Položaj" @@ -1810,10 +1937,10 @@ msgstr "" msgid "Enter Coordinates" msgstr "" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/sr.po.in b/po/sr.po.in index b2d186b26..96f35d98a 100644 --- a/po/sr.po.in +++ b/po/sr.po.in @@ -8,20 +8,20 @@ # momcilo https://launchpad.net/~momcilo-majic # Мирослав Николић https://launchpad.net/~lipek # Саша Петровић https://launchpad.net/~salepetronije - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2015-02-08 21:50+0000\n" "Last-Translator: Саша Петровић <salepetronije@gmail.com>\n" "Language-Team: српски <xfce4@xfce4.org>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " -"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"Language: sr\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -143,30 +143,53 @@ msgstr[0] "за %d километара" msgstr[1] "за %d километара" msgstr[2] "за %d километара" -msgid "exit" -msgstr "излаз" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "" -msgid "into the ramp" +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "на нагибу" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" -msgstr "%sу улици %s%s%s" +msgid "%sinto %s%s%s" +msgstr "%sу %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" +msgid "%sinto %s%s%s|masculine form" msgstr "%sу %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" +msgid "%sinto %s%s%s|feminine form" msgstr "%sу %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" +msgid "%sinto %s%s%s|neuter form" msgstr "%sу %s%s%s" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) @@ -174,32 +197,17 @@ msgstr "%sу %s%s%s" msgid "%sinto the %s" msgstr "%sна %s" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "десно" - -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "лево" - -#. TRANSLATORS: Don't forget the ending space -msgid "easily " -msgstr "лако " - -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " -msgstr "јако " - -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " -msgstr "" +msgid "When possible, please turn around" +msgstr "Када буде могуће, променити смер" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" msgstr "" -msgid "When possible, please turn around" -msgstr "Када буде могуће, променити смер" +#, c-format +msgid "Follow the road for the next %s" +msgstr "Прати пут до следећег %s" msgid "Enter the roundabout soon" msgstr "Ускоро прелазак на обилазницу" @@ -209,57 +217,176 @@ msgstr "Ускоро прелазак на обилазницу" msgid "Enter the roundabout %s" msgstr "Прелаз на обилазницу %s" +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" +msgstr "потом напутстите обилазницу на %1$s %2$s" + +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "Leave the roundabout at the %1$s %2$s" +msgstr "Напуштање обилазнице за %1$s %2$s" + +msgid "soon" +msgstr "ускоро" + +msgid "now" +msgstr "сад" + +msgid "then" +msgstr "потом" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "then leave the roundabout at the %s" +msgid "then merge%1$s|right" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "Leave the roundabout at the %s" +msgid "Merge %1$s%2$s|right" msgstr "" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Follow the road for the next %s" -msgstr "Прати пут до следећег %s" +msgid "then merge%1$s|left" +msgstr "" -msgid "soon" -msgstr "ускоро" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|left" +msgstr "" + +msgid "on your left" +msgstr "" + +msgid "on your right" +msgstr "" -#. TRANSLATORS: First argument is the how manieth street to take, second the direction +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "Take the %1$s road to the %2$s" -msgstr "Прати %1$s пут до %2$s" +msgid "Take exit %1$s %2$s %3$s" +msgstr "" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "after %i roads" -msgstr "после %i путева" +msgid "Take the exit %1$s %2$s%3$s" +msgstr "" -msgid "now" -msgstr "сад" +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" +msgstr "" +msgid "at exit" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "then take the %1$s road to the %2$s" +msgid "then continue straight%1$s" msgstr "" -msgid "error" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" msgstr "" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "Turn %1$s%2$s %3$s%4$s" +msgid "then keep right%1$s" msgstr "" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +msgid "Keep right %1$s%2$s%3$s" msgstr "" +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "You have reached your destination %s" -msgstr "Стигли сте на одредиште %s" +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "десно" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "лево" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "лако " + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "јако " + +#, c-format +msgid "Take the %1$s road to the %2$s" +msgstr "Прати %1$s пут до %2$s" + +#, c-format +msgid "after %i roads" +msgstr "после %i путева" + +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination +#, c-format +msgid "Turn %1$s%2$s %3$s%4$s" +msgstr "Скрени %1$s%2$s %3$s%4$s" + +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "потом променити смер" + +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. +#, c-format +msgid "Make a U-turn %1$s|left" +msgstr "Променити смер %1$s" + +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" +msgstr "потом променити смер" + +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. +#, c-format +msgid "Make a U-turn %1$s|right" +msgstr "Променити смер %1$s" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" +msgstr "" msgid "then you have reached your destination." msgstr "потом сте стигли на своје одредиште." +#. TRANSLATORS: the arg. is distance +#, c-format +msgid "You have reached your destination %s" +msgstr "Стигли сте на одредиште %s" + +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "" + +msgid "Exit" +msgstr "Излаз" + #. Android resource: @strings/position_popup_title msgid "Position" msgstr "Положај" @@ -1329,13 +1456,11 @@ msgstr "" #. We have not found an existing config file from all possibilities msgid "No config file navit.xml, navit.xml.local found\n" -msgstr "" -"Нема датотеке подешавања navit.xml, navit.xml.сопствени је пронађен\n" +msgstr "Нема датотеке подешавања navit.xml, navit.xml.сопствени је пронађен\n" #, c-format msgid "Error parsing config file '%s': %s\n" -msgstr "" -"Десила се грешка приликом рашчлањивања датотеке подешавања „%s“: %s\n" +msgstr "Десила се грешка приликом рашчлањивања датотеке подешавања „%s“: %s\n" #, c-format msgid "Using config file '%s'\n" @@ -1817,10 +1942,10 @@ msgstr "Пролазне тачке" msgid "Enter Coordinates" msgstr "Унесите координате" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" @@ -2643,3 +2768,36 @@ msgid "" "currently selected engine reports it is unable to speak in your language. " "Should we ask the system to show voice download dialog?" msgstr "" + +#~ msgid "%sinto the street %s%s%s" +#~ msgstr "%sу улици %s%s%s" + +#~ msgid "%sinto the %s%s%s|male form" +#~ msgstr "%sу %s%s%s" + +#~ msgid "%sinto the %s%s%s|female form" +#~ msgstr "%sу %s%s%s" + +#~ msgid "%sinto the %s%s%s|neutral form" +#~ msgstr "%sу %s%s%s" + +#~ msgid "really strongly " +#~ msgstr "веома јако " + +#~ msgid "unknown " +#~ msgstr "непознат " + +#~ msgid "then leave the roundabout at the %s" +#~ msgstr "потом напутстите обилазницу на %s" + +#~ msgid "Leave the roundabout at the %s" +#~ msgstr "Напуштање обилазнице за %s" + +#~ msgid "then take the %1$s road to the %2$s" +#~ msgstr "потом прати пут %1$s до %2$s" + +#~ msgid "error" +#~ msgstr "грешка" + +#~ msgid "then turn %1$s%2$s %3$s%4$s" +#~ msgstr "потом скрени %1$s%2$s %3$s%4$s" diff --git a/po/sv.po.in b/po/sv.po.in index e6f4428e5..7897930cf 100644 --- a/po/sv.po.in +++ b/po/sv.po.in @@ -9,19 +9,19 @@ # Squall Leonhart https://launchpad.net/~webmaster-square-one # nairobie https://launchpad.net/~samuel-ostman # pipatron https://launchpad.net/~pipatron - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2013-09-28 01:44+0000\n" "Last-Translator: KaZeR <Unknown>\n" "Language-Team: Swedish <sv@li.org>\n" +"Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"Language: sv\n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -139,30 +139,53 @@ msgid_plural "in %d kilometers" msgstr[0] "om en kilometer" msgstr[1] "om %d kilometer" -msgid "exit" -msgstr "avfart" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" -msgid "into the ramp" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "" + +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "ut på påfarten" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" -msgstr "%sin på gatan %s%s%s" +msgid "%sinto %s%s%s" +msgstr "%sin på %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" +msgid "%sinto %s%s%s|masculine form" msgstr "%sin på %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" +msgid "%sinto %s%s%s|feminine form" msgstr "%sin på %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" +msgid "%sinto %s%s%s|neuter form" msgstr "%sin på %s%s%s" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) @@ -170,32 +193,17 @@ msgstr "%sin på %s%s%s" msgid "%sinto the %s" msgstr "%sut på %s" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "höger" - -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "vänster" - -#. TRANSLATORS: Don't forget the ending space -msgid "easily " -msgstr "lätt " - -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " -msgstr "tvärt " - -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " -msgstr "" +msgid "When possible, please turn around" +msgstr "Vänd när det går" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" msgstr "" -msgid "When possible, please turn around" -msgstr "Vänd när det går" +#, c-format +msgid "Follow the road for the next %s" +msgstr "Följ vägen i %s" msgid "Enter the roundabout soon" msgstr "Kör snart in i rondellen" @@ -205,57 +213,176 @@ msgstr "Kör snart in i rondellen" msgid "Enter the roundabout %s" msgstr "" +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" +msgstr "kör sedan ut ur rondellen mot %1$s %2$s" + +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow #, c-format -msgid "then leave the roundabout at the %s" +msgid "Leave the roundabout at the %1$s %2$s" +msgstr "Kör ut ur rondellen mot %1$s %2$s" + +msgid "soon" +msgstr "snart" + +msgid "now" +msgstr "nu" + +msgid "then" +msgstr "sedan" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|right" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "Leave the roundabout at the %s" +msgid "Merge %1$s%2$s|right" msgstr "" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Follow the road for the next %s" -msgstr "Följ vägen i %s" +msgid "then merge%1$s|left" +msgstr "" -msgid "soon" -msgstr "snart" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|left" +msgstr "" -#. TRANSLATORS: First argument is the how manieth street to take, second the direction +msgid "on your left" +msgstr "" + +msgid "on your right" +msgstr "" + +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "Take the %1$s road to the %2$s" -msgstr "Ta %1$s vägen mot %2$s" +msgid "Take exit %1$s %2$s %3$s" +msgstr "" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "after %i roads" -msgstr "efter %i vägar" +msgid "Take the exit %1$s %2$s%3$s" +msgstr "" -msgid "now" -msgstr "nu" +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" +msgstr "" +msgid "at exit" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "then take the %1$s road to the %2$s" +msgid "then continue straight%1$s" msgstr "" -msgid "error" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" msgstr "" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "Turn %1$s%2$s %3$s%4$s" +msgid "then keep right%1$s" msgstr "" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +msgid "Keep right %1$s%2$s%3$s" msgstr "" +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "You have reached your destination %s" -msgstr "Du har nått din destination %s" +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "höger" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "vänster" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "lätt " + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "tvärt " + +#, c-format +msgid "Take the %1$s road to the %2$s" +msgstr "Ta %1$s vägen mot %2$s" + +#, c-format +msgid "after %i roads" +msgstr "efter %i vägar" + +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination +#, c-format +msgid "Turn %1$s%2$s %3$s%4$s" +msgstr "Sväng %1$s%2$s %3$s%4$s" + +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "vänd sedan" + +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. +#, c-format +msgid "Make a U-turn %1$s|left" +msgstr "Vänd %1$s" + +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" +msgstr "vänd sedan" + +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. +#, c-format +msgid "Make a U-turn %1$s|right" +msgstr "Vänd %1$s" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" +msgstr "följ" msgid "then you have reached your destination." msgstr "sedan har du nått din destination." +#. TRANSLATORS: the arg. is distance +#, c-format +msgid "You have reached your destination %s" +msgstr "Du har nått din destination %s" + +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "Korsning" + +msgid "Exit" +msgstr "Avfart" + #. Android resource: @strings/position_popup_title msgid "Position" msgstr "Position" @@ -1809,10 +1936,10 @@ msgstr "" msgid "Enter Coordinates" msgstr "" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/sw.po.in b/po/sw.po.in index 4701629a2..de891ac2f 100644 --- a/po/sw.po.in +++ b/po/sw.po.in @@ -4,19 +4,19 @@ # Many thanks to the contributors of this translation: # HinzundKunz https://launchpad.net/~martin-tlustos # KaZeR https://launchpad.net/~kazer - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2014-08-08 23:15+0000\n" "Last-Translator: KaZeR <Unknown>\n" "Language-Team: Swahili <sw@li.org>\n" +"Language: sw\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"Language: sw\n" msgid "Running from source directory\n" msgstr "" @@ -133,88 +133,188 @@ msgid_plural "in %d kilometers" msgstr[0] "baada ya kilomita %d" msgstr[1] "baada ya kilomita %d" -msgid "exit" -msgstr "ondoka" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "" -msgid "into the ramp" +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" -msgstr "%s kufuata %s%s%s" +msgid "%sinto %s%s%s" +msgstr "%skufuata %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" -msgstr "%s kufuata %s%s%s" +msgid "%sinto %s%s%s|masculine form" +msgstr "%skufuata %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" -msgstr "%s kufuata %s%s%s" +msgid "%sinto %s%s%s|feminine form" +msgstr "%skufuata %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" -msgstr "%s kufuata %s%s%s" +msgid "%sinto %s%s%s|neuter form" +msgstr "%skufuata %s%s%s" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) #, c-format msgid "%sinto the %s" -msgstr "%s kufuata %s" +msgstr "%skufuata %s" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "kulia" +msgid "When possible, please turn around" +msgstr "Geuka na kurudi nyuma inapowezekana" -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "kushoto" +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" +msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "easily " +#, c-format +msgid "Follow the road for the next %s" +msgstr "Buata barabara kwa %s" + +msgid "Enter the roundabout soon" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " +#. TRANSLATORS: %s is the distance to the roundabout +#, c-format +msgid "Enter the roundabout %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" +msgstr "halafu toka kutoka kwenye kipilefti kwenye %1$s %2$s" + +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "Leave the roundabout at the %1$s %2$s" +msgstr "Toka kutoka kwenye kipilefti kwenye %1$s %2$s" + +msgid "soon" +msgstr "karibuni" + +msgid "now" +msgstr "sasa" + +msgid "then" +msgstr "halafu" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|right" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|right" msgstr "" -msgid "When possible, please turn around" -msgstr "geuka na kurudi nyuma inapowezekana" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|left" +msgstr "" -msgid "Enter the roundabout soon" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|left" msgstr "" -#. TRANSLATORS: %s is the distance to the roundabout +msgid "on your left" +msgstr "" + +msgid "on your right" +msgstr "" + +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "Enter the roundabout %s" +msgid "Take exit %1$s %2$s %3$s" msgstr "" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "then leave the roundabout at the %s" +msgid "Take the exit %1$s %2$s%3$s" +msgstr "" + +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" msgstr "" +msgid "at exit" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "Leave the roundabout at the %s" +msgid "then continue straight%1$s" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination #, c-format -msgid "Follow the road for the next %s" -msgstr "buata barabara kwa %s" +msgid "Continue straight %1$s%2$s%3$s" +msgstr "" -msgid "soon" -msgstr "karibuni" +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep right%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep right %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "kulia" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "kushoto" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "" + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "" -#. TRANSLATORS: First argument is the how manieth street to take, second the direction #, c-format msgid "Take the %1$s road to the %2$s" msgstr "fuata %1$s hadi %2$s" @@ -223,32 +323,59 @@ msgstr "fuata %1$s hadi %2$s" msgid "after %i roads" msgstr "baada ya barabara %i" -msgid "now" -msgstr "sasa" +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination +#, c-format +msgid "Turn %1$s%2$s %3$s%4$s" +msgstr "piga kona %1$s%2$s %3$s%4$s" + +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "" +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "then take the %1$s road to the %2$s" +msgid "Make a U-turn %1$s|left" msgstr "" -msgid "error" +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" msgstr "" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "Turn %1$s%2$s %3$s%4$s" +msgid "Make a U-turn %1$s|right" msgstr "" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination -#, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" msgstr "" +msgid "then you have reached your destination." +msgstr "halafu utakuwa umefika" + +#. TRANSLATORS: the arg. is distance #, c-format msgid "You have reached your destination %s" msgstr "umelifikia lengo lako %s" -msgid "then you have reached your destination." -msgstr "halafu utakuwa umefika" +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "" + +msgid "Exit" +msgstr "Ondoka" #. Android resource: @strings/position_popup_title msgid "Position" @@ -1803,10 +1930,10 @@ msgstr "" msgid "Enter Coordinates" msgstr "" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/ta.po.in b/po/ta.po.in index 20d45d1e6..beab1fc9f 100644 --- a/po/ta.po.in +++ b/po/ta.po.in @@ -4,19 +4,19 @@ # Many thanks to the contributors of this translation: # Dinesh Ramalingam https://launchpad.net/~dinodinu+navit # Rajiv Subrahmanyam https://launchpad.net/~rajiv-public - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2013-09-04 00:29+0000\n" "Last-Translator: Dinesh Ramalingam <Unknown>\n" "Language-Team: Tamil <ta@li.org>\n" +"Language: ta\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"Language: ta\n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -134,30 +134,53 @@ msgid_plural "in %d kilometers" msgstr[0] "ஒரு கிலோமீட்டருக்குள்" msgstr[1] "%d கிலோமீட்டர்களுக்குள்" -msgid "exit" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" msgstr "" -msgid "into the ramp" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "" + +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" +msgid "%sinto %s%s%s" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" +msgid "%sinto %s%s%s|masculine form" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" +msgid "%sinto %s%s%s|feminine form" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" +msgid "%sinto %s%s%s|neuter form" msgstr "" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) @@ -165,92 +188,196 @@ msgstr "" msgid "%sinto the %s" msgstr "" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" +msgid "When possible, please turn around" msgstr "" -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "easily " -msgstr "இயல்பாக " +#, c-format +msgid "Follow the road for the next %s" +msgstr "%s க்கு இதே தெருவில் செல்லவும்" -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " +msgid "Enter the roundabout soon" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " +#. TRANSLATORS: %s is the distance to the roundabout +#, c-format +msgid "Enter the roundabout %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" msgstr "" -msgid "When possible, please turn around" +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "Leave the roundabout at the %1$s %2$s" msgstr "" -msgid "Enter the roundabout soon" +msgid "soon" +msgstr "சீக்கிரமாக" + +msgid "now" +msgstr "இப்பொழுது" + +msgid "then" msgstr "" -#. TRANSLATORS: %s is the distance to the roundabout +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "Enter the roundabout %s" +msgid "then merge%1$s|right" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "then leave the roundabout at the %s" +msgid "Merge %1$s%2$s|right" msgstr "" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Leave the roundabout at the %s" +msgid "then merge%1$s|left" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Follow the road for the next %s" -msgstr "%s க்கு இதே தெருவில் செல்லவும்" +msgid "Merge %1$s%2$s|left" +msgstr "" -msgid "soon" -msgstr "சீக்கிரமாக" +msgid "on your left" +msgstr "" + +msgid "on your right" +msgstr "" -#. TRANSLATORS: First argument is the how manieth street to take, second the direction +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "Take the %1$s road to the %2$s" +msgid "Take exit %1$s %2$s %3$s" msgstr "" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "after %i roads" +msgid "Take the exit %1$s %2$s%3$s" msgstr "" -msgid "now" -msgstr "இப்பொழுது" +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" +msgstr "" + +msgid "at exit" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then continue straight%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep right%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep right %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "இயல்பாக " + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "" #, c-format -msgid "then take the %1$s road to the %2$s" +msgid "Take the %1$s road to the %2$s" msgstr "" -msgid "error" +#, c-format +msgid "after %i roads" msgstr "" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination #, c-format msgid "Turn %1$s%2$s %3$s%4$s" msgstr "" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "" + +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +msgid "Make a U-turn %1$s|left" msgstr "" +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" +msgstr "" + +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "You have reached your destination %s" +msgid "Make a U-turn %1$s|right" +msgstr "" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" msgstr "" msgid "then you have reached your destination." msgstr "" +#. TRANSLATORS: the arg. is distance +#, c-format +msgid "You have reached your destination %s" +msgstr "" + +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "" + +msgid "Exit" +msgstr "" + #. Android resource: @strings/position_popup_title msgid "Position" msgstr "" @@ -1804,10 +1931,10 @@ msgstr "" msgid "Enter Coordinates" msgstr "" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/te.po.in b/po/te.po.in index 83701d4b9..eb4b0427a 100644 --- a/po/te.po.in +++ b/po/te.po.in @@ -4,19 +4,19 @@ # Many thanks to the contributors of this translation: # KaZeR https://launchpad.net/~kazer # వీవెన్ https://launchpad.net/~veeven - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2013-09-27 21:48+0000\n" "Last-Translator: KaZeR <Unknown>\n" "Language-Team: Telugu <te@li.org>\n" +"Language: te\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"Language: te\n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -134,30 +134,53 @@ msgid_plural "in %d kilometers" msgstr[0] "" msgstr[1] "" -msgid "exit" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" msgstr "" -msgid "into the ramp" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "" + +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" +msgid "%sinto %s%s%s" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" +msgid "%sinto %s%s%s|masculine form" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" +msgid "%sinto %s%s%s|feminine form" msgstr "" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" +msgid "%sinto %s%s%s|neuter form" msgstr "" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) @@ -165,90 +188,194 @@ msgstr "" msgid "%sinto the %s" msgstr "" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "కుడి" +msgid "When possible, please turn around" +msgstr "" -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "ఎడమ" +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" +msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "easily " -msgstr "తేలికగా " +#, c-format +msgid "Follow the road for the next %s" +msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " +msgid "Enter the roundabout soon" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " +#. TRANSLATORS: %s is the distance to the roundabout +#, c-format +msgid "Enter the roundabout %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" msgstr "" -msgid "When possible, please turn around" +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "Leave the roundabout at the %1$s %2$s" msgstr "" -msgid "Enter the roundabout soon" +msgid "soon" +msgstr "త్వరలో" + +msgid "now" +msgstr "ఇప్పుడు" + +msgid "then" msgstr "" -#. TRANSLATORS: %s is the distance to the roundabout +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "Enter the roundabout %s" +msgid "then merge%1$s|right" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "then leave the roundabout at the %s" +msgid "Merge %1$s%2$s|right" msgstr "" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Leave the roundabout at the %s" +msgid "then merge%1$s|left" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Follow the road for the next %s" +msgid "Merge %1$s%2$s|left" msgstr "" -msgid "soon" -msgstr "త్వరలో" +msgid "on your left" +msgstr "" + +msgid "on your right" +msgstr "" -#. TRANSLATORS: First argument is the how manieth street to take, second the direction +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "Take the %1$s road to the %2$s" +msgid "Take exit %1$s %2$s %3$s" msgstr "" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "after %i roads" +msgid "Take the exit %1$s %2$s%3$s" msgstr "" -msgid "now" -msgstr "ఇప్పుడు" +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" +msgstr "" + +msgid "at exit" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then continue straight%1$s" +msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination #, c-format -msgid "then take the %1$s road to the %2$s" +msgid "Continue straight %1$s%2$s%3$s" msgstr "" -msgid "error" +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep right%1$s" msgstr "" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep right %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "కుడి" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "ఎడమ" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "తేలికగా " + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "" + +#, c-format +msgid "Take the %1$s road to the %2$s" +msgstr "" + +#, c-format +msgid "after %i roads" +msgstr "" + +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination #, c-format msgid "Turn %1$s%2$s %3$s%4$s" msgstr "" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "" + +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +msgid "Make a U-turn %1$s|left" msgstr "" +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" +msgstr "" + +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. +#, c-format +msgid "Make a U-turn %1$s|right" +msgstr "" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" +msgstr "" + +msgid "then you have reached your destination." +msgstr "" + +#. TRANSLATORS: the arg. is distance #, c-format msgid "You have reached your destination %s" msgstr "మీరు మీ గమ్యస్థానం %s చేరారు" -msgid "then you have reached your destination." +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "" + +msgid "Exit" msgstr "" #. Android resource: @strings/position_popup_title @@ -1804,10 +1931,10 @@ msgstr "" msgid "Enter Coordinates" msgstr "" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/th.po.in b/po/th.po.in index ac4d01ac3..c752bb088 100644 --- a/po/th.po.in +++ b/po/th.po.in @@ -3,19 +3,19 @@ # This file is distributed under the same license as the navit package. # Many thanks to the contributors of this translation: # mansv68 https://launchpad.net/~mansv68 - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2013-09-28 01:46+0000\n" "Last-Translator: mansv68 <mansv68@yahoo.co.th>\n" "Language-Team: Thai <th@li.org>\n" +"Language: th\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"Language: th\n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -131,123 +131,250 @@ msgid "in one kilometer" msgid_plural "in %d kilometers" msgstr[0] "อีก %d กิโลเมตร" -msgid "exit" -msgstr "ทางออก" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" -msgid "into the ramp" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "" + +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" -msgstr "%s เข้าสู่ถนน %s%s%s" +msgid "%sinto %s%s%s" +msgstr "%sเข้าสู่ถนน %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" -msgstr "%s เข้าสู่ %s%s%s| จาก" +msgid "%sinto %s%s%s|masculine form" +msgstr "%sเข้าสู่ %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" -msgstr "%s เข้าสู %s%s%s| จาก" +msgid "%sinto %s%s%s|feminine form" +msgstr "%sเข้าสู %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" -msgstr "%s เข้าสู่ %s%s%s| จาก" +msgid "%sinto %s%s%s|neuter form" +msgstr "%sเข้าสู่ %s%s%s" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) #, c-format msgid "%sinto the %s" msgstr "" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "ขวา" +msgid "When possible, please turn around" +msgstr "ถ้าเป็นไปได้ ให้กลับรถ" -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "ซ้าย" +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" +msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "easily " +#, c-format +msgid "Follow the road for the next %s" +msgstr "ตรงไปตามถนน แล้ว %s" + +msgid "Enter the roundabout soon" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " -msgstr "อย่างเคร่งคัด " +#. TRANSLATORS: %s is the distance to the roundabout +#, c-format +msgid "Enter the roundabout %s" +msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "Leave the roundabout at the %1$s %2$s" msgstr "" -msgid "When possible, please turn around" -msgstr "ถ้าเป็นไปได้ ให้กลับรถ" +msgid "soon" +msgstr "ในไม่ช้า" -msgid "Enter the roundabout soon" +msgid "now" +msgstr "เดี๋ยวนี้" + +msgid "then" msgstr "" -#. TRANSLATORS: %s is the distance to the roundabout +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "Enter the roundabout %s" +msgid "then merge%1$s|right" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "then leave the roundabout at the %s" +msgid "Merge %1$s%2$s|right" msgstr "" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Leave the roundabout at the %s" +msgid "then merge%1$s|left" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Follow the road for the next %s" -msgstr "ตรงไปตามถนน แล้ว %s" +msgid "Merge %1$s%2$s|left" +msgstr "" -msgid "soon" -msgstr "ในไม่ช้า" +msgid "on your left" +msgstr "" -#. TRANSLATORS: First argument is the how manieth street to take, second the direction +msgid "on your right" +msgstr "" + +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "Take the %1$s road to the %2$s" +msgid "Take exit %1$s %2$s %3$s" msgstr "" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "after %i roads" +msgid "Take the exit %1$s %2$s%3$s" msgstr "" -msgid "now" -msgstr "เดี๋ยวนี้" +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" +msgstr "" + +msgid "at exit" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then continue straight%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep right%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep right %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "ขวา" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "ซ้าย" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "" + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "อย่างเคร่งคัด " #, c-format -msgid "then take the %1$s road to the %2$s" +msgid "Take the %1$s road to the %2$s" msgstr "" -msgid "error" +#, c-format +msgid "after %i roads" msgstr "" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination #, c-format msgid "Turn %1$s%2$s %3$s%4$s" msgstr "" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "" + +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +msgid "Make a U-turn %1$s|left" +msgstr "" + +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" +msgstr "" + +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. +#, c-format +msgid "Make a U-turn %1$s|right" +msgstr "" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" +msgstr "" + +msgid "then you have reached your destination." msgstr "" +#. TRANSLATORS: the arg. is distance #, c-format msgid "You have reached your destination %s" msgstr "คุณได้ถึงที่หมายแล้ว %s" -msgid "then you have reached your destination." +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" msgstr "" +msgid "Exit" +msgstr "ทางออก" + #. Android resource: @strings/position_popup_title msgid "Position" msgstr "" @@ -1801,10 +1928,10 @@ msgstr "" msgid "Enter Coordinates" msgstr "" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/tr.po.in b/po/tr.po.in index f1b668b41..13ff71c55 100644 --- a/po/tr.po.in +++ b/po/tr.po.in @@ -13,19 +13,19 @@ # seqizz (gurkanGur) https://launchpad.net/~seqizz # tinyos https://launchpad.net/~eygu-mindikoglu # Şahin Alp Taşkaya https://launchpad.net/~sahin - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2013-12-10 00:54+0000\n" "Last-Translator: seqizz (gurkanGur) <seqizz@gmail.com>\n" "Language-Team: Turkish <tr@li.org>\n" +"Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"Language: tr\n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -143,88 +143,188 @@ msgid_plural "in %d kilometers" msgstr[0] "%d kilometrede" msgstr[1] "%d kilometrede" -msgid "exit" -msgstr "çıkış" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" -msgid "into the ramp" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "" + +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "rampada" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" -msgstr "%sCaddesi'ne %s%s%s" +msgid "%sinto %s%s%s" +msgstr "%scaddesine %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" -msgstr "%scaddesine %s%s%s|male form" +msgid "%sinto %s%s%s|masculine form" +msgstr "%scaddesine %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" -msgstr "%scaddesine %s%s%s|female form" +msgid "%sinto %s%s%s|feminine form" +msgstr "%scaddesine %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" -msgstr "%scaddesine %s%s%s|neutral form" +msgid "%sinto %s%s%s|neuter form" +msgstr "%scaddesine %s%s%s" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) #, c-format msgid "%sinto the %s" msgstr "%s%s yoluna" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "Sağa" +msgid "When possible, please turn around" +msgstr "Müsait olduğunda lütfen yönünü değiştir" -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "Sola" +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" +msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "easily " -msgstr "kolayca " +#, c-format +msgid "Follow the road for the next %s" +msgstr "Gelecek %s için yolu takip et" -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " -msgstr "sertçe " +msgid "Enter the roundabout soon" +msgstr "Yakındaki kavşağa girin" -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " +#. TRANSLATORS: %s is the distance to the roundabout +#, c-format +msgid "Enter the roundabout %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" +msgstr "ardından %1$s'de kavşaktan çıkın %2$s" + +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "Leave the roundabout at the %1$s %2$s" +msgstr "%1$s'de kavşaktan çıkın %2$s" + +msgid "soon" +msgstr "yakında" + +msgid "now" +msgstr "şimdi" + +msgid "then" +msgstr "ardından" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|right" msgstr "" -msgid "When possible, please turn around" -msgstr "Müsait olduğunda lütfen yönünü değiştir" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|right" +msgstr "" -msgid "Enter the roundabout soon" -msgstr "Yakındaki kavşağa girin" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|left" +msgstr "" -#. TRANSLATORS: %s is the distance to the roundabout +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Enter the roundabout %s" +msgid "Merge %1$s%2$s|left" +msgstr "" + +msgid "on your left" msgstr "" +msgid "on your right" +msgstr "" + +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "then leave the roundabout at the %s" +msgid "Take exit %1$s %2$s %3$s" msgstr "" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "Leave the roundabout at the %s" +msgid "Take the exit %1$s %2$s%3$s" +msgstr "" + +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" +msgstr "" + +msgid "at exit" msgstr "" +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "Follow the road for the next %s" -msgstr "Gelecek %s için yolu takip et" +msgid "then continue straight%1$s" +msgstr "" -msgid "soon" -msgstr "yakında" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep right%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep right %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "Sağa" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "Sola" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "kolayca " + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "sertçe " -#. TRANSLATORS: First argument is the how manieth street to take, second the direction #, c-format msgid "Take the %1$s road to the %2$s" msgstr "%1$s yolunda %2$s yönüne dönün" @@ -233,32 +333,59 @@ msgstr "%1$s yolunda %2$s yönüne dönün" msgid "after %i roads" msgstr "%i yol sonra" -msgid "now" -msgstr "şimdi" +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination +#, c-format +msgid "Turn %1$s%2$s %3$s%4$s" +msgstr "Dönüş %1$s%2$s %3$s%4$s" +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "" + +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "then take the %1$s road to the %2$s" +msgid "Make a U-turn %1$s|left" msgstr "" -msgid "error" +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" msgstr "" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "Turn %1$s%2$s %3$s%4$s" +msgid "Make a U-turn %1$s|right" msgstr "" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination -#, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" msgstr "" +msgid "then you have reached your destination." +msgstr "ardından hedefinize ulaşacaksınız" + +#. TRANSLATORS: the arg. is distance #, c-format msgid "You have reached your destination %s" msgstr "Hedefinize ulaştınız, %s" -msgid "then you have reached your destination." -msgstr "ardından hedefinize ulaşacaksınız" +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "" + +msgid "Exit" +msgstr "Çıkış" #. Android resource: @strings/position_popup_title msgid "Position" @@ -1813,10 +1940,10 @@ msgstr "" msgid "Enter Coordinates" msgstr "" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/uk.po.in b/po/uk.po.in index 2df01bb09..ce5c9022e 100644 --- a/po/uk.po.in +++ b/po/uk.po.in @@ -6,20 +6,20 @@ # Knedlyk https://launchpad.net/~yupadmin # andygol https://launchpad.net/~andygol # serg_stetsuk https://launchpad.net/~serg-stetsuk - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2013-09-28 01:44+0000\n" "Last-Translator: KaZeR <Unknown>\n" "Language-Team: Ukrainian <uk@li.org>\n" +"Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " -"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"Language: uk\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -139,88 +139,188 @@ msgstr[0] "за %d кілометр" msgstr[1] "за %d кілометри" msgstr[2] "за %d кілометрів" -msgid "exit" -msgstr "виїзд" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" -msgid "into the ramp" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "" + +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "з'їзд на" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" -msgstr "%s на вулицю %s%s%s" +msgid "%sinto %s%s%s" +msgstr "%sна %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" -msgstr "%s на %s%s%s" +msgid "%sinto %s%s%s|masculine form" +msgstr "%sна %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" -msgstr "%s на %s%s%s" +msgid "%sinto %s%s%s|feminine form" +msgstr "%sна %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" -msgstr "%s на %s%s%s" +msgid "%sinto %s%s%s|neuter form" +msgstr "%sна %s%s%s" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) #, c-format msgid "%sinto the %s" -msgstr "%s в %s" +msgstr "%sв %s" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "праворуч" +msgid "When possible, please turn around" +msgstr "Якщо це можливо, то розверніться" -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "ліворуч" +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" +msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "easily " -msgstr "легко " +#, c-format +msgid "Follow the road for the next %s" +msgstr "Їдьте дорогою наступні %s" -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " -msgstr "круто " +msgid "Enter the roundabout soon" +msgstr "Скоро виїзд на дорогу з кільцевим рухом" -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " +#. TRANSLATORS: %s is the distance to the roundabout +#, c-format +msgid "Enter the roundabout %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" +msgstr "тоді виїдьте з кільця через %1$s %2$s" + +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "Leave the roundabout at the %1$s %2$s" +msgstr "Виїдьте з кільця через %1$s %2$s" + +msgid "soon" +msgstr "скоро" + +msgid "now" +msgstr "зараз" + +msgid "then" +msgstr "тоді" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|right" msgstr "" -msgid "When possible, please turn around" -msgstr "Якщо це можливо, то розверніться" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|right" +msgstr "" -msgid "Enter the roundabout soon" -msgstr "Скоро виїзд на дорогу з кільцевим рухом" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|left" +msgstr "" -#. TRANSLATORS: %s is the distance to the roundabout +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Enter the roundabout %s" +msgid "Merge %1$s%2$s|left" +msgstr "" + +msgid "on your left" msgstr "" +msgid "on your right" +msgstr "" + +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "then leave the roundabout at the %s" +msgid "Take exit %1$s %2$s %3$s" msgstr "" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "Leave the roundabout at the %s" +msgid "Take the exit %1$s %2$s%3$s" +msgstr "" + +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" +msgstr "" + +msgid "at exit" msgstr "" +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "Follow the road for the next %s" -msgstr "Їдьте дорогою наступні %s" +msgid "then continue straight%1$s" +msgstr "" -msgid "soon" -msgstr "скоро" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep right%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep right %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "праворуч" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "ліворуч" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "легко " + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "круто " -#. TRANSLATORS: First argument is the how manieth street to take, second the direction #, c-format msgid "Take the %1$s road to the %2$s" msgstr "З’їдьте на дорогу %1$s до %2$s" @@ -229,32 +329,59 @@ msgstr "З’їдьте на дорогу %1$s до %2$s" msgid "after %i roads" msgstr "після %i дороги" -msgid "now" -msgstr "зараз" - +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination #, c-format -msgid "then take the %1$s road to the %2$s" -msgstr "" +msgid "Turn %1$s%2$s %3$s%4$s" +msgstr "Поверніть на %1$s%2$s %3$s%4$s" -msgid "error" -msgstr "" +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "тоді то розверніться" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "Turn %1$s%2$s %3$s%4$s" -msgstr "" +msgid "Make a U-turn %1$s|left" +msgstr "То розверніться %1$s" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" +msgstr "тоді то розверніться" + +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +msgid "Make a U-turn %1$s|right" +msgstr "То розверніться %1$s" + +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" msgstr "" +msgid "then you have reached your destination." +msgstr "і тоді Ви прибудете в місце призначення." + +#. TRANSLATORS: the arg. is distance #, c-format msgid "You have reached your destination %s" msgstr "Ви досягли місця призначення %s" -msgid "then you have reached your destination." -msgstr "і тоді Ви прибудете в місце призначення." +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "Розв'язка" + +msgid "Exit" +msgstr "Виїзд" #. Android resource: @strings/position_popup_title msgid "Position" @@ -1809,10 +1936,10 @@ msgstr "" msgid "Enter Coordinates" msgstr "" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/ur.po.in b/po/ur.po.in index e5d09bdd7..2e998b03c 100644 --- a/po/ur.po.in +++ b/po/ur.po.in @@ -4,24 +4,32 @@ # Many thanks to the contributors of this translation: # KaZeR https://launchpad.net/~kazer # asghar https://launchpad.net/~asghar144 - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2013-09-28 01:44+0000\n" "Last-Translator: KaZeR <Unknown>\n" "Language-Team: Urdu <ur@li.org>\n" +"Language: ur\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"Language: ur\n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" msgstr "سورس ڈایرکٹری سے چلا ر ہے ہیں\n" +#, c-format +msgid "setting '%s' to '%s'\n" +msgstr "ترتیب '%s' سے '%s'\n" + +#. TRANSLATORS: the following counts refer to streets +msgid "zeroth" +msgstr "صفر سے" + msgid "first" msgstr "پہلا" @@ -67,6 +75,18 @@ msgid "%d m" msgstr "%d میٹر" #, c-format +msgid "in %d m" +msgstr "%d میٹر میں" + +#, c-format +msgid "%d feet" +msgstr "" + +#, c-format +msgid "in %d feet" +msgstr "" + +#, c-format msgid "%d meters" msgstr "%d میٹر" @@ -75,6 +95,14 @@ msgid "in %d meters" msgstr "%d میٹر میں" #, c-format +msgid "%d.%d miles" +msgstr "" + +#, c-format +msgid "in %d.%d miles" +msgstr "" + +#, c-format msgid "%d.%d kilometers" msgstr "%d.%d کلومیٹر" @@ -82,159 +110,212 @@ msgstr "%d.%d کلومیٹر" msgid "in %d.%d kilometers" msgstr "%d.%d کلومیٹر میں" -msgid "exit" -msgstr "اخراج" +#, c-format +msgid "one mile" +msgid_plural "%d miles" +msgstr[0] "" +msgstr[1] "" + +#, c-format +msgid "in one mile" +msgid_plural "in %d miles" +msgstr[0] "" +msgstr[1] "" + +#, c-format +msgid "one kilometer" +msgid_plural "%d kilometers" +msgstr[0] "ایک کلومیٹر" +msgstr[1] "%d کلومیٹر" + +#, c-format +msgid "in one kilometer" +msgid_plural "in %d kilometers" +msgstr[0] "ایک کلومیٹر میں" +msgstr[1] "%d کلومیٹر میں" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "" -msgid "into the ramp" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "" + +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "ڈھلان میں" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" -msgstr "%s سڑک میں سے %s%s%s" +msgid "%sinto %s%s%s" +msgstr "%sمیں سے %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" -msgstr "%s میں سے %s%s%s" +msgid "%sinto %s%s%s|masculine form" +msgstr "%sمیں سے %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" -msgstr "%s میں سے %s%s%s" +msgid "%sinto %s%s%s|feminine form" +msgstr "%sمیں سے %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" -msgstr "%s میں سے %s%s%s" +msgid "%sinto %s%s%s|neuter form" +msgstr "%sمیں سے %s%s%s" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) #, c-format msgid "%sinto the %s" msgstr "%sپر %s" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "دایئں" - -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "بایئں" - -#. TRANSLATORS: Don't forget the ending space -msgid "easily " -msgstr "آسانی سے " - -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " -msgstr "سختی سے " - msgid "When possible, please turn around" msgstr "جب ممکن ہو گھومیں" -msgid "Set as destination" -msgstr "بطور منزل انتخاب" - -msgid "Enter Destination" -msgstr "منزل داخل کریں" +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" +msgstr "" -msgid "Enable/disable automatic zoom level changing" -msgstr "فعال/غیر فعال کریں زوم کی خود کار تبدیلی" +#, c-format +msgid "Follow the road for the next %s" +msgstr "%s تک سڑک کے مطابق جایئں" -msgid " Elevation " -msgstr " ارتفاع " +msgid "Enter the roundabout soon" +msgstr "" +#. TRANSLATORS: %s is the distance to the roundabout #, c-format -msgid "Current profile: %s" -msgstr "موجودہ پروفائل: %s" +msgid "Enter the roundabout %s" +msgstr "" -msgid "Add Bookmark" -msgstr "بک مارک میں شامل" +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" +msgstr "پھر گول چوراہے کو %1$s %2$s پے چھوڑ دیں" +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow #, c-format -msgid "setting '%s' to '%s'\n" -msgstr "ترتیب '%s' سے '%s'\n" +msgid "Leave the roundabout at the %1$s %2$s" +msgstr "گول چوراہے کو %1$s %2$s پے چھوڑ دیں" -#. TRANSLATORS: the following counts refer to streets -msgid "zeroth" -msgstr "صفر سے" +msgid "soon" +msgstr "جلد ہی" -#, c-format -msgid "in %d m" -msgstr "%d میٹر میں" +msgid "now" +msgstr "اب" -#, c-format -msgid "%d feet" +msgid "then" msgstr "" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "in %d feet" +msgid "then merge%1$s|right" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. #, c-format -msgid "%d.%d miles" +msgid "Merge %1$s%2$s|right" msgstr "" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "in %d.%d miles" +msgid "then merge%1$s|left" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "one mile" -msgid_plural "%d miles" -msgstr[0] "" -msgstr[1] "" +msgid "Merge %1$s%2$s|left" +msgstr "" -#, c-format -msgid "in one mile" -msgid_plural "in %d miles" -msgstr[0] "" -msgstr[1] "" +msgid "on your left" +msgstr "" +msgid "on your right" +msgstr "" + +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "one kilometer" -msgid_plural "%d kilometers" -msgstr[0] "ایک کلومیٹر" -msgstr[1] "%d کلومیٹر" +msgid "Take exit %1$s %2$s %3$s" +msgstr "" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "in one kilometer" -msgid_plural "in %d kilometers" -msgstr[0] "ایک کلومیٹر میں" -msgstr[1] "%d کلومیٹر میں" +msgid "Take the exit %1$s %2$s%3$s" +msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +msgid "at exit" msgstr "" -msgid "Enter the roundabout soon" +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then continue straight%1$s" msgstr "" -#. TRANSLATORS: %s is the distance to the roundabout +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination #, c-format -msgid "Enter the roundabout %s" +msgid "Continue straight %1$s%2$s%3$s" msgstr "" +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "then leave the roundabout at the %s" +msgid "then keep right%1$s" msgstr "" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination #, c-format -msgid "Leave the roundabout at the %s" +msgid "Keep right %1$s%2$s%3$s" msgstr "" +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "Follow the road for the next %s" -msgstr "%s تک سڑک کے مطابق جایئں" +msgid "then keep left%1$s" +msgstr "" -msgid "soon" -msgstr "جلد ہی" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "دایئں" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "بایئں" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "آسانی سے " + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "سختی سے " -#. TRANSLATORS: First argument is the how manieth street to take, second the direction #, c-format msgid "Take the %1$s road to the %2$s" msgstr "سڑک تک %1$s سے %2$s" @@ -243,32 +324,59 @@ msgstr "سڑک تک %1$s سے %2$s" msgid "after %i roads" msgstr "%i سڑکوں کے بعد" -msgid "now" -msgstr "اب" +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination +#, c-format +msgid "Turn %1$s%2$s %3$s%4$s" +msgstr "%1$s%2$s %3$s%4$s گومیں" +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "" + +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "then take the %1$s road to the %2$s" +msgid "Make a U-turn %1$s|left" msgstr "" -msgid "error" +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" msgstr "" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "Turn %1$s%2$s %3$s%4$s" +msgid "Make a U-turn %1$s|right" msgstr "" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination -#, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" msgstr "" +msgid "then you have reached your destination." +msgstr "پھر آپ اپنی منزل پہ پہنچ جایئں گے" + +#. TRANSLATORS: the arg. is distance #, c-format msgid "You have reached your destination %s" msgstr "آپ اپنی منزل %s پے پہنچ کئے ہیں" -msgid "then you have reached your destination." -msgstr "پھر آپ اپنی منزل پہ پہنچ جایئں گے" +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "" + +msgid "Exit" +msgstr "اخراج" #. Android resource: @strings/position_popup_title msgid "Position" @@ -308,6 +416,9 @@ msgstr "" msgid "Set as position" msgstr "بطور موجودہ مقام انتخاب" +msgid "Set as destination" +msgstr "بطور منزل انتخاب" + msgid "Add as bookmark" msgstr "بک مارک میں محفوظ کریں" @@ -1395,6 +1506,9 @@ msgstr "سڑک" msgid "Number" msgstr "نمبر" +msgid "Enter Destination" +msgstr "منزل داخل کریں" + msgid "Zip Code" msgstr "زپ کوڈ" @@ -1504,6 +1618,9 @@ msgstr "دکھیں/نہ دیکھیں سفر کی تفصیل" msgid "_Autozoom" msgstr "خودکار زوم" +msgid "Enable/disable automatic zoom level changing" +msgstr "فعال/غیر فعال کریں زوم کی خود کار تبدیلی" + msgid "_Fullscreen" msgstr "پوری سکرین" @@ -1753,6 +1870,9 @@ msgstr "" msgid "Show Satellite Status" msgstr "سٹلائٹ کی حالت دیکھیں" +msgid " Elevation " +msgstr " ارتفاع " + msgid " Azimuth " msgstr " سمت " @@ -1769,6 +1889,10 @@ msgid "pedestrian" msgstr "پیدل" #, c-format +msgid "Current profile: %s" +msgstr "موجودہ پروفائل: %s" + +#, c-format msgid "Change profile to: %s" msgstr "پروفائل کو :%s میں بدلیں" @@ -1781,6 +1905,9 @@ msgstr "سٹلائٹ کی حالت دیکھیں" msgid "Show NMEA data" msgstr "NMEA ڈیٹا دیکھیں" +msgid "Add Bookmark" +msgstr "بک مارک میں شامل" + msgid "Rename" msgstr "تبدیل نام" @@ -1804,10 +1931,10 @@ msgstr "" msgid "Enter Coordinates" msgstr "" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/vi.po.in b/po/vi.po.in index 1d75adf69..2998e1411 100644 --- a/po/vi.po.in +++ b/po/vi.po.in @@ -5,19 +5,19 @@ # Hoàng Đỗ Can Trực https://launchpad.net/~truc294 # Le Viet Thanh https://launchpad.net/~lethanhx2k # Saki https://launchpad.net/~nhkhoi - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2013-09-28 01:43+0000\n" "Last-Translator: Nguyễn Hào Khôi <Unknown>\n" "Language-Team: Vietnamese <vi@li.org>\n" +"Language: vi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"Language: vi\n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -133,88 +133,188 @@ msgid "in one kilometer" msgid_plural "in %d kilometers" msgstr[0] "trong %d km" -msgid "exit" -msgstr "thoát" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" -msgid "into the ramp" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "" + +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "vào dốc" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" -msgstr "%svào phố %s%s%s" +msgid "%sinto %s%s%s" +msgstr "%svào %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" -msgstr "%svào %s%s%s|male form" +msgid "%sinto %s%s%s|masculine form" +msgstr "%svào %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" -msgstr "%svào %s%s%s|female form" +msgid "%sinto %s%s%s|feminine form" +msgstr "%svào %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" -msgstr "%svào %s%s%s|neutral form" +msgid "%sinto %s%s%s|neuter form" +msgstr "%svào %s%s%s" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) #, c-format msgid "%sinto the %s" msgstr "%svào %s" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "phải" +msgid "When possible, please turn around" +msgstr "Khi có thể, hãy quay vòng" -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "trái" +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" +msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "easily " -msgstr "dễ dàng " +#, c-format +msgid "Follow the road for the next %s" +msgstr "Đường tiếp theo %s" -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " -msgstr "mạnh " +msgid "Enter the roundabout soon" +msgstr "Sắp tới chỗ vòng" -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " +#. TRANSLATORS: %s is the distance to the roundabout +#, c-format +msgid "Enter the roundabout %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" +msgstr "sau đó ra khỏi đường vòng tại %1$s %2$s" + +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "Leave the roundabout at the %1$s %2$s" +msgstr "Ra khỏi đường vòng tại %1$s %2$s" + +msgid "soon" +msgstr "ngay" + +msgid "now" +msgstr "bây giờ" + +msgid "then" +msgstr "sau đó" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|right" msgstr "" -msgid "When possible, please turn around" -msgstr "Khi có thể, hãy quay vòng" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|right" +msgstr "" -msgid "Enter the roundabout soon" -msgstr "Sắp tới chỗ vòng" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|left" +msgstr "" -#. TRANSLATORS: %s is the distance to the roundabout +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Enter the roundabout %s" +msgid "Merge %1$s%2$s|left" +msgstr "" + +msgid "on your left" msgstr "" +msgid "on your right" +msgstr "" + +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "then leave the roundabout at the %s" +msgid "Take exit %1$s %2$s %3$s" msgstr "" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "Leave the roundabout at the %s" +msgid "Take the exit %1$s %2$s%3$s" +msgstr "" + +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" msgstr "" +msgid "at exit" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "Follow the road for the next %s" -msgstr "Đường tiếp theo %s" +msgid "then continue straight%1$s" +msgstr "" -msgid "soon" -msgstr "ngay" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep right%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep right %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "phải" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "trái" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "dễ dàng " + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "mạnh " -#. TRANSLATORS: First argument is the how manieth street to take, second the direction #, c-format msgid "Take the %1$s road to the %2$s" msgstr "Có %1$s đường đến %2$s" @@ -223,32 +323,59 @@ msgstr "Có %1$s đường đến %2$s" msgid "after %i roads" msgstr "sau %i đường" -msgid "now" -msgstr "bây giờ" +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination +#, c-format +msgid "Turn %1$s%2$s %3$s%4$s" +msgstr "Rẽ %1$s%2$s %3$s%4$s" + +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "" +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "then take the %1$s road to the %2$s" +msgid "Make a U-turn %1$s|left" msgstr "" -msgid "error" +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" msgstr "" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "Turn %1$s%2$s %3$s%4$s" +msgid "Make a U-turn %1$s|right" msgstr "" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination -#, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" msgstr "" +msgid "then you have reached your destination." +msgstr "sau đó bạn tới điểm đích" + +#. TRANSLATORS: the arg. is distance #, c-format msgid "You have reached your destination %s" msgstr "Bạn vừa tới điểm đích: %s" -msgid "then you have reached your destination." -msgstr "sau đó bạn tới điểm đích" +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "" + +msgid "Exit" +msgstr "Thoát" #. Android resource: @strings/position_popup_title msgid "Position" @@ -1803,10 +1930,10 @@ msgstr "" msgid "Enter Coordinates" msgstr "" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/zh_CN.po.in b/po/zh_CN.po.in index d6db35f7d..505d137e2 100644 --- a/po/zh_CN.po.in +++ b/po/zh_CN.po.in @@ -9,19 +9,19 @@ # Lele Long https://launchpad.net/~schemacs # Li Jin https://launchpad.net/~lijin # kelvin https://launchpad.net/~kelvinz - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2013-09-28 01:46+0000\n" "Last-Translator: Kyle WANG <waxaca@163.com>\n" "Language-Team: Simplified Chinese <zh_CN@li.org>\n" +"Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"Language: \n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -137,88 +137,188 @@ msgid "in one kilometer" msgid_plural "in %d kilometers" msgstr[0] "距离%d千米" -msgid "exit" -msgstr "退出" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "" -msgid "into the ramp" +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "进入坡道" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" -msgstr "%s 到达街区 %s%s%s" +msgid "%sinto %s%s%s" +msgstr "%s到达 %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" -msgstr "%s 到达 %s%s%s | male form" +msgid "%sinto %s%s%s|masculine form" +msgstr "%s到达 %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" -msgstr "%s 到达 %s%s%s | female form" +msgid "%sinto %s%s%s|feminine form" +msgstr "%s到达 %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" -msgstr "%s 到达 %s%s%s | neutral form" +msgid "%sinto %s%s%s|neuter form" +msgstr "%s到达 %s%s%s" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) #, c-format msgid "%sinto the %s" -msgstr "%s 到达 %s" +msgstr "%s到达 %s" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "右" +msgid "When possible, please turn around" +msgstr "当遇到路口的时候，请转弯" -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "左" +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" +msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "easily " -msgstr "缓 " +#, c-format +msgid "Follow the road for the next %s" +msgstr "沿路继续行驶%s" -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " -msgstr "急转 " +msgid "Enter the roundabout soon" +msgstr "不久将进入环形交叉路口" -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " +#. TRANSLATORS: %s is the distance to the roundabout +#, c-format +msgid "Enter the roundabout %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" +msgstr "然后在%1$s %2$s处驶出环形区" + +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "Leave the roundabout at the %1$s %2$s" +msgstr "还有%1$s %2$s就将驶离环形区" + +msgid "soon" +msgstr "不久" + +msgid "now" +msgstr "现在" + +msgid "then" +msgstr "然后" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|right" msgstr "" -msgid "When possible, please turn around" -msgstr "当遇到路口的时候，请转弯" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|right" +msgstr "" -msgid "Enter the roundabout soon" -msgstr "不久将进入环形交叉路口" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|left" +msgstr "" -#. TRANSLATORS: %s is the distance to the roundabout +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Enter the roundabout %s" +msgid "Merge %1$s%2$s|left" +msgstr "" + +msgid "on your left" msgstr "" +msgid "on your right" +msgstr "" + +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "then leave the roundabout at the %s" +msgid "Take exit %1$s %2$s %3$s" msgstr "" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "Leave the roundabout at the %s" +msgid "Take the exit %1$s %2$s%3$s" +msgstr "" + +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" +msgstr "" + +msgid "at exit" msgstr "" +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "Follow the road for the next %s" -msgstr "沿路继续行驶%s" +msgid "then continue straight%1$s" +msgstr "" -msgid "soon" -msgstr "不久" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep right%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep right %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "右" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "左" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "缓 " + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "急转 " -#. TRANSLATORS: First argument is the how manieth street to take, second the direction #, c-format msgid "Take the %1$s road to the %2$s" msgstr "可以经由道路 %1$s 到 %2$s" @@ -227,32 +327,59 @@ msgstr "可以经由道路 %1$s 到 %2$s" msgid "after %i roads" msgstr "之后有 %i 条道路" -msgid "now" -msgstr "现在" +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination +#, c-format +msgid "Turn %1$s%2$s %3$s%4$s" +msgstr "转向 %1$s%2$s %3$s%4$s" +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "" + +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "then take the %1$s road to the %2$s" +msgid "Make a U-turn %1$s|left" msgstr "" -msgid "error" +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" msgstr "" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "Turn %1$s%2$s %3$s%4$s" +msgid "Make a U-turn %1$s|right" msgstr "" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination -#, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" msgstr "" +msgid "then you have reached your destination." +msgstr "然后你就到达您的目的地" + +#. TRANSLATORS: the arg. is distance #, c-format msgid "You have reached your destination %s" msgstr "您已经抵达您的目的地 %s" -msgid "then you have reached your destination." -msgstr "然后你就到达您的目的地" +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "交流道" + +msgid "Exit" +msgstr "退出" #. Android resource: @strings/position_popup_title msgid "Position" @@ -1807,10 +1934,10 @@ msgstr "" msgid "Enter Coordinates" msgstr "" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" diff --git a/po/zh_HK.po.in b/po/zh_HK.po.in index 88ecf81b3..89ec37934 100644 --- a/po/zh_HK.po.in +++ b/po/zh_HK.po.in @@ -5,19 +5,19 @@ # KaZeR https://launchpad.net/~kazer # Kyle https://launchpad.net/~kylelover # Walter Cheuk https://launchpad.net/~wwycheuk - msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-03 02:23+0200\n" "PO-Revision-Date: 2013-09-28 01:45+0000\n" "Last-Translator: KaZeR <Unknown>\n" "Language-Team: Chinese (Hong Kong) <zh_HK@li.org>\n" +"Language: zh_HK\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"Language: zh_HK\n" "X-Report-Errors: https://translations.launchpad.net/navit/trunk/+pots/navit\n" msgid "Running from source directory\n" @@ -133,30 +133,53 @@ msgid "in one kilometer" msgid_plural "in %d kilometers" msgstr[0] "在 %d 千米內" -msgid "exit" -msgstr "退出" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Systematic Street Name 3: Separator (Space if required), 4: Street Name +#, c-format +msgid "%1$sonto the %2$s%3$s%4$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name +#, c-format +msgid "%1$sonto %2$s" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Masculine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|masculine form" +msgstr "" + +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Feminine form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|feminine form" +msgstr "" -msgid "into the ramp" +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name. Neuter form. The stuff after | doesn't have to be included +#, c-format +msgid "%1$sonto %2$s|neuter form" +msgstr "" + +#. TRANSLATORS: motorway ramp refers to the slip road for entering a motorway. +msgid "onto the motorway ramp" msgstr "進入斜路" #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name #, c-format -msgid "%sinto the street %s%s%s" -msgstr "%s進入 %s 街道%s%s" +msgid "%sinto %s%s%s" +msgstr "%s進入 %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Masculine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|male form" +msgid "%sinto %s%s%s|masculine form" msgstr "%s進入 %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Feminine form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|female form" +msgid "%sinto %s%s%s|feminine form" msgstr "%s進入 %s%s%s" -#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included +#. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neuter form. The stuff after | doesn't have to be included #, c-format -msgid "%sinto the %s%s%s|neutral form" +msgid "%sinto %s%s%s|neuter form" msgstr "%s進入 %s%s%s" #. TRANSLATORS: gives the name of the next road to turn into (into the E17) @@ -164,57 +187,134 @@ msgstr "%s進入 %s%s%s" msgid "%sinto the %s" msgstr "%s進入 %s" -#. TRANSLATORS: right, as in 'Turn right' -msgid "right" -msgstr "右" +msgid "When possible, please turn around" +msgstr "如可以請掉頭" -#. TRANSLATORS: left, as in 'Turn left' -msgid "left" -msgstr "左" +#. TRANSLATORS: the argument is the destination to follow +#, c-format +msgid "towards %s" +msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "easily " -msgstr "简单 " +#, c-format +msgid "Follow the road for the next %s" +msgstr "直走到下一个%s" -#. TRANSLATORS: Don't forget the ending space -msgid "strongly " -msgstr "大力轉 " +msgid "Enter the roundabout soon" +msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "really strongly " +#. TRANSLATORS: %s is the distance to the roundabout +#, c-format +msgid "Enter the roundabout %s" msgstr "" -#. TRANSLATORS: Don't forget the ending space -msgid "unknown " +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "then leave the roundabout at the %1$s %2$s" +msgstr "然後在 %1$s %2$s 離開迴旋處" + +#. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow +#, c-format +msgid "Leave the roundabout at the %1$s %2$s" +msgstr "在 %1$s %2$s 離開迴旋處" + +msgid "soon" +msgstr "即將" + +msgid "now" +msgstr "現在" + +msgid "then" +msgstr "然後" + +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|right" msgstr "" -msgid "When possible, please turn around" -msgstr "如可以請掉頭" +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included. +#, c-format +msgid "Merge %1$s%2$s|right" +msgstr "" -msgid "Enter the roundabout soon" +#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. +#, c-format +msgid "then merge%1$s|left" msgstr "" -#. TRANSLATORS: %s is the distance to the roundabout +#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included. #, c-format -msgid "Enter the roundabout %s" +msgid "Merge %1$s%2$s|left" +msgstr "" + +msgid "on your left" msgstr "" +msgid "on your right" +msgstr "" + +#. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format -msgid "then leave the roundabout at the %s" +msgid "Take exit %1$s %2$s %3$s" msgstr "" +#. TRANSLATORS: the first arg. is the direction of exit, the second is distance, the third is destination #, c-format -msgid "Leave the roundabout at the %s" +msgid "Take the exit %1$s %2$s%3$s" +msgstr "" + +#. TRANSLATORS: as in "Keep right at interchange 42 Greenmond-West" +msgid "at interchange" msgstr "" +msgid "at exit" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver #, c-format -msgid "Follow the road for the next %s" -msgstr "直走到下一个%s" +msgid "then continue straight%1$s" +msgstr "" -msgid "soon" -msgstr "即將" +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Continue straight %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep right%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep right %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: the arg. is where to do the maneuver +#, c-format +msgid "then keep left%1$s" +msgstr "" + +#. TRANSLATORS: the first arg. is distance, the second is where to do the maneuver, the third is destination +#, c-format +msgid "Keep left %1$s%2$s%3$s" +msgstr "" + +#. TRANSLATORS: "right" as in "turn right" +msgid "right" +msgstr "右" + +#. TRANSLATORS: "left" as in "turn left" +msgid "left" +msgstr "左" + +#. TRANSLATORS: as in "turn easily right" +msgid "easily " +msgstr "简单 " + +#. TRANSLATORS: as in "turn strongly right" +msgid "strongly " +msgstr "大力轉 " -#. TRANSLATORS: First argument is the how manieth street to take, second the direction #, c-format msgid "Take the %1$s road to the %2$s" msgstr "取 %1$s 路往%2$s方向" @@ -223,32 +323,59 @@ msgstr "取 %1$s 路往%2$s方向" msgid "after %i roads" msgstr "%i 條路之後" -msgid "now" -msgstr "現在" +#. cave: no else - may come from 'if (skip_roads)' above ! +#. TRANSLATORS: the first arg. is strength, the second is direction, the third is distance, the fourth is destination +#, c-format +msgid "Turn %1$s%2$s %3$s%4$s" +msgstr "%1$s转向%2$s %3$s至%4$s" + +#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|left" +msgstr "" +#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "then take the %1$s road to the %2$s" +msgid "Make a U-turn %1$s|left" msgstr "" -msgid "error" +#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included. +msgid "then make a U-turn|right" msgstr "" -#. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street' +#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included. #, c-format -msgid "Turn %1$s%2$s %3$s%4$s" +msgid "Make a U-turn %1$s|right" msgstr "" -#. TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination -#, c-format -msgid "then turn %1$s%2$s %3$s%4$s" +#. An empty placeholder that we can use in the future for +#. * some motorway commands that are now suppressed but we +#. * can in some cases make it say here : +#. * 'follow destination blabla' without any further driving instructions, +#. * in cases where relevant destination info is available. +#. * Even if there is no driving command to be announced, in some cases +#. * there is an overhead roadsign in preparation of an upcoming road-split, +#. * and then we can give usefull info to the driver. +#. * +#. * UNTESTED ! +#. * +#. +msgid "follow" msgstr "" +msgid "then you have reached your destination." +msgstr "然後會到達目的地" + +#. TRANSLATORS: the arg. is distance #, c-format msgid "You have reached your destination %s" msgstr "已到達目的地 %s" -msgid "then you have reached your destination." -msgstr "然後會到達目的地" +#. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East" +msgid "Interchange" +msgstr "" + +msgid "Exit" +msgstr "退出" #. Android resource: @strings/position_popup_title msgid "Position" @@ -1803,10 +1930,10 @@ msgstr "" msgid "Enter Coordinates" msgstr "" -#. +#. #. w=gui_internal_box_new(this, gravity_left_top|orientation_vertical|flags_expand|flags_fill) #. gui_internal_widget_append(wb, w) -#. +#. #. we=gui_internal_box_new(this, gravity_left_center|orientation_horizontal|flags_fill) #. gui_internal_widget_append(w, we) msgid "Latitude Longitude" |
