Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-03-03 23:59:56 +01:00
commit 2aaada7c86
2 changed files with 4 additions and 4 deletions

View file

@ -155,9 +155,9 @@ public class TurnType {
}
// lanes encoded as array of int
// 0 byte - 0/1 - to use or not
// 1-5 byte - additional turn info
// 6-10 byte - secondary turn
// 0 bit - 0/1 - to use or not
// 1-5 bits - additional turn info
// 6-10 bits - secondary turn
public void setLanes(int[] lanes) {
this.lanes = lanes;
}

View file

@ -2260,7 +2260,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
<string name="confirm_download_roadmaps">Jums jau ir standarta (pilnā) karte, vai lejupielādēt arī ceļu sazarojuma karti?</string>
<string name="value_downloaded_of_max">%1$.1f no %2$.1f MB</string>
<string name="file_size_in_mb">%.1f MB</string>
<string name="update_all">Atjaunināt visu (%1 $s MB)</string>
<string name="update_all">Atjaunināt visu (%1$s MB)</string>
<string name="free_downloads_used">Izmantotās bezmaksas lejupielādes</string>
<string name="free_downloads_used_description">Cik daudz brīvās lejupielādes ir izmantotas</string>