From: Tom Hughes Date: Tue, 25 Jun 2024 16:35:26 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/pull/4915' X-Git-Tag: live~376 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/4c6e9de1ad453b92780c93f9d643b7dc0a582c30?hp=06820acc4b3c818ad0e5d282490ac8413d966151 Merge remote-tracking branch 'upstream/pull/4915' --- diff --git a/Gemfile.lock b/Gemfile.lock index 28acf9135..21488bc99 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -83,8 +83,8 @@ GEM minitest (>= 5.1) mutex_m tzinfo (~> 2.0) - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) annotate (3.2.0) activerecord (>= 3.2, < 8.0) rake (>= 10.4, < 14.0) @@ -95,17 +95,17 @@ GEM autoprefixer-rails (10.4.16.0) execjs (~> 2) aws-eventstream (1.3.0) - aws-partitions (1.944.0) - aws-sdk-core (3.197.0) + aws-partitions (1.947.0) + aws-sdk-core (3.198.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.85.0) - aws-sdk-core (~> 3, >= 3.197.0) + aws-sdk-kms (1.86.0) + aws-sdk-core (~> 3, >= 3.198.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.152.3) - aws-sdk-core (~> 3, >= 3.197.0) + aws-sdk-s3 (1.153.0) + aws-sdk-core (~> 3, >= 3.198.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.8) aws-sigv4 (1.8.0) @@ -178,7 +178,7 @@ GEM activerecord (>= 3.0, < 8.0) delayed_job (>= 3.0, < 5) docile (1.4.0) - doorkeeper (5.7.0) + doorkeeper (5.7.1) railties (>= 5) doorkeeper-i18n (5.2.7) doorkeeper (>= 5.2) @@ -311,6 +311,7 @@ GEM listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) + logger (1.6.0) logstasher (2.1.5) activesupport (>= 5.2) request_store @@ -330,7 +331,7 @@ GEM mini_portile2 (2.8.7) mini_racer (0.9.0) libv8-node (~> 18.19.0.0) - minitest (5.23.1) + minitest (5.24.0) minitest-focus (1.4.0) minitest (>= 4, < 6) msgpack (1.7.2) @@ -339,7 +340,7 @@ GEM mutex_m (0.2.0) net-http (0.4.1) uri - net-imap (0.4.13) + net-imap (0.4.14) date net-protocol net-pop (0.1.2) @@ -409,7 +410,7 @@ GEM progress (3.6.0) psych (5.1.2) stringio - public_suffix (5.1.1) + public_suffix (6.0.0) puma (5.6.8) nio4r (~> 2.0) quad_tile (1.0.1) @@ -482,7 +483,7 @@ GEM io-console (~> 0.5) request_store (1.7.0) rack (>= 1.4) - rexml (3.3.0) + rexml (3.3.1) strscan rinku (2.0.6) rotp (6.3.0) @@ -530,8 +531,9 @@ GEM sass-embedded (1.64.2) google-protobuf (~> 3.23) rake (>= 13.0.0) - selenium-webdriver (4.21.1) + selenium-webdriver (4.22.0) base64 (~> 0.2) + logger (~> 1.4) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) diff --git a/app/assets/images/osm_logo.png b/app/assets/images/osm_logo.png deleted file mode 100644 index 22f116632..000000000 Binary files a/app/assets/images/osm_logo.png and /dev/null differ diff --git a/app/assets/images/osm_logo.svg b/app/assets/images/osm_logo.svg index 2919c1441..4189d70e7 100644 --- a/app/assets/images/osm_logo.svg +++ b/app/assets/images/osm_logo.svg @@ -1,3336 +1,323 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - + + - - + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - - - - - - - - - + + - - - - + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - image/svg+xml - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - - - - + + + + + + + + + + + - - - - - + + + + + + + + + - - - - - - - - - - - + + + + - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - 010110010011010110010011 - 010110010011010110010011 + d="M191.064 54.751l-2.756-.001-2.987.717-.001 2.57 2.969-.733v9.367l-3.191.001v2.515l9.155-.002v-2.513l-3.191.001V54.751zm-12.891-.196c-.271-.044-.558-.065-.858-.065-1.592 0-2.785.625-3.577 1.875-.793 1.244-1.188 3.116-1.188 5.616 0 2.494.396 4.366 1.188 5.617.793 1.244 1.985 1.867 3.577 1.867 1.598 0 2.795-.622 3.588-1.866s1.19-3.117 1.19-5.618c0-2.507-.398-4.383-1.191-5.627a3.82 3.82 0 0 0-2.729-1.799zm-11.921 0c-.271-.044-.558-.065-.858-.065-1.592 0-2.783.625-3.575 1.876-.793 1.244-1.19 3.115-1.19 5.616 0 2.494.396 4.366 1.188 5.617.793 1.244 1.986 1.867 3.578 1.867 1.598 0 2.793-.622 3.586-1.866s1.19-3.115 1.19-5.616c0-2.507-.396-4.383-1.189-5.627-.644-1.011-1.555-1.612-2.731-1.802zm11.304 2.371c.541.088.944.485 1.209 1.19.303.806.454 2.094.454 3.867 0 1.766-.151 3.051-.454 3.857s-.787 1.208-1.45 1.208c-.657 0-1.137-.402-1.44-1.208s-.456-2.091-.456-3.857c0-1.772.152-3.061.455-3.867s.783-1.21 1.441-1.21a1.49 1.49 0 0 1 .24.02zm-22.254-2.176l-2.756.001-2.988.714v2.572l2.968-.735v9.369h-3.191l.002 2.513h9.155V66.67l-3.191.001V54.75zm10.333 2.175c.541.088.944.485 1.209 1.19.303.806.454 2.094.454 3.867 0 1.766-.151 3.051-.454 3.857s-.787 1.208-1.45 1.208c-.657 0-1.137-.402-1.44-1.208s-.456-2.091-.456-3.857c0-1.772.152-3.061.455-3.867s.783-1.21 1.441-1.21a1.49 1.49 0 0 1 .24.02zm-22.254-2.174h-2.756l-2.986.715-.001 2.572 2.968-.735v9.369l-3.189.001v2.513h9.155v-2.513l-3.191-.001V54.751zm34.18 6.044a1.35 1.35 0 0 0-.246-.023 1.16 1.16 0 0 0-.851.349 1.17 1.17 0 0 0-.348.861c0 .342.116.627.348.859.232.226.517.339.852.339.342 0 .627-.116.859-.348s.349-.516.349-.851a1.17 1.17 0 0 0-.348-.861c-.174-.174-.38-.282-.615-.326zm-47.07-6.24a5.39 5.39 0 0 0-.857-.067c-1.592 0-2.785.627-3.578 1.877-.793 1.244-1.188 3.116-1.188 5.616 0 2.494.396 4.366 1.188 5.617.793 1.244 1.985 1.867 3.577 1.867 1.598 0 2.795-.622 3.588-1.866s1.188-3.117 1.188-5.618c0-2.507-.396-4.383-1.189-5.627a3.82 3.82 0 0 0-2.729-1.799zm35.149 6.239c-.079-.015-.16-.021-.246-.021-.335 0-.619.115-.851.347s-.346.519-.346.861.116.627.348.859c.232.226.515.339.85.339a1.17 1.17 0 0 0 .861-.348c.232-.232.347-.516.347-.851a1.17 1.17 0 0 0-.348-.861c-.174-.174-.38-.282-.615-.326zm-46.1-6.045h-2.754l-2.989.716v2.572l2.968-.735v9.369l-3.191-.001v2.515h9.155v-2.515h-3.191V54.75zm10.335 2.176c.541.088.945.483 1.21 1.188.303.806.454 2.096.454 3.869 0 1.766-.151 3.051-.454 3.857s-.787 1.208-1.45 1.208c-.657 0-1.139-.403-1.442-1.208s-.454-2.091-.454-3.857c0-1.772.153-3.063.456-3.869s.783-1.208 1.441-1.208a1.49 1.49 0 0 1 .24.02zm-23.225-2.372c-.271-.044-.556-.065-.856-.065-1.592 0-2.785.625-3.577 1.875-.793 1.244-1.19 3.115-1.19 5.616 0 2.494.398 4.367 1.19 5.617.793 1.244 1.985 1.867 3.577 1.867 1.598 0 2.793-.622 3.586-1.866s1.19-3.115 1.19-5.616c0-2.507-.396-4.383-1.189-5.627-.644-1.011-1.555-1.612-2.731-1.802zm-.616 2.371c.541.088.944.485 1.209 1.19.303.806.454 2.094.454 3.867 0 1.766-.151 3.051-.454 3.857s-.787 1.208-1.45 1.208c-.657 0-1.137-.402-1.44-1.208s-.454-2.091-.454-3.857c0-1.772.15-3.061.453-3.867s.783-1.21 1.441-1.21a1.49 1.49 0 0 1 .24.02zm23.847 3.871c-.079-.015-.16-.023-.246-.023a1.16 1.16 0 0 0-.851.349c-.232.232-.348.517-.348.859a1.17 1.17 0 0 0 .348.861c.232.226.517.339.852.339.342 0 .627-.116.859-.348s.349-.516.349-.851a1.17 1.17 0 0 0-.348-.861c-.174-.174-.38-.282-.615-.326zm-23.842-.001c-.079-.015-.16-.021-.246-.021-.335 0-.617.115-.849.347a1.17 1.17 0 0 0-.348.861c0 .342.116.627.348.859.232.226.515.339.85.339a1.17 1.17 0 0 0 .861-.348c.232-.232.347-.516.347-.851a1.17 1.17 0 0 0-.348-.861c-.174-.174-.38-.282-.615-.326zM191.064 79.5h-2.754l-2.989.716.001 2.572 2.968-.735v9.369l-3.191-.001v2.515h9.155V91.42l-3.189.001-.001-11.921zm-12.891-.196c-.271-.044-.556-.065-.856-.065-1.592 0-2.785.625-3.577 1.875-.793 1.244-1.19 3.115-1.19 5.616 0 2.494.397 4.369 1.19 5.619.793 1.244 1.985 1.865 3.577 1.865 1.598 0 2.793-.622 3.586-1.866s1.19-3.115 1.19-5.616c0-2.507-.396-4.383-1.189-5.627-.644-1.011-1.555-1.612-2.731-1.802zm-10.949.195l-2.756.001-2.986.715-.001 2.572 2.968-.735v9.369l-3.189.001v2.513h9.155v-2.515l-3.191.001V79.499zm10.333 2.175c.541.088.944.485 1.209 1.19.303.806.454 2.094.454 3.867 0 1.766-.151 3.051-.454 3.857s-.787 1.208-1.45 1.208c-.657 0-1.137-.402-1.44-1.208s-.454-2.091-.454-3.857c0-1.772.15-3.061.453-3.867s.783-1.21 1.441-1.21a1.49 1.49 0 0 1 .24.02zm-23.224-2.369a5.39 5.39 0 0 0-.857-.067c-1.592 0-2.785.625-3.577 1.875-.793 1.244-1.188 3.117-1.188 5.618 0 2.494.396 4.366 1.188 5.617.793 1.244 1.985 1.865 3.577 1.865 1.598 0 2.795-.622 3.588-1.866s1.188-3.116 1.188-5.616c0-2.507-.396-4.383-1.189-5.627a3.82 3.82 0 0 0-2.729-1.799zm-10.951.195h-2.756l-2.987.717.001 2.57 2.968-.733v9.367h-3.191v2.515l9.155-.002v-2.513h-3.191V79.5zm10.335 2.174c.541.088.944.485 1.209 1.19.303.806.454 2.094.454 3.867 0 1.766-.151 3.053-.454 3.859s-.787 1.208-1.45 1.208c-.657 0-1.139-.403-1.442-1.208s-.453-2.093-.453-3.859c0-1.772.152-3.061.455-3.867s.781-1.208 1.439-1.208a1.52 1.52 0 0 1 .242.018zm23.845 3.87c-.079-.015-.16-.021-.246-.021-.335 0-.617.115-.849.347a1.17 1.17 0 0 0-.348.861 1.17 1.17 0 0 0 .348.861c.232.226.516.337.851.337a1.17 1.17 0 0 0 .861-.348c.232-.232.347-.516.347-.851 0-.342-.116-.627-.348-.859a1.15 1.15 0 0 0-.615-.328zm-46.1-6.045h-2.754l-2.989.716.001 2.572 2.968-.735v9.369l-3.191-.001v2.515l9.157.001-.002-2.515-3.189.001-.001-11.921zm-12.891-.196c-.271-.044-.556-.065-.856-.065-1.592 0-2.785.625-3.577 1.875-.793 1.244-1.19 3.115-1.19 5.616 0 2.494.397 4.369 1.19 5.619.793 1.244 1.985 1.865 3.577 1.865 1.598 0 2.793-.622 3.586-1.866s1.19-3.115 1.19-5.616c0-2.507-.396-4.383-1.189-5.627-.644-1.011-1.555-1.612-2.731-1.802zm35.151 6.242a1.35 1.35 0 0 0-.246-.023c-.335 0-.619.115-.851.347a1.17 1.17 0 0 0-.348.861 1.17 1.17 0 0 0 .348.861c.232.226.515.339.85.339a1.17 1.17 0 0 0 .861-.349c.232-.232.348-.514.348-.849a1.17 1.17 0 0 0-.348-.861c-.174-.174-.38-.282-.615-.326zm-47.072-6.242c-.271-.044-.556-.065-.856-.065-1.592 0-2.785.625-3.577 1.875-.793 1.244-1.19 3.117-1.19 5.618 0 2.494.398 4.367 1.19 5.617.793 1.244 1.985 1.865 3.577 1.865 1.598 0 2.795-.622 3.588-1.866s1.188-3.116 1.188-5.616c0-2.507-.396-4.383-1.189-5.627-.644-1.011-1.555-1.612-2.731-1.802zm11.304 2.371c.541.088.944.485 1.209 1.19.303.806.456 2.095.456 3.867 0 1.766-.153 3.051-.456 3.857s-.787 1.208-1.45 1.208c-.657 0-1.137-.402-1.44-1.208s-.454-2.091-.454-3.857c0-1.772.15-3.061.453-3.867s.783-1.21 1.441-1.21a1.49 1.49 0 0 1 .24.02zm-11.919 0c.541.088.944.485 1.209 1.19.303.806.454 2.094.454 3.867 0 1.766-.153 3.051-.456 3.857s-.785 1.21-1.449 1.21c-.657 0-1.139-.405-1.441-1.21s-.454-2.091-.454-3.857c0-1.772.15-3.061.453-3.867s.783-1.208 1.441-1.208a1.52 1.52 0 0 1 .242.018zm11.926 3.87c-.079-.015-.162-.021-.248-.021-.335 0-.617.115-.849.347a1.17 1.17 0 0 0-.348.861 1.17 1.17 0 0 0 .348.861c.232.226.516.337.851.337a1.17 1.17 0 0 0 .861-.348c.232-.232.347-.516.347-.851 0-.342-.116-.627-.348-.859-.174-.174-.377-.284-.613-.327zm-11.921 0c-.079-.015-.16-.021-.246-.021-.335 0-.619.115-.851.347a1.17 1.17 0 0 0-.348.861 1.17 1.17 0 0 0 .348.861c.232.226.516.337.851.337a1.17 1.17 0 0 0 .861-.348c.232-.232.349-.516.349-.851 0-.342-.118-.627-.35-.859-.174-.174-.377-.284-.613-.327zm85.024 18.705l-2.756.001-2.986.715-.001 2.572 2.968-.735v9.369l-3.189.001v2.513h9.155v-2.515l-3.191.001v-11.921zm-11.921 0l-2.756.001-2.986.715-.001 2.572 2.97-.735v9.369l-3.191.001v2.513h9.155v-2.513l-3.191-.001v-11.921zm-12.891-.194a5.39 5.39 0 0 0-.857-.067c-1.592 0-2.785.625-3.577 1.875-.793 1.244-1.188 3.117-1.188 5.618 0 2.494.396 4.366 1.188 5.617.793 1.244 1.985 1.865 3.577 1.865 1.598 0 2.795-.62 3.587-1.864s1.188-3.117 1.188-5.618c0-2.507-.396-4.383-1.189-5.627a3.82 3.82 0 0 0-2.729-1.799zm-11.921 0c-.271-.044-.558-.065-.858-.065-1.592 0-2.783.625-3.575 1.876-.793 1.244-1.19 3.115-1.19 5.616 0 2.494.396 4.366 1.188 5.617.793 1.244 1.986 1.867 3.578 1.867 1.598 0 2.793-.622 3.586-1.866s1.19-3.117 1.19-5.618c0-2.507-.396-4.383-1.189-5.627-.644-1.011-1.555-1.61-2.731-1.8zm11.305 2.369c.541.088.944.485 1.209 1.19.303.806.454 2.094.454 3.867 0 1.766-.151 3.053-.454 3.859s-.787 1.208-1.45 1.208c-.657 0-1.137-.402-1.44-1.208s-.455-2.093-.455-3.859c0-1.772.152-3.061.455-3.867s.783-1.208 1.441-1.208c.083 0 .163.005.24.018zm-22.254-2.174l-2.756-.001-2.989.716.001 2.572 2.968-.735v9.369l-3.191-.001.002 2.515h9.155v-2.515h-3.191V104.25zm10.333 2.175c.541.088.944.485 1.209 1.19.303.806.454 2.094.454 3.867 0 1.766-.151 3.051-.454 3.857s-.787 1.208-1.45 1.208c-.657 0-1.137-.402-1.44-1.208s-.456-2.091-.456-3.857c0-1.772.152-3.061.455-3.867s.783-1.21 1.441-1.21a1.49 1.49 0 0 1 .24.02zm-23.225-2.372c-.271-.044-.556-.065-.856-.065-1.592 0-2.785.625-3.577 1.875-.793 1.244-1.19 3.115-1.19 5.616 0 2.494.397 4.369 1.19 5.619.793 1.244 1.985 1.865 3.577 1.865 1.598 0 2.795-.622 3.588-1.866s1.188-3.116 1.188-5.616c0-2.507-.396-4.383-1.189-5.627-.644-1.011-1.555-1.612-2.731-1.802zm35.151 6.242a1.35 1.35 0 0 0-.246-.023 1.16 1.16 0 0 0-.851.349c-.232.232-.348.517-.348.859a1.17 1.17 0 0 0 .348.861c.232.226.517.339.852.339.342 0 .627-.116.859-.348s.349-.516.349-.851a1.17 1.17 0 0 0-.348-.861c-.174-.174-.38-.282-.615-.326zm-47.07-6.242c-.271-.044-.558-.065-.858-.065-1.592 0-2.785.625-3.577 1.875-.793 1.244-1.188 3.117-1.188 5.618 0 2.494.396 4.366 1.188 5.617.793 1.244 1.985 1.865 3.577 1.865 1.598 0 2.795-.622 3.588-1.866s1.188-3.116 1.188-5.616c0-2.507-.396-4.383-1.189-5.627-.644-1.011-1.553-1.612-2.729-1.801zm11.303 2.371c.541.088.946.485 1.211 1.19.303.806.454 2.094.454 3.867 0 1.766-.153 3.051-.456 3.857s-.785 1.208-1.449 1.208c-.657 0-1.139-.403-1.442-1.208s-.454-2.091-.454-3.857c0-1.772.15-3.061.453-3.867s.783-1.208 1.441-1.208c.083 0 .163.005.24.018zm23.847 3.871a1.35 1.35 0 0 0-.246-.023 1.16 1.16 0 0 0-.851.349 1.17 1.17 0 0 0-.348.861c0 .342.118.627.35.859.232.226.515.339.85.339a1.17 1.17 0 0 0 .861-.348c.232-.232.347-.516.347-.851a1.17 1.17 0 0 0-.348-.861c-.174-.174-.38-.282-.615-.326zm-46.1-6.045h-2.756l-2.986.715v2.572l2.968-.735v9.369h-3.191v2.513h9.155v-2.513l-3.191-.001V104.25zm10.335 2.174c.541.088.944.485 1.209 1.19.303.806.454 2.094.454 3.867 0 1.766-.151 3.053-.454 3.859s-.787 1.208-1.45 1.208c-.657 0-1.139-.405-1.441-1.21s-.454-2.091-.454-3.857c0-1.772.152-3.061.455-3.867s.783-1.208 1.441-1.208c.083 0 .163.005.24.018zm11.926 3.87c-.079-.014-.16-.021-.246-.021-.335 0-.619.115-.851.347a1.17 1.17 0 0 0-.348.861 1.17 1.17 0 0 0 .348.861c.232.226.516.337.851.337a1.17 1.17 0 0 0 .861-.348c.232-.232.349-.516.349-.851 0-.342-.118-.627-.35-.859-.174-.174-.377-.284-.613-.327zm-11.921 0c-.079-.014-.16-.021-.246-.021-.335 0-.619.115-.851.347a1.17 1.17 0 0 0-.348.861 1.17 1.17 0 0 0 .348.861c.232.226.517.339.852.339.342 0 .627-.118.859-.35s.349-.516.349-.851c0-.342-.116-.627-.348-.859a1.15 1.15 0 0 0-.615-.328z" + opacity=".461" fill="url(#g)"/> + d="M190.635 53.464l-2.756-.001-2.987.717v2.572l2.968-.735v9.369l-3.191-.001v2.515h9.155v-2.515l-3.191.001V53.464zm-12.891-.196c-.271-.044-.556-.065-.856-.065-1.592 0-2.785.625-3.577 1.875-.793 1.244-1.19 3.117-1.19 5.618 0 2.494.396 4.366 1.188 5.617.793 1.244 1.987 1.865 3.579 1.865 1.598 0 2.793-.622 3.586-1.866s1.19-3.115 1.19-5.616c0-2.507-.396-4.383-1.189-5.627-.644-1.011-1.555-1.612-2.731-1.802zm-11.921.001c-.271-.044-.556-.067-.855-.067-1.592 0-2.785.625-3.577 1.875-.793 1.244-1.19 3.117-1.19 5.618 0 2.494.398 4.367 1.19 5.617.793 1.244 1.985 1.865 3.577 1.865 1.598 0 2.793-.622 3.586-1.866s1.19-3.115 1.19-5.616c0-2.507-.396-4.383-1.189-5.627-.644-1.011-1.555-1.61-2.731-1.8zm11.305 2.369c.541.088.944.485 1.209 1.19.303.806.454 2.094.454 3.867 0 1.766-.151 3.051-.454 3.857s-.787 1.21-1.451 1.21c-.657 0-1.137-.404-1.44-1.21s-.456-2.091-.456-3.857c0-1.772.152-3.061.455-3.867s.783-1.208 1.441-1.208c.083 0 .163.005.24.018zm-22.254-2.174l-2.756-.001-2.987.717-.001 2.57 2.969-.733v9.367l-3.191.001v2.515l9.155-.002v-2.513h-3.191V53.465zm10.333 2.174c.541.088.944.485 1.209 1.19.303.806.456 2.095.456 3.867 0 1.766-.153 3.053-.456 3.859s-.787 1.208-1.45 1.208c-.657 0-1.137-.402-1.44-1.208s-.453-2.093-.453-3.859c0-1.772.15-3.061.453-3.867s.783-1.208 1.441-1.208c.083 0 .163.005.24.018zm-22.254-2.174h-2.756l-2.987.717.001 2.572 2.968-.735v9.369l-3.191-.001v2.515h9.155v-2.515h-3.191V53.464zm34.18 6.044c-.079-.015-.16-.021-.246-.021-.335 0-.619.115-.851.347s-.346.519-.346.861a1.17 1.17 0 0 0 .348.861c.232.226.516.337.851.337a1.17 1.17 0 0 0 .861-.348c.232-.232.347-.516.347-.851 0-.342-.116-.627-.348-.859a1.15 1.15 0 0 0-.615-.328zm-47.07-6.24c-.271-.044-.558-.065-.858-.065-1.592 0-2.783.625-3.575 1.876-.793 1.244-1.19 3.115-1.19 5.616 0 2.494.395 4.368 1.188 5.619.793 1.244 1.987 1.865 3.579 1.865 1.598 0 2.793-.622 3.586-1.866s1.19-3.115 1.19-5.616c0-2.507-.398-4.383-1.191-5.627-.644-1.011-1.553-1.612-2.729-1.801zm35.151 6.242a1.37 1.37 0 0 0-.247-.023c-.335 0-.617.115-.849.347a1.17 1.17 0 0 0-.348.861 1.17 1.17 0 0 0 .348.861c.232.226.515.339.85.339a1.17 1.17 0 0 0 .861-.349 1.15 1.15 0 0 0 .346-.849 1.17 1.17 0 0 0-.348-.861 1.14 1.14 0 0 0-.613-.325zm-46.1-6.046l-2.756.001-2.988.714v2.572l2.968-.735v9.369h-3.191l.002 2.513h9.155v-2.515h-3.191V53.464zm10.333 2.175c.541.088.944.485 1.209 1.19.303.806.454 2.094.454 3.867 0 1.766-.151 3.051-.454 3.857s-.787 1.208-1.45 1.208c-.657 0-1.137-.402-1.44-1.208s-.456-2.091-.456-3.857c0-1.772.152-3.061.455-3.867s.783-1.21 1.441-1.21a1.49 1.49 0 0 1 .24.02zm-23.226-2.37c-.271-.044-.556-.067-.855-.067-1.592 0-2.785.625-3.577 1.875-.793 1.244-1.19 3.117-1.19 5.618 0 2.494.398 4.367 1.19 5.617.793 1.244 1.985 1.865 3.577 1.865 1.598 0 2.795-.622 3.588-1.866s1.188-3.116 1.188-5.616c0-2.507-.396-4.383-1.189-5.627-.644-1.011-1.555-1.61-2.731-1.8zm-.616 2.369c.541.088.946.485 1.211 1.19.303.806.454 2.094.454 3.867 0 1.766-.153 3.053-.456 3.859s-.785 1.208-1.449 1.208c-.657 0-1.139-.403-1.442-1.208s-.453-2.093-.453-3.859c0-1.772.15-3.061.453-3.867s.783-1.208 1.441-1.208c.083 0 .163.005.24.018zm23.847 3.871c-.079-.015-.16-.021-.246-.021-.335 0-.619.115-.851.347a1.17 1.17 0 0 0-.348.861 1.17 1.17 0 0 0 .349.861c.232.226.516.337.851.337.342 0 .627-.116.859-.348s.349-.516.349-.851a1.17 1.17 0 0 0-.348-.861c-.174-.174-.38-.282-.615-.326zm-23.84.001c-.079-.015-.16-.023-.246-.023-.335 0-.619.115-.851.347a1.17 1.17 0 0 0-.348.861 1.17 1.17 0 0 0 .348.861c.232.226.515.339.85.339a1.17 1.17 0 0 0 .861-.349c.232-.232.348-.514.348-.849a1.17 1.17 0 0 0-.349-.861 1.14 1.14 0 0 0-.613-.325zm85.025 18.703l-2.756.001-2.988.714.001 2.572 2.968-.735v9.369l-3.191.001.002 2.513h9.155v-2.513l-3.191-.001V78.213zm-12.893-.194c-.271-.044-.556-.067-.855-.067-1.592 0-2.785.625-3.577 1.875-.793 1.244-1.19 3.117-1.19 5.618 0 2.494.398 4.367 1.19 5.617.793 1.244 1.985 1.865 3.577 1.865 1.598 0 2.795-.62 3.587-1.864s1.188-3.117 1.188-5.618c0-2.507-.396-4.383-1.189-5.627-.644-1.011-1.555-1.61-2.731-1.8zm-10.949.195h-2.756l-2.987.717.001 2.57 2.968-.733v9.367h-3.191v2.515l9.155-.002v-2.513l-3.191.001V78.214zm10.333 2.174c.541.088.946.485 1.211 1.19.303.806.454 2.094.454 3.867 0 1.766-.153 3.053-.456 3.859s-.785 1.208-1.449 1.208c-.657 0-1.139-.403-1.442-1.208s-.453-2.093-.453-3.859c0-1.772.15-3.061.453-3.867s.783-1.208 1.44-1.208c.083 0 .163.005.24.018zm-23.224-2.369c-.271-.044-.558-.065-.858-.065-1.592 0-2.785.625-3.577 1.875-.793 1.244-1.188 3.116-1.188 5.616 0 2.494.396 4.366 1.188 5.617.793 1.244 1.986 1.867 3.578 1.867 1.598 0 2.793-.622 3.586-1.866s1.19-3.117 1.19-5.618c0-2.507-.398-4.383-1.191-5.627a3.82 3.82 0 0 0-2.729-1.799zm-10.951.195h-2.754l-2.989.716v2.572l2.968-.735v9.369h-3.191v2.513h9.157l-.002-2.515h-3.189l-.001-11.921zm10.335 2.176c.541.088.944.485 1.209 1.19.303.806.454 2.094.454 3.867 0 1.766-.151 3.051-.454 3.857s-.787 1.208-1.45 1.208c-.657 0-1.137-.402-1.44-1.208s-.456-2.091-.456-3.857c0-1.772.152-3.061.455-3.867s.783-1.21 1.441-1.21a1.49 1.49 0 0 1 .24.02zm23.847 3.871c-.079-.015-.16-.023-.246-.023-.335 0-.619.115-.851.347a1.17 1.17 0 0 0-.348.861 1.17 1.17 0 0 0 .348.861c.232.226.515.339.85.339a1.17 1.17 0 0 0 .861-.348c.232-.232.349-.516.349-.851a1.17 1.17 0 0 0-.349-.861 1.14 1.14 0 0 0-.613-.325zm-46.1-6.046l-2.756.001-2.986.715-.001 2.572 2.968-.735v9.369l-3.189.001v2.513h9.155v-2.513l-3.191-.001V78.213zm-12.893-.194c-.271-.044-.556-.067-.855-.067-1.592 0-2.785.625-3.577 1.875-.793 1.244-1.188 3.117-1.188 5.618 0 2.494.396 4.366 1.188 5.617.793 1.244 1.985 1.865 3.577 1.865 1.598 0 2.795-.62 3.587-1.864s1.188-3.117 1.188-5.618c0-2.507-.396-4.383-1.189-5.627-.644-1.011-1.555-1.61-2.731-1.8zm35.151 6.24a1.35 1.35 0 0 0-.246-.023 1.16 1.16 0 0 0-.851.349 1.17 1.17 0 0 0-.348.861c0 .342.118.627.35.859.232.226.515.339.85.339.342 0 .627-.116.859-.348s.349-.516.349-.851a1.17 1.17 0 0 0-.348-.861c-.174-.174-.38-.282-.615-.326zm-47.07-6.24c-.271-.044-.558-.065-.858-.065-1.592 0-2.785.625-3.577 1.875-.793 1.244-1.188 3.116-1.188 5.616 0 2.494.396 4.366 1.188 5.617.793 1.244 1.985 1.867 3.577 1.867 1.598 0 2.795-.622 3.588-1.866s1.19-3.117 1.19-5.618c0-2.507-.398-4.383-1.191-5.627a3.82 3.82 0 0 0-2.729-1.799zm11.305 2.369c.541.088.944.485 1.209 1.19.303.806.454 2.094.454 3.867 0 1.766-.151 3.053-.454 3.859s-.787 1.208-1.45 1.208c-.657 0-1.139-.403-1.442-1.208s-.453-2.093-.453-3.859c0-1.772.15-3.061.453-3.867s.783-1.208 1.441-1.208a1.52 1.52 0 0 1 .242.018zm-11.921.001c.541.088.944.485 1.209 1.19.303.806.454 2.094.454 3.867 0 1.766-.151 3.051-.454 3.857s-.787 1.208-1.45 1.208c-.657 0-1.137-.402-1.44-1.208s-.456-2.091-.456-3.857c0-1.772.153-3.063.456-3.869s.783-1.208 1.441-1.208a1.49 1.49 0 0 1 .24.02zm11.926 3.87c-.079-.015-.16-.023-.246-.023-.335 0-.619.115-.851.347a1.17 1.17 0 0 0-.348.861 1.17 1.17 0 0 0 .348.861c.232.226.515.339.85.339a1.17 1.17 0 0 0 .861-.348c.232-.232.349-.516.349-.851a1.17 1.17 0 0 0-.348-.861c-.174-.174-.38-.282-.615-.326zm-11.921 0c-.079-.015-.16-.023-.246-.023a1.16 1.16 0 0 0-.851.349c-.232.232-.348.517-.348.859a1.17 1.17 0 0 0 .348.861c.232.226.517.339.852.339.342 0 .627-.116.859-.348s.349-.516.349-.851a1.17 1.17 0 0 0-.348-.861c-.174-.174-.38-.282-.615-.326zm85.024 18.705h-2.756l-2.986.715-.001 2.572 2.969-.733v9.367h-3.191v2.513h9.155v-2.513l-3.191-.001v-11.919zm-11.921 0l-2.756-.001-2.987.716.001 2.57 2.968-.733v9.367l-3.191.001v2.515l9.155-.002v-2.513h-3.191v-11.921zm-12.891-.196c-.271-.044-.558-.065-.858-.065-1.592 0-2.783.625-3.575 1.876-.793 1.244-1.19 3.115-1.19 5.616 0 2.494.396 4.366 1.188 5.617.793 1.244 1.986 1.867 3.578 1.867 1.598 0 2.793-.622 3.586-1.866s1.19-3.115 1.19-5.616c0-2.507-.396-4.383-1.189-5.627-.644-1.011-1.555-1.612-2.731-1.802zm-11.921 0c-.271-.044-.556-.065-.856-.065-1.592 0-2.785.625-3.577 1.875-.793 1.244-1.19 3.117-1.19 5.618 0 2.494.398 4.367 1.19 5.617.793 1.244 1.985 1.865 3.577 1.865 1.598 0 2.793-.622 3.586-1.866s1.19-3.115 1.19-5.616c0-2.507-.396-4.383-1.189-5.627-.644-1.011-1.555-1.612-2.731-1.802zm11.304 2.371c.541.088.944.485 1.209 1.19.303.806.454 2.094.454 3.867 0 1.766-.151 3.051-.454 3.857s-.787 1.208-1.45 1.208c-.657 0-1.137-.402-1.44-1.208s-.456-2.091-.456-3.857c0-1.772.152-3.061.455-3.867s.783-1.21 1.441-1.21a1.49 1.49 0 0 1 .24.02zm-22.254-2.176l-2.756.001-2.986.715-.001 2.572 2.97-.735v9.369l-3.191.001v2.513h9.155v-2.513l-3.191-.001v-11.921zm10.333 2.175c.541.088.944.485 1.209 1.19.303.806.456 2.095.456 3.867 0 1.766-.153 3.051-.456 3.857s-.787 1.21-1.451 1.21c-.657 0-1.137-.404-1.44-1.21s-.454-2.091-.454-3.857c0-1.772.15-3.061.453-3.867s.783-1.208 1.441-1.208c.083 0 .163.005.24.018zm-23.224-2.369a5.39 5.39 0 0 0-.857-.067c-1.592 0-2.785.625-3.577 1.875-.793 1.244-1.188 3.117-1.188 5.618 0 2.494.396 4.366 1.188 5.617.793 1.244 1.985 1.867 3.577 1.867 1.598 0 2.795-.622 3.588-1.866s1.188-3.117 1.188-5.618c0-2.507-.396-4.383-1.189-5.627a3.82 3.82 0 0 0-2.729-1.799zm35.149 6.239c-.079-.014-.16-.021-.246-.021-.335 0-.619.115-.851.347s-.346.519-.346.861.116.627.348.859c.232.226.515.339.85.339a1.17 1.17 0 0 0 .861-.348c.232-.232.347-.516.347-.851a1.17 1.17 0 0 0-.348-.861c-.174-.174-.38-.282-.615-.326zm-47.07-6.24c-.271-.044-.558-.065-.858-.065-1.592 0-2.783.625-3.575 1.876-.793 1.244-1.19 3.115-1.19 5.616 0 2.494.396 4.366 1.188 5.617.793 1.244 1.986 1.867 3.578 1.867 1.598 0 2.793-.622 3.586-1.866s1.19-3.117 1.19-5.618c0-2.507-.398-4.383-1.191-5.627a3.82 3.82 0 0 0-2.729-1.799zm11.305 2.369c.541.088.944.485 1.209 1.19.303.806.454 2.096.454 3.869 0 1.766-.151 3.051-.454 3.857s-.787 1.208-1.45 1.208c-.657 0-1.139-.403-1.442-1.208s-.453-2.093-.453-3.859c0-1.772.152-3.061.455-3.867s.783-1.208 1.441-1.208c.083 0 .163.005.24.018zm23.847 3.871c-.079-.014-.162-.021-.248-.021-.335 0-.617.115-.849.347a1.17 1.17 0 0 0-.348.861 1.17 1.17 0 0 0 .348.861c.232.226.516.337.851.337a1.17 1.17 0 0 0 .861-.348c.232-.232.347-.516.347-.851 0-.342-.116-.627-.348-.859-.174-.174-.377-.284-.613-.327zm-46.1-6.045l-2.756-.001-2.989.716.001 2.572 2.968-.735v9.369l-3.191-.001v2.515h9.157v-2.515h-3.191v-11.921zm10.333 2.175c.541.088.944.485 1.209 1.19.303.806.454 2.094.454 3.867 0 1.766-.151 3.051-.454 3.857s-.787 1.208-1.45 1.208c-.657 0-1.137-.402-1.44-1.208s-.456-2.091-.456-3.857c0-1.772.152-3.061.455-3.867s.783-1.21 1.441-1.21a1.49 1.49 0 0 1 .24.02zm11.926 3.87a1.35 1.35 0 0 0-.246-.023 1.16 1.16 0 0 0-.851.349c-.232.232-.348.517-.348.859a1.17 1.17 0 0 0 .348.861c.232.226.517.339.852.339.342 0 .627-.116.859-.348s.349-.516.349-.851a1.17 1.17 0 0 0-.348-.861c-.174-.174-.38-.282-.615-.326zm-11.921 0a1.35 1.35 0 0 0-.246-.023 1.16 1.16 0 0 0-.851.349 1.17 1.17 0 0 0-.348.861c0 .342.118.627.35.859.232.226.515.339.85.339.342 0 .627-.116.859-.348s.349-.516.349-.851a1.17 1.17 0 0 0-.348-.861c-.174-.174-.38-.282-.615-.326z" + fill="url(#f)"/> + diff --git a/app/assets/images/osm_logo_512.png b/app/assets/images/osm_logo_512.png deleted file mode 100644 index c54f416ab..000000000 Binary files a/app/assets/images/osm_logo_512.png and /dev/null differ diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 77ef647a0..cb48d834e 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -1,7 +1,7 @@

- <%= image_tag "osm_logo.png", :srcset => image_path("osm_logo.svg"), :alt => t("layouts.logo.alt_text"), :size => 30 %> + <%= image_tag "osm_logo.svg", :alt => t("layouts.logo.alt_text"), :size => 30 %> <%= t "layouts.project_name.h1" %>

diff --git a/app/views/layouts/_search.html.erb b/app/views/layouts/_search.html.erb index d4bd0cb82..b6baed5f7 100644 --- a/app/views/layouts/_search.html.erb +++ b/app/views/layouts/_search.html.erb @@ -34,27 +34,35 @@
-
-
- <%= image_tag "marker-green.png", :class => "img-fluid", :data => { :type => "from" }, :draggable => "true" %> +
+
+
+
+ <%= image_tag "marker-green.png", :class => "img-fluid", :data => { :type => "from" }, :draggable => "true" %> +
+ <%= text_field_tag "route_from", params[:from], :placeholder => t("site.search.from"), :autocomplete => "on", :class => "form-control py-1 px-2", :dir => "auto" %> +
+
+
+ <%= image_tag "marker-red.png", :class => "img-fluid", :data => { :type => "to" }, :draggable => "true" %> +
+ <%= text_field_tag "route_to", params[:to], :placeholder => t("site.search.to"), :autocomplete => "on", :class => "form-control py-1 px-2", :dir => "auto" %> +
- <%= text_field_tag "route_from", params[:from], :placeholder => t("site.search.from"), :autocomplete => "on", :class => "form-control py-1 px-2", :dir => "auto" %> -
-
-
- <%= image_tag "marker-red.png", :class => "img-fluid", :data => { :type => "to" }, :draggable => "true" %> +
+
- <%= text_field_tag "route_to", params[:to], :placeholder => t("site.search.to"), :autocomplete => "on", :class => "form-control py-1 px-2", :dir => "auto" %>
<%= submit_tag t("site.search.submit_text"), :class => "routing_go btn btn-primary py-1 px-2", :data => { :disable_with => false } %>
-
-
- -
diff --git a/app/views/layouts/error.html.erb b/app/views/layouts/error.html.erb index 435de3015..dfcb3cb91 100644 --- a/app/views/layouts/error.html.erb +++ b/app/views/layouts/error.html.erb @@ -8,7 +8,7 @@ - <%= image_tag "osm_logo.png", :srcset => image_path("osm_logo.svg"), :alt => t("layouts.logo.alt_text"), :class => "logo" %> + <%= image_tag "osm_logo.svg", :alt => t("layouts.logo.alt_text"), :class => "logo" %>
<%= yield %> diff --git a/assets/osm_logo.svg b/assets/osm_logo.svg new file mode 100644 index 000000000..2919c1441 --- /dev/null +++ b/assets/osm_logo.svg @@ -0,0 +1,3336 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 010110010011010110010011 + 010110010011010110010011 + + + diff --git a/config/locales/af.yml b/config/locales/af.yml index fd2f4c1fa..915d3bf26 100644 --- a/config/locales/af.yml +++ b/config/locales/af.yml @@ -1593,6 +1593,7 @@ af: legal_title: Regsaspekte partners_title: Vennote copyright: + title: Kopiereg en lisensie foreign: title: Aangaande dié vertaling native: @@ -1600,7 +1601,6 @@ af: native_link: Afrikaanse weergawe mapping_link: begin karteer legal_babble: - title_html: Kopiereg en lisensie credit_title_html: Hoe om na OpenStreetMap te verwys contributors_title_html: Ons bydraers infringement_title_html: Kopieregoortreding diff --git a/config/locales/aln.yml b/config/locales/aln.yml index 33317892c..a924af237 100644 --- a/config/locales/aln.yml +++ b/config/locales/aln.yml @@ -816,6 +816,7 @@ aln: logout_button: Dil site: copyright: + title: Copyright foreign: title: Rreth kti përkthimi html: Në ni ngjarje të ni konflikti me faqen e përkthyme dhe %{english_original_link}, @@ -829,7 +830,6 @@ aln: native_link: Gegë verzion mapping_link: fillo hartografimin legal_babble: - title_html: Copyright credit_title_html: Si të kreditit OpenStreetMap credit_1_html: |- Nëse jeni duke përdorur harta imazhe OpenStreetMap, ne kërkojmë që diff --git a/config/locales/ar.yml b/config/locales/ar.yml index 1aa1673f0..b4a11d5a2 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -1981,6 +1981,7 @@ ar: legal_2_2_registered_trademarks: العلامات التجارية المسجلة لـ OSMF partners_title: الشركاء copyright: + title: حقوق النشر والترخيص foreign: title: حول هذه الترجمة html: في حالة التعارض ما بين هذه الصفحة المترجمة و %{english_original_link}, @@ -1994,7 +1995,6 @@ ar: native_link: النسخة العربية mapping_link: ابدأ التخطيط legal_babble: - title_html: حقوق النشر والترخيص introduction_1_open_data: البيانات المفتوحة introduction_1_osm_foundation: مؤسسة خريطة الشارع المفتوحة introduction_2_html: "أنت حر في نسخ، وتوزيع، ونقل وتطويع بياناتنا، \nطالما diff --git a/config/locales/ast.yml b/config/locales/ast.yml index a715692ab..b52e16a73 100644 --- a/config/locales/ast.yml +++ b/config/locales/ast.yml @@ -1500,6 +1500,7 @@ ast: legal_title: Llegal partners_title: Asociaos copyright: + title: Drechos d'autor y llicencia foreign: title: Tocante a esta traducción html: En casu d'haber un conflictu ente esta páxina traducida y %{english_original_link}, @@ -1513,7 +1514,6 @@ ast: native_link: versión n'asturianu mapping_link: principiar col mapéu legal_babble: - title_html: Drechos d'autor y llicencia credit_title_html: Cómo dar reconocimientu a OpenStreetMap credit_1_html: Riquimos qu'uses el créditu “© Collaboradores d'OpenStreetMap”. attribution_example: diff --git a/config/locales/az.yml b/config/locales/az.yml index 9c0cd7630..5928cdae5 100644 --- a/config/locales/az.yml +++ b/config/locales/az.yml @@ -925,6 +925,7 @@ az: logout_button: Sistemdən çıx site: copyright: + title: Müəllif hüquqları və Lisenziyalar foreign: title: Bu tərcümə haqqında english_link: ingiliscə orijinalına @@ -933,7 +934,6 @@ az: native_link: azərbaycan versiyası mapping_link: kartoqrafiyalaşdırmağa başla legal_babble: - title_html: Müəllif hüquqları və Lisenziyalar credit_title_html: OpenStreetMap-ə Necə istinad etmək olar attribution_example: alt: Nümunə üçün, veb-səhifədən OpenStreetMap-ə necə istinad vermək diff --git a/config/locales/be-Tarask.yml b/config/locales/be-Tarask.yml index aed7bb646..bde368c27 100644 --- a/config/locales/be-Tarask.yml +++ b/config/locales/be-Tarask.yml @@ -1082,6 +1082,7 @@ be-Tarask: about: open_data_title: Адкрытыя зьвесткі copyright: + title: Аўтарскія правы і ліцэнзія foreign: title: Пра гэты пераклад html: У выпадку канфлікту паміж гэтай перакладзенай старонкай і %{english_original_link}, @@ -1095,7 +1096,6 @@ be-Tarask: native_link: беларускай вэрсіі mapping_link: пачаць стварэньне мапы legal_babble: - title_html: Аўтарскія правы і ліцэнзія credit_title_html: Як спасылацца на OpenStreetMap credit_1_html: 'Карыстаючыся зьвесткамі OpenStreetMap, вы павінны выканаць дзьве ўмовы:' diff --git a/config/locales/be.yml b/config/locales/be.yml index 11e78ea3b..3d50f058d 100644 --- a/config/locales/be.yml +++ b/config/locales/be.yml @@ -2093,6 +2093,7 @@ be: legal_title: Прававыя пытанні partners_title: Партнёры copyright: + title: Аўтарскія правы і ліцэнзія foreign: title: Пра гэты пераклад html: У выпадку супярэчнасці паміж гэтай перакладзенай старонкай і %{english_original_link}, @@ -2106,7 +2107,6 @@ be: native_link: беларуская версія mapping_link: пачаць маляваць карту legal_babble: - title_html: Аўтарскія правы і ліцэнзія credit_title_html: Як спасылацца на OpenStreetMap credit_1_html: 'Там, дзе вы выкарыстоўваеце даныя OpenStreetMap, вы павінны выканаць наступныя дзве рэчы:' diff --git a/config/locales/bg.yml b/config/locales/bg.yml index a4c28a374..606b049d6 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -1549,6 +1549,7 @@ bg: legal_2_2_registered_trademarks: регистрирани търговски марки на OSMF partners_title: Партньори copyright: + title: Авторски права и лиценз foreign: title: За този превод html: В случай на противоречие между тази преведена страница и %{english_original_link}, @@ -1562,7 +1563,6 @@ bg: native_link: българската версия mapping_link: картографирате legal_babble: - title_html: Авторски права и лиценз credit_title_html: Как да кредитирате OpenStreetMap more_title_html: Открийте повече contributors_title_html: Нашите сътрудници diff --git a/config/locales/bn.yml b/config/locales/bn.yml index 3459542d1..4485b871c 100644 --- a/config/locales/bn.yml +++ b/config/locales/bn.yml @@ -1596,6 +1596,7 @@ bn: legal_1_1_privacy_policy: গোপনীয়তার নীতি partners_title: অংশীদার copyright: + title: কপিরাইট ও লাইসেন্স foreign: title: এই অনুবাদ সম্পর্কে english_link: মূল ইংরেজি @@ -1607,7 +1608,6 @@ bn: native_link: THIS_LANGUAGE_NAME_HERE সংস্করণ mapping_link: মানচিত্রকরণ শুরু করুন legal_babble: - title_html: কপিরাইট ও লাইসেন্স introduction_2_legal_code: আইনি কোড credit_title_html: ওপেনস্ট্রিটম্যাপকে কীভাবে কৃতিত্ব দিবেন attribution_example: diff --git a/config/locales/br.yml b/config/locales/br.yml index 981632918..2a525a11d 100644 --- a/config/locales/br.yml +++ b/config/locales/br.yml @@ -2008,6 +2008,7 @@ br: legal_2_2_registered_trademarks: merkoù marilhet an OSMF partners_title: Kevelerien copyright: + title: Gwirioù oberour hag aotre-implijout foreign: title: Diwar-benn an droidigezh-mañ html: Ma vez digendalc'h etre ar bajenn troet-mañ hag %{english_original_link} @@ -2020,7 +2021,6 @@ br: native_link: Stumm brezhonek mapping_link: kregiñ da gemer perzh legal_babble: - title_html: Gwirioù oberour hag aotre-implijout introduction_1_html: OpenStreetMap%{registered_trademark_link} a zo %{open_data}, dindan an aotre-implijout %{odc_odbl_link} (ODbL) gant %{osm_foundation_link} (OSMF). diff --git a/config/locales/bs.yml b/config/locales/bs.yml index 43026e263..8a72a277e 100644 --- a/config/locales/bs.yml +++ b/config/locales/bs.yml @@ -1064,6 +1064,7 @@ bs: next: Sljedeće open_data_title: Open Data copyright: + title: Autorska prava i dozvola foreign: title: O ovom prevodu html: U slučaju konflikta između ove prevedene stranice i %{english_original_link}, @@ -1077,7 +1078,6 @@ bs: native_link: bosansko izdanje mapping_link: počnite sa ucrtavanjem legal_babble: - title_html: Autorska prava i dozvola credit_title_html: Kako navesti zasluge OpenStreetMap projekta kao izvora credit_1_html: |- Tražimo da koristite navedete zasluge “© OpenStreetMap diff --git a/config/locales/ca.yml b/config/locales/ca.yml index 6b41a80d5..ff64cd59b 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -1979,6 +1979,7 @@ ca: legal_2_2_registered_trademarks: marca registrada de l'OSMF partners_title: Socis copyright: + title: Drets d'autor i llicència foreign: title: Quant a la traducció html: En cas de conflicte entre aquesta pàgina traduïda i %{english_original_link}, @@ -1992,7 +1993,6 @@ ca: native_link: Versió en català mapping_link: Comença a cartografiar legal_babble: - title_html: Drets d'autor i llicència introduction_1_html: |- OpenStreetMap%{registered_trademark_link} són %{open_data}, sota la llicència %{odc_odbl_link} (ODbL) per la %{osm_foundation_link} (OSMF). diff --git a/config/locales/ce.yml b/config/locales/ce.yml index ce2a0acc6..10092ac1b 100644 --- a/config/locales/ce.yml +++ b/config/locales/ce.yml @@ -29,7 +29,7 @@ ce: update: Хийцам Ӏалашбе trace: create: Сервер тӀейаккха - update: Хийцамаш дӀаӀалашбе + update: Хийцамаш дӀаӀалашбан user_block: create: Кхолла блок update: Карлайаккха блок @@ -182,7 +182,7 @@ ce: link text: хӀун йу хӀара? contributor terms: link text: хӀун йу хӀара? - save changes button: Ӏалашбе хийцамаш + save changes button: Хийцамаш дӀаӀалашбан browse: version: Верси in_changeset: Нисдарш @@ -971,7 +971,7 @@ ce: download: Схьаэца short_url: Йоца хьажорг embed: - report_problem: ГӀалатех хаам бар + report_problem: Проблемах лаьцна хаийта map: layers: header: Картан чкъор diff --git a/config/locales/cs.yml b/config/locales/cs.yml index 0698af177..d7a6501c7 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -2100,6 +2100,7 @@ cs: legal_2_2_registered_trademarks: zapsané ochranné známky OSMF partners_title: Partneři copyright: + title: Autorská práva a licence foreign: title: O tomto překladu html: V případě rozporů mezi touto přeloženou verzí a %{english_original_link} @@ -2113,7 +2114,6 @@ cs: native_link: českou verzi mapping_link: začít mapovat legal_babble: - title_html: Autorská práva a licence introduction_1_html: OpenStreetMap%{registered_trademark_link} jsou %{open_data}, která za podmínek %{odc_odbl_link} (ODbL) nabízí %{osm_foundation_link} (OSMF). diff --git a/config/locales/cy.yml b/config/locales/cy.yml index f2d25da83..72f3e9bdf 100644 --- a/config/locales/cy.yml +++ b/config/locales/cy.yml @@ -270,13 +270,13 @@ cy: opened_at_by_html: Crëwyd %{when} gan %{user} commented_at_html: Diweddarwyd %{when} commented_at_by_html: Diweddarwyd %{when} gan %{user} - closed_at_html: Wedi datrys %{when} - closed_at_by_html: Wedi datrys %{when} gan %{user} - reopened_at_html: Wedi ailgychwyn %{when} - reopened_at_by_html: Wedi ailgychwyn %{when} gan %{user} + closed_at_html: Datryswyd %{when} + closed_at_by_html: Datryswyd %{when} gan %{user} + reopened_at_html: Ailysgogwyd %{when} + reopened_at_by_html: Ailysgogwyd %{when} gan %{user} rss: title: Nodiadau OpenStreetMap - description_all: Rhestr o nodiadau newydd, gyda sylwadau, a wedi cau + description_all: Rhestr o nodiadau newydd, gyda sylwadau, neu wedi cau description_area: Rhestr o nodiadau, adroddwyd, gyda sylwadau, neu wedi cau yn eich ardal [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})] description_item: Ffrwd RSS ar gyfer nodyn %{id} @@ -489,8 +489,8 @@ cy: feed: title: Grŵp newid %{id} title_comment: Grŵp newid %{id} - %{comment} - created: Wedi creu - closed: Wedi cau + created: Crëwyd + closed: Caëwyd belongs_to: Awdur subscribe: button: Tanysgrifio i drafodaeth @@ -506,10 +506,10 @@ cy: title: 'Grŵp newid: %{id}' created: 'Crëwyd: %{when}' closed: 'Caëwyd: %{when}' - created_ago_html: Wedi creu %{time_ago} - closed_ago_html: Wedi cau %{time_ago} - created_ago_by_html: Wedi creu %{time_ago} gan %{user} - closed_ago_by_html: Wedi cau %{time_ago} gan %{user} + created_ago_html: Crëwyd %{time_ago} + closed_ago_html: Caëwyd %{time_ago} + created_ago_by_html: Crëwyd %{time_ago} gan %{user} + closed_ago_by_html: Caëwyd %{time_ago} gan %{user} discussion: Sgwrs join_discussion: Mewngofnodwch i ymuno â'r sgwrs still_open: Mae'r grŵp newid dal ar agor - bydd trafodaeth yn agor pan fydd @@ -1873,6 +1873,7 @@ cy: legal_2_2_registered_trademarks: nodau masnach cofrestredig yr OSMF partners_title: Partneriaid copyright: + title: Hawlfraint a Thrwydded foreign: title: YnglÅ·n â'r cyfieithiad hwn html: Mewn achos o wrthdaro rhwng y dudalen hon a gyfieithwyd a %{english_original_link}, @@ -1883,7 +1884,6 @@ cy: native_link: fersiwn Cymraeg mapping_link: dechrau mapio legal_babble: - title_html: Hawlfraint a Thrwydded introduction_1_open_data: data agored introduction_1_odc_odbl: Open Data Commons Open Database License introduction_1_osm_foundation: OpenStreetMap Foundation @@ -2612,6 +2612,7 @@ cy: title: Blociau gan %{name} heading_html: Rhestr Blociau gan %{name} show: + title: '%{block_on} a flociwyd gan %{block_by}' heading_html: '%{block_on} a flociwyd gan %{block_by}' created: 'Crëwyd:' duration: 'Cyfnod:' @@ -2622,6 +2623,8 @@ cy: confirm: Ydych chi'n siŵr? reason: 'Rheswm dros y bloc:' revoker: 'Dad-flociwr:' + needs_view: Mae angen i'r defnyddiwr fewngofnodi cyn y bydd y bloc hwn yn cael + ei glirio. block: not_revoked: (heb ei ddirymu) show: Dangos @@ -2811,6 +2814,8 @@ cy: at %{directions} onramp_right_without_exit: Trowch i'r dde ar y ramp i %{name} onramp_right_with_directions: Trowch i'r dde ar y ramp tuag at %{directions} + onramp_right_without_directions: Trowch i'r dde i'r ramp + onramp_right: Trowch i'r dde i'r ramp merge_right_without_exit: Cyfunwch i'r dde ar %{name} turn_right_without_exit: Trowch i'r dde ar %{name} sharp_right_without_exit: Siarp i'r dde ar %{name} @@ -2819,6 +2824,8 @@ cy: turn_left_without_exit: Trowch i'r chwith ar %{name} offramp_left: Cymerwch y ramp ar y chwith offramp_left_with_exit: Cymerwch y %{exit} allanfa ar y chwith + onramp_left_without_directions: Trowch i'r chwith i'r ramp + onramp_left: Trowch i'r chwith i'r ramp merge_left_without_exit: Cyfuno i'r chwith ar %{name} slight_left_without_exit: Ychydig i'r chwith i %{name} via_point_without_exit: (trwy bwynt) diff --git a/config/locales/da.yml b/config/locales/da.yml index 0636b5ef9..c462c2359 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -2020,6 +2020,7 @@ da: legal_2_2_registered_trademarks: varemærker registreret af OSMF partners_title: Partnere copyright: + title: Ophavsret og licens foreign: title: Om denne oversættelse html: I tilfælde af en konflikt mellem denne oversatte side og %{english_original_link} @@ -2033,7 +2034,6 @@ da: native_link: den danske udgave mapping_link: begynde kortlægningen legal_babble: - title_html: Ophavsret og licens introduction_1_html: OpenStreetMap%{registered_trademark_link} er %{open_data}, licenseret under %{odc_odbl_link} (ODbL) af %{osm_foundation_link} (OSMF). introduction_1_open_data: Ã¥bne data diff --git a/config/locales/de.yml b/config/locales/de.yml index f485543fa..d227bc20c 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -2163,6 +2163,7 @@ de: legal_2_2_registered_trademarks: eingetragenes Markenzeichen der OSMF partners_title: Partner copyright: + title: Urheberrecht und Lizenz foreign: title: Über diese Übersetzung html: Für den Fall einer Abweichung zwischen der vorliegenden Übersetzung @@ -2177,7 +2178,6 @@ de: native_link: deutschen Sprachversion mapping_link: mit dem Kartieren anfangen legal_babble: - title_html: Urheberrecht und Lizenz introduction_1_html: |- OpenStreetMap%{registered_trademark_link} sind %{open_data} (open data), lizenziert unter der %{odc_odbl_link} (ODbL) von der %{osm_foundation_link} (OSMF). diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml index 5d435eaf6..8332cd24a 100644 --- a/config/locales/dsb.yml +++ b/config/locales/dsb.yml @@ -1149,6 +1149,7 @@ dsb: open_data_title: Zjawne daty partners_title: Partnarje copyright: + title: Awtorske pÅ¡awo a licenca foreign: title: Wó toś tom pśełožku html: W paźe konflikta mjazy pśełožonym bokom a %{english_original_link}, @@ -1161,7 +1162,6 @@ dsb: native_link: dolnoserbskej wersiji mapping_link: kartěrowanje zachopiś legal_babble: - title_html: Awtorske pÅ¡awo a licenca credit_title_html: Kak naspomnjeś awtorstwo OpenStreetMap credit_1_html: Pominamy se, až pódawaÅ¡ sobustatkujucych “© OpenStreetMap”. attribution_example: diff --git a/config/locales/el.yml b/config/locales/el.yml index 19e26897f..3e35c209f 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -2090,6 +2090,7 @@ el: legal_2_2_registered_trademarks: εγγεγραμμένα εμπορικά σήματα του OSMF partners_title: Συνεργάτες copyright: + title: Πνευματικά δικαιώματα και άδεια χρήσης foreign: title: Σχετικά με αυτήν τη μετάφραση html: Σε περίπτωση διένεξης μεταξύ αυτής της μεταφρασμένης σελίδας και %{english_original_link}, @@ -2103,7 +2104,6 @@ el: native_link: ελληνική έκδοση mapping_link: αρχίστε τη χαρτογράφηση legal_babble: - title_html: Πνευματικά δικαιώματα και άδεια χρήσης introduction_1_html: |- Το OpenStreetMap%{registered_trademark_link} είναι %{open_data}, με άδεια χρήσης υπό το %{odc_odbl_link} (ODbL) από το %{osm_foundation_link} (OSMF). diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 213127d45..d2cda9abe 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -1400,6 +1400,7 @@ en-GB: legal_title: Legal partners_title: Partners copyright: + title: Copyright and Licence foreign: title: About this translation html: In the event of a conflict between this translated page and %{english_original_link}, @@ -1413,7 +1414,6 @@ en-GB: native_link: British English version mapping_link: start mapping legal_babble: - title_html: Copyright and Licence credit_title_html: How to credit OpenStreetMap attribution_example: alt: Example of how to attribute OpenStreetMap on a webpage diff --git a/config/locales/eo.yml b/config/locales/eo.yml index f65b3cd93..3599a7465 100644 --- a/config/locales/eo.yml +++ b/config/locales/eo.yml @@ -2021,6 +2021,7 @@ eo: legal_2_2_registered_trademarks: registritaj varmarkoj de la Fondaĵo OpenStreetMap partners_title: Kunlaborantoj copyright: + title: AÅ­torrajto kaj permesilo foreign: title: Pri ĉi tiu traduko html: Se okazus konflikto inter ĉi tiu tradukita paĝo kaj %{english_original_link}, @@ -2033,7 +2034,6 @@ eo: native_link: Esperanta versio mapping_link: ekigi mapigadon legal_babble: - title_html: AÅ­torrajto kaj permesilo introduction_1_html: OpenStreetMap%{registered_trademark_link} estas %{open_data} eldonataj laÅ­ la permesilo %{odc_odbl_link} (ODbL) fare de la %{osm_foundation_link} (OSMF). diff --git a/config/locales/es.yml b/config/locales/es.yml index 9a147a136..1a64edcf5 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -2140,6 +2140,7 @@ es: legal_2_2_registered_trademarks: marcas registradas de la OSMF partners_title: Socios copyright: + title: Derechos de autor y licencia foreign: title: Acerca de esta traducción html: En el caso de un conflicto entre esta página traducida y %{english_original_link}, @@ -2153,7 +2154,6 @@ es: native_link: versión en español mapping_link: comenzar a mapear legal_babble: - title_html: Derechos de autor y licencia introduction_1_html: "OpenStreetMap%{registered_trademark_link} es %{open_data}, licenciada bajo los términos de \n%{odc_odbl_link} (ODbL) por la %{osm_foundation_link}" introduction_1_open_data: datos abiertos diff --git a/config/locales/et.yml b/config/locales/et.yml index 4c153959e..3a8656239 100644 --- a/config/locales/et.yml +++ b/config/locales/et.yml @@ -1948,6 +1948,7 @@ et: legal_2_2_registered_trademarks: OSMF-i registreeritud kaubamärgid partners_title: Partnerid copyright: + title: Autoriõigused ja litsents foreign: title: Info selle tõlke kohta html: Kui selle tõlgitud lehekülje ja %{english_original_link} vahel on vastuolu, @@ -1961,7 +1962,6 @@ et: native_link: eestikeelse versiooni mapping_link: alustada kaardistamist legal_babble: - title_html: Autoriõigused ja litsents introduction_1_html: |- OpenStreetMapi%{registered_trademark_link} andmed on %{open_data}, mille %{osm_foundation_link} (OSMF) on avaldanud Open Data Commonsi litsentsi %{odc_odbl_link} (ODbL) all. diff --git a/config/locales/eu.yml b/config/locales/eu.yml index 98f30c2dd..17e6a9f4a 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -1986,6 +1986,7 @@ eu: legal_2_2_registered_trademarks: OSMFren marka erregistratuak partners_title: Parte-hartzaileak copyright: + title: Egile-eskubideak eta lizentzia foreign: title: Itzulpen honi buruz html: Itzulitako orrialde hau eta %{english_original_link} arteko gatazka @@ -1999,7 +2000,6 @@ eu: native_link: Euskara version mapping_link: kartografiarekin hasi legal_babble: - title_html: Egile-eskubideak eta lizentzia introduction_1_open_data: Datu Irekiak introduction_1_odc_odbl: Open Data Commons Open Database Lizentzia introduction_1_osm_foundation: OpenStreetMap Fundazioa diff --git a/config/locales/fa.yml b/config/locales/fa.yml index ad2d928e1..f5946b258 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -1887,6 +1887,7 @@ fa: legal_1_1_privacy_policy: سیاست محرمانگی partners_title: شرکای تجاری copyright: + title: حق نشر و پروانه foreign: title: دربارهٔ این ترجمه html: اگر بین برگردان فارسی و %{english_original_link} ناسازگاری باشد، صفحهٔ @@ -1900,7 +1901,6 @@ fa: native_link: نسخهٔ فارسی mapping_link: شروع به نقشه‌کشی legal_babble: - title_html: حق نشر و پروانه credit_title_html: چگونه از OpenStreetMap یاد کنیم credit_1_html: 'جایی که دارید از داده‌های اوپن‌استریت‌مپ استفاده می‌کنید، لازم است دو کار زیر را انجام دهید:' diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 5bdf2698f..091c02200 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -1919,6 +1919,7 @@ fi: legal_2_2_registered_trademarks: OSM-säätiön rekisteröityjä tuotemerkkejä partners_title: Kumppanit copyright: + title: Tekijänoikeus ja lisenssi foreign: title: Tietoja tästä käännöksestä html: Jos tämän käännetyn sivun ja %{english_original_link} välillä on eroja, @@ -1932,7 +1933,6 @@ fi: native_link: suomenkielinen versio mapping_link: aloittaa kartoituksen legal_babble: - title_html: Tekijänoikeus ja lisenssi introduction_1_html: OpenStreetMap%{registered_trademark_link} on %{open_data}, jonka %{osm_foundation_link} (OSMF) on lisensoinut %{odc_odbl_link} (ODbL). introduction_1_open_data: avointa dataa diff --git a/config/locales/fit.yml b/config/locales/fit.yml index c2461d164..74c5f889a 100644 --- a/config/locales/fit.yml +++ b/config/locales/fit.yml @@ -738,6 +738,7 @@ fit: legal_title: Lakitekninen jako partners_title: Kumppanit copyright: + title: Tekijänoikeus ja lisensi foreign: title: Tietoja tästä käänöksestä html: Jos tämän käänätyn sivun ja %{english_original_link} välillä oon eroja, @@ -751,7 +752,6 @@ fit: native_link: meänkielinen versuuni mapping_link: aloittaa kartoituksen legal_babble: - title_html: Tekijänoikeus ja lisensi credit_title_html: OpenStreetMapin mainitseminen credit_1_html: OpenStreetMapin sisältöä levitettäessä oon mainittava teksti "© OpenStreetMapin tekijät" tai sen engelskankielinen vastine diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 4ce8d20e5..c04e09a5f 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -2175,6 +2175,7 @@ fr: legal_2_2_registered_trademarks: marques commerciales enregistrées de l’OSMF partners_title: Partenaires copyright: + title: Droits d’auteur et licence foreign: title: À propos de cette traduction html: En cas de conflit entre la présente page traduite et %{english_original_link}, @@ -2188,7 +2189,6 @@ fr: native_link: traduction française mapping_link: commencer à contribuer legal_babble: - title_html: Droits d’auteur et licence introduction_1_html: |- OpenStreetMap%{registered_trademark_link} est en %{open_data}, sous licence  %{odc_odbl_link} (ODbL) par la %{osm_foundation_link} (OSMF). diff --git a/config/locales/fur.yml b/config/locales/fur.yml index d4689691a..1bcf85781 100644 --- a/config/locales/fur.yml +++ b/config/locales/fur.yml @@ -1188,13 +1188,13 @@ fur: legal_2_1_contact_the_osmf: contate il OSMF partners_title: Associâts copyright: + title: Copyright e licence foreign: title: Informazions su cheste traduzion native: title: Informazions su cheste pagjine mapping_link: scomence a mapâ legal_babble: - title_html: Copyright e licence attribution_example: title: Esempli di atribuzion more_title_html: Par savênt di plui diff --git a/config/locales/fy.yml b/config/locales/fy.yml index c628f4180..b0cb52c0f 100644 --- a/config/locales/fy.yml +++ b/config/locales/fy.yml @@ -1822,6 +1822,7 @@ fy: legal_title: Juridysk partners_title: Partners copyright: + title: Auteursrjochten en lisinsje foreign: title: Oer dizze oersetting html: Yn it gefal dizze oersette side en %{english_original_link} fan inoar @@ -1835,7 +1836,6 @@ fy: native_link: Frysktalige ferzje mapping_link: mei kaartmeitsjen úteinsette legal_babble: - title_html: Auteursrjochten en lisinsje credit_title_html: Hoe moat OpenStreetMap neamd wurde credit_1_html: 'Dêr wêr''t jo OpenStreetMap-data brûke, binne jo ferplichte en doch de neikommende twa dingen:' diff --git a/config/locales/ga.yml b/config/locales/ga.yml index d42c7285b..2e2308fc7 100644 --- a/config/locales/ga.yml +++ b/config/locales/ga.yml @@ -1348,6 +1348,7 @@ ga: legal_title: Dlíthiúil partners_title: Comhpháirtithe copyright: + title: Cóipcheart agus Ceadúnas foreign: title: Maidir leis an aistriúchán seo html: Sa chás nach mbeidh an leathanach aistrithe seo agus an %{english_original_link} @@ -1361,7 +1362,6 @@ ga: native_link: Leagan THIS_LANGUAGE_NAME_HERE mapping_link: dul i mbun léarscáilithe legal_babble: - title_html: Cóipcheart agus Ceadúnas credit_title_html: Conas OpenStreetMap a lua credit_1_html: Ceanglaímid ort an lua “©Rannchuiditheoirí OpenStreetMap” a úsáid. diff --git a/config/locales/gd.yml b/config/locales/gd.yml index e22400a38..47186ea5c 100644 --- a/config/locales/gd.yml +++ b/config/locales/gd.yml @@ -1200,6 +1200,7 @@ gd: legal_title: Nòtaichean laghail partners_title: Com-pàirtichean copyright: + title: Còir-lethbhreac agus ceadachas foreign: title: Mun eadar-theangachadh seo html: Ma bhios còmhstri eadar an duilleag air eadar-theangachadh seo agus @@ -1213,7 +1214,6 @@ gd: native_link: tionndadh sa Ghàidhlig mapping_link: tòiseachadh air an obair-mhapa legal_babble: - title_html: Còir-lethbhreac agus ceadachas credit_title_html: Mar a bheir thu urram dha OpenStreetMap credit_1_html: |- Tha e riatanach gun chleachd thu “© OpenStreetMap diff --git a/config/locales/gl.yml b/config/locales/gl.yml index b8ac4f2cf..1b460faaa 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -2061,6 +2061,7 @@ gl: legal_2_2_registered_trademarks: marcas rexistradas da OSMF partners_title: Socios copyright: + title: Dereitos de autoría e licenza foreign: title: Acerca desta tradución html: En caso de conflito entre esta páxina traducida e %{english_original_link}, @@ -2074,7 +2075,6 @@ gl: native_link: versión en galego mapping_link: comezar a contribuír legal_babble: - title_html: Dereitos de autoría e licenza introduction_1_html: |- OpenStreetMap%{registered_trademark_link} son %{open_data}, baixo a licenza %{odc_odbl_link} (ODbL) da %{osm_foundation_link} (OSMF). diff --git a/config/locales/he.yml b/config/locales/he.yml index b55b15620..8a8bf6b61 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -2060,6 +2060,7 @@ he: legal_2_2_registered_trademarks: סימנים מסחריים של OSMF partners_title: שותפים copyright: + title: זכויות יוצרים ורישיון foreign: title: אודות התרגום הזה html: במקרה של חוסר תאימות בין הדף המתורגם הזה לבין %{english_original_link}, @@ -2072,7 +2073,6 @@ he: native_link: גרסה העברית mapping_link: להתחיל למפות legal_babble: - title_html: זכויות יוצרים ורישיון introduction_1_html: |- OpenStreetMap%{registered_trademark_link} הוא מיזם %{open_data}, שמתפרסמים לפי תנאי %{odc_odbl_link} (ר״ת ODbL) על־ידי %{osm_foundation_link} (ר״ת OSMF). diff --git a/config/locales/hr.yml b/config/locales/hr.yml index cbc190f53..a15504ccf 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -1261,6 +1261,7 @@ hr: legal_title: Pravno partners_title: Partneri copyright: + title: Autorska prava i Dozvola foreign: title: O ovom prijevodu html: U slučaju konflikta između ove prevedene stranice i %{english_original_link}, @@ -1274,7 +1275,6 @@ hr: native_link: hrvatsko izdanje mapping_link: počnite kartirati legal_babble: - title_html: Autorska prava i Dozvola introduction_1_html: OpenStreetMap%{registered_trademark_link} su %{open_data}, koje je licencirao %{osm_foundation_link} (OSMF) pod %{odc_odbl_link} (ODbL). introduction_2_html: Slobodni ste kopirati, distribuirati, prenositi i adaptirati diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml index e845df375..1ee2220c0 100644 --- a/config/locales/hsb.yml +++ b/config/locales/hsb.yml @@ -1881,6 +1881,7 @@ hsb: legal_1_1_privacy_policy: Prawidła priwatnosće partners_title: Partnerojo copyright: + title: Awtorske prawo a licenca foreign: title: Wo tutym přełožku html: W padźe wotchilenja mjez přełoženej stronu a %{english_original_link} @@ -1894,7 +1895,6 @@ hsb: native_link: hornjoserbskej wersiji mapping_link: z kartěrowanjom započeć legal_babble: - title_html: Awtorske prawo a licenca introduction_1_open_data: wotewrjene daty introduction_1_osm_foundation: Załožba OpenStreetMap credit_title_html: Kak ma so na awtorstwo OpenStreetMap pokazać diff --git a/config/locales/hu.yml b/config/locales/hu.yml index 3ed904d0c..4c7c4677e 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -2037,6 +2037,7 @@ hu: legal_2_2_registered_trademarks: az OSMF bejegyzett védjegyei partners_title: Partnerek copyright: + title: Szerzői jog és licenc foreign: title: Erről a fordításról html: Abban az esetben, ha ez a lefordított oldal és %{english_original_link} @@ -2049,7 +2050,6 @@ hu: native_link: magyar nyelvű változatára mapping_link: kezdheted a térképezést legal_babble: - title_html: Szerzői jog és licenc introduction_1_html: Az OpenStreetMap%{registered_trademark_link} %{open_data}, amely %{osm_foundation_link} (OSMF) %{odc_odbl_link} (ODbL) licencével rendelkezik. introduction_1_open_data: nyílt adat diff --git a/config/locales/ia.yml b/config/locales/ia.yml index 81b65fb3a..8b0153a76 100644 --- a/config/locales/ia.yml +++ b/config/locales/ia.yml @@ -2036,6 +2036,7 @@ ia: legal_2_2_registered_trademarks: marcas commercial registrate del OSMF partners_title: Partners copyright: + title: Copyright e Licentia foreign: title: A proposito de iste traduction html: In caso de un conflicto inter iste pagina traducite e %{english_original_link}, @@ -2049,7 +2050,6 @@ ia: native_link: version in interlingua mapping_link: comenciar le cartographia legal_babble: - title_html: Copyright e Licentia introduction_1_html: |- OpenStreetMap%{registered_trademark_link} es %{open_data}, licentiate sub %{odc_odbl_link} (ODbL) per le %{osm_foundation_link} (OSMF). diff --git a/config/locales/id.yml b/config/locales/id.yml index 263f78360..f7f8f0837 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -2006,6 +2006,7 @@ id: legal_2_2_registered_trademarks: merek dagang terdaftar OSMF partners_title: Rekan copyright: + title: Hak Cipta & Lisensi foreign: title: Tentang terjemahan ini html: Saat terjadi konflik antara halaman terjemahan dan %{english_original_link}, @@ -2019,7 +2020,6 @@ id: native_link: versi bahasa Indonesia mapping_link: memulai pemetaan legal_babble: - title_html: Hak Cipta & Lisensi introduction_1_html: |- OpenStreetMap%{registered_trademark_link} tergolong %{open_data}, berlisensi %{odc_odbl_link} (ODbL) yang diterbitkan oleh %{osm_foundation_link} (OSMF). diff --git a/config/locales/is.yml b/config/locales/is.yml index 7e6039c73..967d57c45 100644 --- a/config/locales/is.yml +++ b/config/locales/is.yml @@ -1967,6 +1967,7 @@ is: legal_2_2_registered_trademarks: skráð vörumerki OSMF partners_title: Samstarfsaðilar copyright: + title: Höfundaréttur og notkunarleyfi foreign: title: Um þessa þýðingu html: Stangist þessi þýðing á við %{english_original_link}, gildir hin síðari @@ -1981,7 +1982,6 @@ is: native_link: íslensku útgáfuna mapping_link: farið að kortleggja legal_babble: - title_html: Höfundaréttur og notkunarleyfi introduction_1_html: |- OpenStreetMap%{registered_trademark_link} eru %{open_data}, gefin út með %{odc_odbl_link} (ODbL) af %{osm_foundation_link} (OSMF). diff --git a/config/locales/it.yml b/config/locales/it.yml index 25cb7fcbb..6ed8f6d24 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -2094,6 +2094,7 @@ it: legal_2_2_registered_trademarks: marchi registrati dell'OSMF partners_title: Partner copyright: + title: Copyright e licenza foreign: title: A proposito di questa traduzione html: In caso di incoerenza fra questa pagina di traduzione e %{english_original_link}, @@ -2107,7 +2108,6 @@ it: native_link: versione in italiano mapping_link: inizia a mappare legal_babble: - title_html: Copyright e licenza introduction_1_html: OpenStreetMap%{registered_trademark_link} è basato su %{open_data}, rilasciato con %{odc_odbl_link} (ODbL) dalla %{osm_foundation_link} (OSMF). diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 4c05c4ace..941761212 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -1843,6 +1843,7 @@ ja: legal_1_1_privacy_policy: プライバシー・ポリシー partners_title: パートナー copyright: + title: 著作権とライセンス foreign: title: この翻訳について html: この翻訳版のページと%{english_original_link}の間で競合が発生した場合は、英語版の内容が優先されます @@ -1853,7 +1854,6 @@ ja: native_link: 日本語版 mapping_link: マッピングを開始 legal_babble: - title_html: 著作権とライセンス credit_title_html: OpenStreetMap のクレジット表記の仕方 credit_1_html: OpenStreetMap を使う場所では、以下の2つの条件を必ず守ってください。 attribution_example: diff --git a/config/locales/ka.yml b/config/locales/ka.yml index c2d262a3e..d9abfa136 100644 --- a/config/locales/ka.yml +++ b/config/locales/ka.yml @@ -884,14 +884,13 @@ ka: logout_button: გასვლა site: copyright: + title: საავტორო უფლებები და ლიცენზია foreign: english_link: ინგლისური ორიგინალი native: title: ამ გვერდის შესახებ native_link: ქართული ვერსია mapping_link: კარტოგრაფირების დაწყება - legal_babble: - title_html: საავტორო უფლებები და ლიცენზია edit: user_page_link: მომხმარებლის გვერდი export: diff --git a/config/locales/kab.yml b/config/locales/kab.yml index b27abff77..1dc2d535f 100644 --- a/config/locales/kab.yml +++ b/config/locales/kab.yml @@ -987,6 +987,7 @@ kab: legal_title: Asaḍuf partners_title: Imendiden copyright: + title: Izerfan n umeskar d turagt foreign: title: Ɣef tsuqilt-agi html: Ma llant tilla gar usebter-agi yettwasiqlen d %{english_original_link},Lqem @@ -997,7 +998,6 @@ kab: native_link: Tasuqilt s teqbaylit mapping_link: Bdu attekki legal_babble: - title_html: Izerfan n umeskar d turagt credit_title_html: Amek ara ternuḍ asmad i OpenStreetMap attribution_example: alt: AmedÉ£a É£ef wamek ara tettekkiḍ di OpenStreetMap s usebter web diff --git a/config/locales/kn.yml b/config/locales/kn.yml index a41272f9c..42676b0f1 100644 --- a/config/locales/kn.yml +++ b/config/locales/kn.yml @@ -788,6 +788,7 @@ kn: local_knowledge_title: ಸ್ಥಳೀಯ ಜ್ಞಾನ open_data_title: ಮುಕ್ತ ದತ್ತಾಂಶ copyright: + title: ಕೃತಿಸ್ವಾಮ್ಯ ಮತ್ತು ಪರವಾನಗಿ foreign: title: ಈ ಅನುವಾದದ ಬಗ್ಗೆ english_link: ಆಂಗ್ಲದ ಮೂಲ @@ -795,7 +796,6 @@ kn: title: ಈ ಪುಟದ ಬಗ್ಗೆ mapping_link: ನಕ್ಷೆಯನ್ನು ಸಂಪಾದಿಸಿಲು ಪ್ರಾರಂಭಿಸಿ legal_babble: - title_html: ಕೃತಿಸ್ವಾಮ್ಯ ಮತ್ತು ಪರವಾನಗಿ contributors_at_austria: ಆಸ್ಟ್ರಿಯಾ contributors_au_australia: ಆಸ್ಟ್ರೇಲಿಯಾ contributors_ca_canada: ಕೆನಡಾ diff --git a/config/locales/ko.yml b/config/locales/ko.yml index de1c6a90f..887a934ea 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -1885,6 +1885,7 @@ ko: legal_2_2_registered_trademarks: OSMF의 등록 상표 partners_title: 파트너 copyright: + title: 저작권 및 라이선스 foreign: title: 이 번역에 대한 정보 html: 이 번역한 문서와 %{english_original_link} 사이에 상충하는 경우 영어 문서가 우선합니다 @@ -1896,7 +1897,6 @@ ko: native_link: 한국어 버전 mapping_link: 매핑을 시작 legal_babble: - title_html: 저작권 및 라이선스 introduction_1_html: 오픈스트리트맵%{registered_trademark_link}은 %{open_data}이며, %{osm_foundation_link} (OSMF)에 의해 %{odc_odbl_link} (ODbL) 라이선스가 부여되어 있습니다. introduction_1_open_data: 개방형 데이터 diff --git a/config/locales/ku-Latn.yml b/config/locales/ku-Latn.yml index 9b69c798e..52f3bf72b 100644 --- a/config/locales/ku-Latn.yml +++ b/config/locales/ku-Latn.yml @@ -1899,6 +1899,7 @@ ku-Latn: legal_title: Zagonî partners_title: Şirîkên me copyright: + title: Mafê daneriyê û lîsans foreign: title: Derbarê vê wergerê de html: Eger di navbera vê rûpela tercumekirî û %{english_original_link} de @@ -1913,7 +1914,6 @@ ku-Latn: native_link: versiyona bi kurdî mapping_link: dest bi çêkirina nexşeyan bike legal_babble: - title_html: Mafê daneriyê û lîsans credit_title_html: Em çawan wekî çavkaniyekê behsa OpenStreetMapê bikin credit_1_html: 'Li cihê ku daneya OpenStreetMapê bi kar bînî, divê van du tiştan bikî:' diff --git a/config/locales/lb.yml b/config/locales/lb.yml index 22eea7485..9f5a904a9 100644 --- a/config/locales/lb.yml +++ b/config/locales/lb.yml @@ -1873,6 +1873,7 @@ lb: legal_1_1_privacy_policy: Dateschutzrichtlinnen partners_title: Partneren copyright: + title: Copyright a Lizenz foreign: title: Iwwer dës Iwwersetzung html: Fir de Fall vun enger Ofwäichung tëscht der virleiender Iwwersetzung @@ -1883,7 +1884,6 @@ lb: native_link: lëtzebuergesch Versioun mapping_link: mat dem Kaartéieren ufänken legal_babble: - title_html: Copyright a Lizenz credit_title_html: Wéi et op d'Urhiewerschaft vun OpenStreetMap hinzeweise gëllt credit_1_html: 'Wann Dir Donnéeë vun OpenStreetMap benotz muss Dir dës zwou diff --git a/config/locales/lt.yml b/config/locales/lt.yml index 301b45961..55e4ff984 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -1962,6 +1962,7 @@ lt: legal_2_2_registered_trademarks: OSMF registruotie prekių ženklai partners_title: Partneriai copyright: + title: Autorinės teisės ir licencija foreign: title: Apie šį vertimą html: Esant konfliktui tarp Å¡io iÅ¡versto puslapio ir %{english_original_link}, @@ -1975,7 +1976,6 @@ lt: native_link: LietuviÅ¡ka versija mapping_link: pradėti žymėjimą legal_babble: - title_html: Autorinės teisės ir licencija introduction_1_html: |- OpenStreetMap%{registered_trademark_link} yra %{open_data}, licencijuota pagal %{odc_odbl_link} (ODbL) pagal %{osm_foundation_link} (OSMF). diff --git a/config/locales/lv.yml b/config/locales/lv.yml index 66e48d179..e5c48e40e 100644 --- a/config/locales/lv.yml +++ b/config/locales/lv.yml @@ -1497,6 +1497,7 @@ lv: legal_title: Juridiskie jautājumi partners_title: Partneri copyright: + title: AutortiesÄ«bas un Licence foreign: title: Par Å¡o tulkojumu html: GadÄ«jumā, ja Å¡Ä« tulkotā lapa ir nesaskaņā ar %{english_original_link}, @@ -1509,7 +1510,6 @@ lv: native_link: latviskā versija mapping_link: sākt kartēt legal_babble: - title_html: AutortiesÄ«bas un Licence credit_title_html: Kā atsaukties uz OpenStreetMap credit_1_html: |- Mēs pieprasām, ka tu izmanto atsauci “© OpenStreetMap diff --git a/config/locales/mk.yml b/config/locales/mk.yml index 03f1a137d..50d7b9d11 100644 --- a/config/locales/mk.yml +++ b/config/locales/mk.yml @@ -2023,6 +2023,7 @@ mk: legal_2_2_registered_trademarks: заштитни знаци на OSMF partners_title: Партнери copyright: + title: Авторски права и лиценца foreign: title: За овој превод html: Во случај на спротивставеност помеѓу оваа преведена страница и %{english_original_link}, @@ -2036,7 +2037,6 @@ mk: native_link: македонската верзија mapping_link: почнете да ги работите картите legal_babble: - title_html: Авторски права и лиценца introduction_1_html: |- OpenStreetMap%{registered_trademark_link} работи на %{open_data}, заштитен со лиценцата %{odc_odbl_link} (ODbL) од %{osm_foundation_link} (OSMF). diff --git a/config/locales/mr.yml b/config/locales/mr.yml index 6047d55a6..314507fd4 100644 --- a/config/locales/mr.yml +++ b/config/locales/mr.yml @@ -1043,6 +1043,7 @@ mr: open_data_title: मुक्त माहिती partners_title: भागीदार copyright: + title: प्रताधिकार व परवाना foreign: title: या भाषांतराबद्दल html: या भाषांतरीत पानाच्या व %{english_original_link} यादरम्यान काही वादाचा @@ -1056,7 +1057,6 @@ mr: native_link: मराठी आवृत्ती mapping_link: नकाशा आरेखन legal_babble: - title_html: प्रताधिकार व परवाना credit_title_html: ओपनस्ट्रीटमॅपला श्रेय कसे द्यावे credit_1_html: |- “© OpenStreetMap diff --git a/config/locales/ms.yml b/config/locales/ms.yml index 4c98423b3..36fd91e65 100644 --- a/config/locales/ms.yml +++ b/config/locales/ms.yml @@ -1495,6 +1495,7 @@ ms: open_data_copyright_license: Laman Hak Cipta dan Lesen partners_title: Rakan Kongsi copyright: + title: Hak Cipta dan Lesen foreign: title: Perihal terjemahan ini html: Sekiranya terdapat percanggahan antara halaman yang diterjemah ini dengan @@ -1508,7 +1509,6 @@ ms: native_link: versi Bahasa Melayu mapping_link: mula membuat peta legal_babble: - title_html: Hak Cipta dan Lesen introduction_1_open_data: data terbuka credit_title_html: Cara memberikan penghargaan kepada OpenStreetMap credit_1_html: Kami memerlukan anda menggunakan dikenali sebagai “© diff --git a/config/locales/my.yml b/config/locales/my.yml index 5ecbe410f..d289ddda4 100644 --- a/config/locales/my.yml +++ b/config/locales/my.yml @@ -629,13 +629,13 @@ my: legal_title: တရားဝင် partners_title: လုပ်ဖော်ကိုင်ဖက်များ copyright: + title: မူပိုင်ခွင့်နှင့် လိုင်စင် foreign: title: ဤဘာသာပြန်အကြောင်း native: title: ဤစာမျက်နှာအကြောင်း mapping_link: မြေပုံ စတင်ရေးဆွဲရန် legal_babble: - title_html: မူပိုင်ခွင့်နှင့် လိုင်စင် contributors_title_html: မိမိတို့၏ ပံ့ပို့ပေးသူများ edit: user_page_link: အသုံးပြုသူ စာမျက်နှာ diff --git a/config/locales/nb.yml b/config/locales/nb.yml index fefdc51be..503881c55 100644 --- a/config/locales/nb.yml +++ b/config/locales/nb.yml @@ -1693,6 +1693,7 @@ nb: legal_title: Juridisk partners_title: Partnere copyright: + title: Opphavsrett og lisenser foreign: title: Om denne oversettelsen html: I tilfelle konflikt mellom denne oversatte siden og %{english_original_link} @@ -1706,7 +1707,6 @@ nb: native_link: Norsk versjon mapping_link: start kartlegging legal_babble: - title_html: Opphavsrett og lisenser credit_title_html: Hvordan kreditere OpenStreetMap credit_1_html: Vi krever at du bruker godskrivinga «© OpenStreetMap-bidragsyterene». attribution_example: diff --git a/config/locales/ne.yml b/config/locales/ne.yml index 9752989d2..84d03ebbe 100644 --- a/config/locales/ne.yml +++ b/config/locales/ne.yml @@ -300,6 +300,7 @@ ne: entry_html: सम्बन्ध %{relation_name} entry_role_html: सम्बन्ध %{relation_name} (as %{relation_role}) not_found: + title: फेला परेन sorry: 'माफ गर्नुहोला, %{type} #%{id} फेला पार्न सकिएन ।' type: node: नोड @@ -308,6 +309,7 @@ ne: changeset: परिवर्तनसेट note: टिपोट timeout: + title: समयसमाप्ति त्रुटि sorry: माफ गर्नुहोला, %{id} अाइडि भएको %{type}को लागि तथ्याङ्क प्राप्त गर्न निक्कै समय लाग्यो । type: @@ -338,6 +340,7 @@ ne: wikidata_link: '%{page} वस्तु विकिडेटा मा' wikipedia_link: '%{page}को बारेमा विकिपीडियामा भएको लेख' telephone_link: '%{phone_number} मा फोन गर्नुहोस्' + colour_preview: रङ %{colour_value} पूर्वावलोकन query: title: क्वेरी गुणहरू introduction: नजिकैका फिचरहरू भेटाउन नक्सामा क्लिक गर्नुहोस् @@ -455,25 +458,28 @@ ne: no_such_entry: title: त्यस्तो कुनै दैनिकी भेटिएन heading: '%{id} आइडी भएको कुनै अभिलेख भेटिएन' - body: माफ गर्नुहोला, %{id} आइडी भएको कुनै डायरी छैन । कृपया हिज्जे जाँच गर्नुहोस्, - वा गलत लिङ्क क्लिक गर्नुभयो कि हेर्नुहोस् । + body: माफ गर्नुहोला, %{id} आइडी भएको कुनै डायरी छैन। कृपया हिज्जे जाँच गर्नुहोस्, + वा गलत लिङ्क क्लिक गर्नुभयो कि हेर्नुहोस्। diary_entry: posted_by_html: '%{link_user}द्वारा %{created}मा %{language_link}भाषामा पोस्ट गरिएको' comment_link: यस प्रविष्टीमा टिप्पणी गर्ने reply_link: लेखकलाई सन्देश पठाउनुहोस् comment_count: - zero: कुनै टिप्पणीहरू छैनन् one: '%{count} टिप्पणी' other: '%{count} टिप्पणीहरू' + no_comments: कुनै पनि टिप्पणीहरू छैनन् edit_link: यो प्रविष्टी सम्पादन गर्ने hide_link: यो प्रविष्टी लुकाउने + unhide_link: यो प्रविष्टी देखाउने confirm: निश्चित गर्नुहोस् report: यो प्रविष्टीको उजुरी गर्नुहोस् diary_comment: comment_from_html: '%{link_user}द्वारा %{comment_created_at}मा गरिएको टिप्पणी' hide_link: यो टिप्पणी लुकाउनुहोस् + unhide_link: यो टिप्पणी देखाउने confirm: निश्चित गर्नुहोस् + report: यस टिप्पणी माथि उजुरी गर्ने location: location: 'स्थान:' view: अवलोकन गर्नुहोस् @@ -490,6 +496,10 @@ ne: all: title: OpenStreetMap डायरी प्रविष्टीहरू description: OpenStreetMap प्रयोगकर्ताहरूका हालैका डायरी प्रविष्टीहरू + subscribe: + button: छलफलको लागि सदस्यता लिनुहोस् + unsubscribe: + button: छलफलबाट सदस्यता रद्द गर्नुहोस् diary_comments: index: post: पोष्ट @@ -498,6 +508,8 @@ ne: newer_comments: नयाँ टिप्पणीहरू older_comments: पूरानो टिप्पणीहरू errors: + contact: + contact: सम्पर्क forbidden: title: निषेध गरिएको internal_server_error: @@ -532,7 +544,7 @@ ne: aeroway: aerodrome: हवाईड्रोम airstrip: हवाई यात्रा - apron: तटबन्द + apron: एयरपोर्ट एप्रोन gate: विमानस्थलको गेट hangar: ह्याङ्गर helipad: हेलिकप्टर बस्ने ठाउँ @@ -649,14 +661,38 @@ ne: building: garages: ग्यारेजहरू hangar: ह्याङ्गर + hotel: होटल भवन house: घर + hut: झुप्रो + industrial: औद्योगिक भवन + manufacture: निर्माण भवन + office: कार्यालय भवन public: सार्वजनिक भवन + residential: आवासीय भवन + retail: खुद्रा भवन + roof: छत + ruins: भत्किएको भवन + school: विद्यालय भवन + semidetached_house: अर्ध-विभाजित घर + service: सेवा भवन + stable: स्थिर + temple: मन्दिर भवन + university: विश्वविद्यालय भवन + warehouse: गोदाम "yes": भवन + club: + scout: स्काउट समूह आधार + sport: खेलकुद क्लब + "yes": क्लब craft: + beekeeper: मौरीपालक brewery: ब्रुएरी carpenter: सिकर्मी electrician: विद्युतकर्मी + electronics_repair: इलेक्ट्रोनिक्स मर्मत gardener: माली + handicraft: हस्तकला + metal_construction: धातु निर्माता painter: पेन्टर photographer: फोटोग्रा plumber: प्लमर @@ -664,17 +700,23 @@ ne: tailor: सुचीकार "yes": कला पसल emergency: + access_point: पहुँच बिन्दु ambulance_station: एम्बुलेन्स पार्क defibrillator: डिफिब्रिलेटर + fire_extinguisher: अग्निरोधक landing_site: आकस्मिक अवतरण क्षेत्र phone: आकस्मिक फोन + siren: आपतकालीन साइरन + water_tank: आपतकालीन पानी ट्याङ्की highway: abandoned: छोडिएको राजमार्ग bus_stop: बस बिसौनी construction: निर्माणाधिन राजमार्ग + corridor: कोरिडोर cycleway: साइकल मार्ग elevator: भर्‍याङ footway: पदमार्ग + ford: फोर्ड living_street: आवासिय गल्ली milestone: कोसेढुङ्गा motorway: मोटरमार्ग @@ -698,16 +740,24 @@ ne: stop: रोक्ने चिह्न street_lamp: सडक बत्ती track: ट्रयाक + traffic_mirror: ट्राफिक ऐना traffic_signals: ट्राफिक चिह्नहरू + unclassified: अवर्गीकृत सडक "yes": सडक historic: + aircraft: ऐतिहासिक विमान + archaeological_site: पुरातात्विक स्थल + battlefield: रणभूमि + building: ऐतिहासिक भवन bunker: बङ्कर + cannon: ऐतिहासिक तोप castle: गढी church: गिर्जाघर city_gate: सहर प्रवेशद्वार citywalls: सहरी पर्खाल fort: किल्ला heritage: सम्पादा क्षेत्र + hollow_way: खाली बाटो house: घर memorial: स्मारक mine: खानी @@ -716,13 +766,14 @@ ne: stone: पत्थर tomb: चिहान tower: टावर + wreck: भग्नावशेष "yes": ऐतिहासिक स्थल landuse: basin: बेसिन cemetery: अन्त्यष्टी स्थल commercial: व्यवसायिक क्षेत्र - conservation: संरक्षण - construction: निर्माण + conservation: संरक्षण क्षेत्र + construction: निर्माण क्षेत्र farmland: खेतीयोग्य जमिन farmyard: खेत forest: वन @@ -734,40 +785,78 @@ ne: military: सैनिक इलाका mine: खानी railway: रेलमार्ग + religious: धार्मिक स्थल reservoir: जलाशय residential: आवासीय क्षेत्र - retail: खुद्रा + retail: खुद्रा व्यापार क्षेत्र vineyard: अङ्गुर-बगैँचा "yes": भू-उपयोग leisure: + adult_gaming_centre: वयस्क खेल केन्द्र + beach_resort: समुद्र तट रिसोर्ट + common: साझा भूमि + dance: नृत्य हल + dog_park: कुकुर पार्क + fishing: मत्स्य क्षेत्र + fitness_centre: फिटनेस सेन्टर + fitness_station: फिटनेस स्टेशन garden: बगैँचा + golf_course: गल्फ खेलक्षेत्र + horse_riding: घोडसवार केन्द्र + nature_reserve: प्रकृति आरक्ष + outdoor_seating: बाहिरी बैठक park: उद्यान + picnic_table: पिकनिक टेबल + pitch: खेलकुद पिच playground: खेलमैदान + recreation_ground: मनोरञ्जन स्थल resort: रिसोर्ट sauna: सौना + sports_centre: खेलकुद केन्द्र stadium: रङ्गाशाला swimming_pool: पौली पोखरी + track: दौडिने बाटो + water_park: पानी पार्क "yes": फुर्सद man_made: + advertising: विज्ञापन + antenna: एन्टेना + avalanche_protection: हिमस्खलन संरक्षण + beehive: मौरीको घार bridge: पुल bunker_silo: बङ्कर chimney: चिम्नी + communications_tower: सञ्चार टावर crane: क्रेन embankment: तटबन्ध lighthouse: प्रकाश घर mine: खानी pipeline: पाइपरेखा + reservoir_covered: ढाकिएको जलाशय + snow_cannon: हिउँ तोप + storage_tank: भण्डारण ट्याङ्की + surveillance: निगरानी + telescope: टेलिस्कोप tower: टावर + utility_pole: उपयोगिता पोल + water_tap: पानीको धारा + water_tower: पानीको टावर works: कारखाना + "yes": मानव निर्मित military: barracks: सैनिक घर bunker: बङ्कर + checkpoint: जाँच बिन्दु "yes": सेना mountain_pass: "yes": पर्वतीय भञ्ज्याङ natural: + atoll: प्रवालद्वीप bay: खाडी beach: समुद्र किनारा + cave_entrance: गुफा प्रवेश + cliff: चट्टान + coastline: तटीय रेखा crater: क्रेटर forest: वन glacier: हिमनदी @@ -779,32 +868,50 @@ ne: marsh: धाप mud: हिलो मााटो peak: शिखर + peninsula: प्रायद्वीप point: बिन्दु rock: रक sand: बालुवा spring: स्प्रिङ stone: पत्थर + strait: जलसन्धि tree: रूख + tundra: टुन्ड्रा valley: उपत्यका volcano: ज्वालामुखी water: पानी wetland: सिमसार wood: कुञ्ज + "yes": प्राकृतिक विशेषता office: accountant: लेखापाल administrative: प्रबन्धकीय स्थल + advertising_agency: विज्ञापन संस्थान architect: आर्किटेक्ट + association: सङ्घ company: कम्पनी + diplomatic: कूटनीतिक कार्यालय + educational_institution: शैक्षिक संस्था + employment_agency: रोजगार संस्था + energy_supplier: ऊर्जा आपूर्तिकर्ता कार्यालय estate_agent: घरजग्गा एजेन्ट + financial: वित्तीय कार्यालय government: सरकारी कार्यालय insurance: बीमा कार्यालय it: आइटी कार्यालय lawyer: वकिल + logistics: रसद कार्यालय + newspaper: समाचार पत्र कार्यालय ngo: एनजिओ कार्यलय + notary: नोटरी + religion: धार्मिक कार्यालय + research: अनुसन्धान कार्यालय + tax_advisor: कर सल्लाहकार telecommunication: दूरसञ्चार कार्यलय travel_agent: ट्राभल एजेन्सी "yes": कार्यलय place: + archipelago: द्वीपसमूह city: शहर country: देश county: ईलाका @@ -818,9 +925,13 @@ ne: municipality: नगरपालिका neighbourhood: छिमेक postcode: पोस्ट कोड + quarter: चौमासिक region: क्षेत्र sea: समुद्र + square: वर्ग state: राज्य + subdivision: उपविभाग + suburb: उपनगर town: नगर village: गाउँ "yes": स्थानहरू @@ -862,7 +973,7 @@ ne: grocery: किराना पसल hairdresser: नाइ पसल hardware: हार्डवेयर पसल - hifi: हाइ-फाइ + hifi: हाइ-फाइ पसल jewelry: गहना पसल mall: सपिङ मल mobile_phone: मोबाइल फोन पसल @@ -1070,31 +1181,73 @@ ne: tab_title: प्रवेश password: पासवर्ड login_button: प्रवेश + register now: अहिले दर्ता गर्नुहोस् + with external: वा तेस्रो पक्षसँग लग इन गर्नुहोस् + or: अथवा + auth failure: माफ गर्नुहोस्, ती विवरणहरूसँग लग इन गर्न सकिएन। destroy: title: लगआउट + heading: ओपनस्ट्रिटम्यापबाट निर्गमन गर्नुहोस् logout_button: निर्गमन + suspended_flash: + suspended: माफ गर्नुहोस्, तपाईको खाता सन्दिग्ध गतिविधिको कारण निलम्बित गरिएको + छ। shared: markdown_help: link: कडी + text: पाठ image: तस्विर + alt: वैकल्पिक पाठ + url: युआरएल richtext_field: edit: सम्पादन गर्नुहोस् + preview: पूर्वावलोकन site: about: next: अर्को local_knowledge_title: स्थानीय ज्ञान community_driven_title: समूदायबाट सञ्चालित + community_driven_osm_blog: ओपनस्ट्रिटम्याप ब्लग open_data_title: खुल्ला डेटा + open_data_open_data: खुल्ला डेटा + open_data_copyright_license: प्रतिलिपी अधिकार र इजाजतपत्र पृष्ठ legal_title: कानूनी partners_title: समर्थकहरू copyright: + title: प्रतिलिपी अधिकार र इजाजतपत्र + foreign: + title: यस अनुवादको बारेमा + english_link: अङ्ग्रेजी मूल native: title: यो पृष्ठको बारेमा mapping_link: म्यापिङ गर्न सुरु गर्नुहोस् legal_babble: + introduction_1_open_data: खुल्ला डेटा + introduction_1_osm_foundation: ओपनस्ट्रीटम्याप फाउन्डेसन + introduction_1_osm_foundation_url: https://osmfoundation.org/ + introduction_2_legal_code: कानूनी कोड + introduction_2_legal_code_url: https://opendatacommons.org/licenses/odbl/1.0/ more_title_html: थप जान्नको लागि contributors_title_html: हाम्रा योगदान कर्ताहरू + contributors_at_austria: अस्ट्रिया + contributors_au_australia: अस्ट्रेलिया + contributors_ca_canada: क्यानडा + contributors_cz_czechia: चेकिया + contributors_fi_finland: फिन्ल्यान्ड contributors_fr_france: फ्रान्स + contributors_hr_croatia: क्रोएसिया + contributors_nl_netherlands: नेदरल्यान्ड + contributors_nl_and: www.and.com + contributors_nl_and_url: https://www.and.com + contributors_nz_new_zealand: न्युजिल्यान्ड + contributors_rs_serbia: सर्बिया + contributors_si_slovenia: स्लोभेनिया + contributors_si_mkgp: कृषि, वन तथा खाद्य मन्त्रालय + contributors_es_spain: स्पेन + contributors_gb_united_kingdom: संयुक्त अधिराज्य + contributors_2_contributors_page: योगदानकर्ताहरूको पृष्ठ + trademarks_title: ट्रेडमार्कहरू + trademarks_1_1_trademark_policy: ट्रेडमार्क नीति edit: user_page_link: प्रयोगकर्ता पृष्ठ export: @@ -1132,7 +1285,7 @@ ne: title: कसरी सहायता पाउने welcome: url: /welcome - title: OSM मा स्वागत् छ + title: ओपन स्ट्रिट म्यापमा स्वागत छ! beginners_guide: title: सुरुवातकर्ताहरूको लागि मार्गदर्शन description: सुरुवातकर्ताहरूको लागि समुदायद्वारा निर्मित निर्देशिका @@ -1142,6 +1295,8 @@ ne: title: आईआरसि switch2osm: title: स्विचटु‍ओएसएम + wiki: + title: ओपनस्ट्रिटम्याप विकि sidebar: close: बन्द गर्नुहोस् search: @@ -1189,19 +1344,28 @@ ne: hospital: अस्पताल summit: शिखर peak: शिखर + bus_stop: बस बिसौनी + stop: रोक्ने bicycle_shop: साइकल पसल + bicycle_rental: साइकल भाडामा bicycle_parking: साकल पार्किङ + bicycle_parking_small: सानो साइकल पार्किङ toilets: शौचालय welcome: title: स्वागत! whats_on_the_map: title: म्यापमा के छ basic_terms: + editor: सम्पादक node: नोड way: बाटो + tag: चिनो rules: title: नियमहरू ! + imports: आयात start_mapping: म्यापिङ गर्न सुरु गर्नुहोस् + communities: + title: समुदायहरू traces: new: upload_trace: GPS Trace अपलोड गर्ने @@ -1238,7 +1402,9 @@ ne: visibility: 'दृश्यक्षमता:' trace: pending: बाँकी रहेको - count_points: पोइन्टहरु %{count} + count_points: + one: '%{count} अङ्क' + other: '%{count} अङ्कहरू' more: थप trace_details: ट्रेसको विस्तृत जानकारी हेर्ने view_map: नक्सा हेर्ने @@ -1257,9 +1423,25 @@ ne: made_public: सार्वजनिक बनाइएको ट्रेस application: auth_providers: + openid_login_button: जारी राख्ने + openid: + title: ओपनआईडीसँग प्रवेश गर्नुहोस् + google: + title: गुगल प्रयोग गरेर प्रवेश गर्नुहोस् + facebook: + title: फेसबुक प्रयोग गरेर प्रवेश गर्नुहोस् + alt: फेसबुक खाताको साथ प्रवेश गर्नुहोस् + microsoft: + title: माइक्रोसफ्टको साथ प्रवेश गर्नुहोस् + alt: माइक्रोसफ्ट खाताको साथ प्रवेश गर्नुहोस् + github: + title: गिटहबको साथ प्रवेश गर्नुहोस् + alt: गिटहब खाताको साथ प्रवेश गर्नुहोस् wikipedia: title: विकिपिडियाकाे प्रयाेग गरि प्रवेश गर्नुहाेस् alt: विकिपिडिया खाताद्वारा प्रवेश गर्नुहोस् + wordpress: + title: वर्डप्रेस खाताबाट प्रवेश गर्नुहोस् oauth_clients: show: confirm: निश्चित हुनुहुन्छ ? @@ -1284,8 +1466,13 @@ ne: about: header: खुल्ला र सम्पादन गर्न मिल्ने continue: खाता खाेल्नुहाेस् + privacy_policy: गोपनीयता नीति terms: + title: सर्तहरू + heading: सर्तहरू + heading_ct: योगदानकर्ता सर्तहरू consider_pd_why: यो के हो ? + continue: जारी राख्ने decline: असहमत legale_names: france: फ्रान्स @@ -1341,10 +1528,13 @@ ne: user_blocks: show: created: सृजना गरिएको + duration: 'अवधि:' status: 'स्थिति:' show: देखाउनुहोस् edit: सम्पादन गर्नुहोस् + revoke: रद्द गर्नुहोस्! confirm: निश्चित हुनुहुन्छ ? + reason: 'प्रतिबन्धको कारण:' block: show: देखाउनुहोस् edit: सम्पादन गर्नुहोस् @@ -1368,6 +1558,7 @@ ne: closed_title: 'समाधान गरिएको टिप्पणी #%{note_name}' hidden_title: 'लुकाइएको टिप्पणी #%{note_name}' report: यस टिपोटलाई उजुरी गर्नुहोस् + coordinates_html: '%{latitude}; %{longitude}' hide: लुकाउनुहोस् comment: टिप्पणी new: @@ -1394,7 +1585,10 @@ ne: notes: म्याप टिप्पणीहरू gps: सार्वजनिक GPS ट्रेसहरू make_a_donation: दान गर्नुहोस् + tracestrack: ट्रेसट्र्याक directions: + directions: दिशाहरू + distance: दूरी instructions: exit_counts: first: प्रथम diff --git a/config/locales/nl.yml b/config/locales/nl.yml index e9d17d84d..cfc0b543c 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -2102,6 +2102,7 @@ nl: legal_2_2_registered_trademarks: geregistreerde handelsmerken van de OSMF partners_title: Partners copyright: + title: Auteursrechten en licentie foreign: title: Over deze vertaling html: In het geval deze taalversie en %{english_original_link} elkaar tegenspreken, @@ -2115,7 +2116,6 @@ nl: native_link: Nederlandstalige versie mapping_link: begin met mappen legal_babble: - title_html: Auteursrechten en licentie introduction_1_html: |- OpenStreetMap%{registered_trademark_link} is %{open_data}, in licentie gegeven onder de %{odc_odbl_link} (ODbL) door de %{osm_foundation_link} (OSMF). diff --git a/config/locales/nn.yml b/config/locales/nn.yml index 77eec99f0..be0bdb0bd 100644 --- a/config/locales/nn.yml +++ b/config/locales/nn.yml @@ -1857,6 +1857,7 @@ nn: legal_2_2_registered_trademarks: regristrerte varemerke til OSMF partners_title: Partnarar copyright: + title: Opphavsrett og lisensar foreign: title: Om denne omsetjinga html: Om denne omsetjinga kjem i motsetjing med %{english_original_link}, @@ -1870,7 +1871,6 @@ nn: native_link: Nynorsk versjon mapping_link: start kartlegging legal_babble: - title_html: Opphavsrett og lisensar introduction_1_html: OpenStreetMap%{registered_trademark_link} er %{open_data}, med lisens %{odc_odbl_link} (ODbL) av %{osm_foundation_link} (OSMF). introduction_1_open_data: ope data diff --git a/config/locales/nqo.yml b/config/locales/nqo.yml index 7e7331dd1..06e0ae1dd 100644 --- a/config/locales/nqo.yml +++ b/config/locales/nqo.yml @@ -1390,6 +1390,7 @@ nqo: open_data_title: ߓߟߏߡߟߊ߫ ߘߊߦߟߍ߬ߣߍ߲ partners_title: ߞߊ߬ߝߏ߬ߢߐ߲߮ ߠߎ߬ copyright: + title: ߓߊߦߟߍߡߊ߲ ߤߊߞߍ ߣߌ߫ ߕߌ߰ߦߊ foreign: title: ߞߊ߬ ߓߍ߲߬ ߘߟߊߡߌߘߊߟߌ ߣߌ߲߬ ߡߊ߬ english_link: ߊ߲߬ߜ߭ߌߟߋ ߓߊߖߎߡߊ @@ -1398,7 +1399,6 @@ nqo: native_link: ߒߞߏ_ߕߐ߮_ߦߋ߫_ߦߊ߲߬ ߟߦߍ߬ߡߊ߲߬ߠߌ߲ mapping_link: ߔߊ߬ߔߘߊ߬ߦߊ߬ߟߌ ߘߊߡߌ߬ߣߊ߫ legal_babble: - title_html: ߓߊߦߟߍߡߊ߲ ߤߊߞߍ ߣߌ߫ ߕߌ߰ߦߊ credit_title_html: ߟߊߒߣߦߊ ߦߋ߫ ߛߐ߬ߘߐ߲߬ ߠߊ߫ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߟߊ߫ ߘߌ߬ more_title_html: ߛߌߦߊߡߊ߲߫ ߜߘߍ߫ ߟߎ߫ ߢߌߣߌ߲ ߦߴߌ ߘߐ߫ contributors_title_html: ߊ߲ ߠߊ߫ ߓߟߏߡߊߜߍ߲ ߠߎ߬ diff --git a/config/locales/oc.yml b/config/locales/oc.yml index d98593a62..de0a5d021 100644 --- a/config/locales/oc.yml +++ b/config/locales/oc.yml @@ -1836,6 +1836,7 @@ oc: legal_title: Juridic partners_title: Partenaris copyright: + title: Copyright e Licéncia foreign: title: A prepaus d'aquesta traduccion html: En cas de conflicte entre aquesta pagina e la pagina %{english_original_link}, @@ -1849,7 +1850,6 @@ oc: native_link: version occitana mapping_link: començar a contribuir legal_babble: - title_html: Copyright e Licéncia credit_title_html: Cossí creditar OpenStreetMap credit_1_html: Demandam que vòstre crèdit compòrte la mencion « © lei contribueires d’OpenStreetMap ». diff --git a/config/locales/pa.yml b/config/locales/pa.yml index 4ee921521..0d6fd997c 100644 --- a/config/locales/pa.yml +++ b/config/locales/pa.yml @@ -988,6 +988,7 @@ pa: legal_title: ਕਾਨੂੰਨੀ partners_title: ਸਾਂਝੀਦਾਰ copyright: + title: ਨਕਲ-ਹੱਕ ਤੇ ਲਾਇਸੰਸ foreign: title: ਇਸ ਤਰਜਮੇ ਬਾਰੇ english_link: ਮੂਲ ਅੰਗਰੇਜ਼ੀ @@ -996,7 +997,6 @@ pa: native_link: ਪੰਜਾਬੀ ਵਰਜਨ mapping_link: ਨਕਸ਼ਾਬੰਦੀ ਸ਼ੁਰੂ ਕਰੋ legal_babble: - title_html: ਨਕਲ-ਹੱਕ ਤੇ ਲਾਇਸੰਸ introduction_1_osm_foundation: ਖੁੱਲ੍ਹਾ-ਗਲੀ-ਨਕਸ਼ਾ ਸੰਸਥਾ credit_title_html: ਖੁੱਲ੍ਹਾ-ਗਲੀ-ਨਕਸ਼ਾ ਨੂੰ ਕਿਵੇਂ ਸੇਹਰਾ ਦੇਣਾ ਹੈ credit_1_html: 'ਜਿੱਥੇ ਤੁਸੀਂ ਖੁੱਲ੍ਹਾ-ਗਲੀ-ਨਕਸ਼ਾ ਡੇਟਾ ਦੀ ਵਰਤੋਂ ਕਰਦੇ ਹੋ, ਤੁਹਾਨੂੰ diff --git a/config/locales/pl.yml b/config/locales/pl.yml index b43068952..6fb63fe3f 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -2047,6 +2047,7 @@ pl: legal_2_1_contact_the_osmf: skontaktuj się z OSM partners_title: Partnerzy copyright: + title: Prawa autorskie i licencja foreign: title: Informacje o tłumaczeniu html: W przypadku rozbieżności pomiędzy tym tłumaczeniem a %{english_original_link} @@ -2060,7 +2061,6 @@ pl: native_link: wersji po polsku mapping_link: rozpocząć tworzenie mapy legal_babble: - title_html: Prawa autorskie i licencja introduction_1_html: OpenStreetMap%{registered_trademark_link} to projekt %{open_data}, rozpowszechniany na licencji %{odc_odbl_link} (ODbL) przez %{osm_foundation_link} (OSMF). diff --git a/config/locales/pnb.yml b/config/locales/pnb.yml index 726e4c665..02703fea1 100644 --- a/config/locales/pnb.yml +++ b/config/locales/pnb.yml @@ -1482,6 +1482,7 @@ pnb: legal_title: کانونی partners_title: سانجھیدار copyright: + title: نکل حق تے لائیسنس foreign: title: ایس ترجمے بارے html: جے ایس پنجابی صفحے تے %{english_original_link} وکھرے اے، پچھلا انگریزی @@ -1494,7 +1495,6 @@ pnb: native_link: پنجابی شاہمکھی ورژن mapping_link: نقشابندی شروع کرو legal_babble: - title_html: نکل حق تے لائیسنس credit_title_html: ایہہ نقشے لئی حوالے credit_1_html: 'ڈیٹا ورتݨ دے قواعد:' attribution_example: diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml index 2626cbc11..7e012ea02 100644 --- a/config/locales/pt-PT.yml +++ b/config/locales/pt-PT.yml @@ -2073,6 +2073,7 @@ pt-PT: legal_2_2_registered_trademarks: marcas registadas da OSMF partners_title: Parceiros copyright: + title: Licença e Direitos de Autor foreign: title: Sobre Esta Tradução html: Se houver um conflito entre esta página traduzida e %{english_original_link}, @@ -2085,7 +2086,6 @@ pt-PT: native_link: Versão em português europeu mapping_link: começar a mapear legal_babble: - title_html: Licença e Direitos de Autor introduction_1_html: O OpenStreetMap%{registered_trademark_link} é composto por %{open_data}, licenciados sob %{odc_odbl_link} (ODbL) pela %{osm_foundation_link} (OSMF). diff --git a/config/locales/pt.yml b/config/locales/pt.yml index 8080db17a..191c9e80e 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -2055,6 +2055,7 @@ pt: legal_2_2_registered_trademarks: marcas registadas da OSMF partners_title: Parceiros copyright: + title: Direitos autorais e licença foreign: title: Sobre esta tradução html: Caso haja um conflito entre esta tradução e %{english_original_link}, @@ -2068,7 +2069,6 @@ pt: native_link: Versão em Português do Brasil mapping_link: começar a mapear legal_babble: - title_html: Direitos autorais e licença introduction_1_html: O OpenStreetMap%{registered_trademark_link} é composto por %{open_data}, licenciados sob %{odc_odbl_link} (ODbL) pela %{osm_foundation_link} (OSMF). diff --git a/config/locales/ro.yml b/config/locales/ro.yml index c0b0cc636..99e27f7e2 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -1994,6 +1994,7 @@ ro: legal_2_2_registered_trademarks: mărci înregistrate ale OSMF partners_title: Parteneri copyright: + title: Drepturi de autor și licență foreign: title: Despre această traducere html: În cazul unui conflict între această pagină tradusă și %{english_original_link}, @@ -2007,7 +2008,6 @@ ro: native_link: Versiune THIS_LANGUAGE_NAME_HERE mapping_link: Începeți să cartografiați legal_babble: - title_html: Drepturi de autor și licență introduction_1_html: |- OpenStreetMap%{registered_trademark_link} este %{open_data}, licențiat în conformitate cu %{odc_odbl_link} (ODbL) de către %{osm_foundation_link} (OSMF). diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 1e1f2a844..f8d3e0a89 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -2119,6 +2119,7 @@ ru: legal_2_2_registered_trademarks: зарегистрированными товарными знаками OSMF partners_title: Партнёры copyright: + title: Авторские права и лицензирование foreign: title: Об этом переводе html: В случае конфликта между этой переведённой страницей и %{english_original_link}, @@ -2132,7 +2133,6 @@ ru: native_link: русской версии mapping_link: начать картографирование legal_babble: - title_html: Авторские права и лицензирование introduction_1_html: "OpenStreetMap%{registered_trademark_link} — это %{open_data}, лицензированные по \n%{odc_odbl_link} (ODbL), разработанной %{osm_foundation_link} (OSMF)." diff --git a/config/locales/sc.yml b/config/locales/sc.yml index f91dcca38..2826c81e3 100644 --- a/config/locales/sc.yml +++ b/config/locales/sc.yml @@ -1984,6 +1984,7 @@ sc: legal_2_2_registered_trademarks: marcas registradas de s'OSMF partners_title: Sòtzios copyright: + title: Deretu de autore e litzèntzia foreign: title: Informatziones subra de custa tradutzione html: In casu de cunflitu intre custa pàgina bortada e %{english_original_link}, @@ -1997,7 +1998,6 @@ sc: native_link: versione in sardu mapping_link: incumintzare a mapare legal_babble: - title_html: Deretu de autore e litzèntzia introduction_1_html: |- OpenStreetMap%{registered_trademark_link} est basadu subra de %{open_data}, suta de sa litzèntzia %{odc_odbl_link} (ODbL) dae sa %{osm_foundation_link} (OSMF). diff --git a/config/locales/scn.yml b/config/locales/scn.yml index 3cddda069..e7acd27e5 100644 --- a/config/locales/scn.yml +++ b/config/locales/scn.yml @@ -1330,6 +1330,7 @@ scn: legal_title: Noti ligali partners_title: Cullabburatura copyright: + title: Dritti d'auturi e Licenza foreign: title: A prupòsitu di sta traduzzioni html: N casu di cunflittu tra di sta pàggina traduciuta e %{english_original_link}, @@ -1343,7 +1344,6 @@ scn: native_link: virsioni n sicilianu mapping_link: accuminzari a mappari legal_babble: - title_html: Dritti d'auturi e Licenza credit_title_html: Comu s'attribbuisci a OpenStreetMap credit_1_html: Addumannamu chi s'usa l'attribbuzzioni «© li cuntribbutura d'OpenStreetMap». diff --git a/config/locales/sco.yml b/config/locales/sco.yml index 20bd6cbf0..57bb548cc 100644 --- a/config/locales/sco.yml +++ b/config/locales/sco.yml @@ -806,6 +806,7 @@ sco: logout_button: Logoot site: copyright: + title: Copyricht an License foreign: title: Aboot this translation html: In the event of a conflict atween this translatit page an %{english_original_link}, @@ -819,7 +820,6 @@ sco: native_link: Scots version mapping_link: stairt cairttin legal_babble: - title_html: Copyricht an License credit_title_html: Hou tae credit OpenStreetMap credit_1_html: |- We require that ye uise the credit “© OpenStreetMap diff --git a/config/locales/sk.yml b/config/locales/sk.yml index 5f2f00275..b7fa9dabb 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -450,7 +450,7 @@ sk: load_data: NačítaÅ¥ údaje loading: Nahrávanie... tag_details: - tags: Tagy + tags: Značky wiki_link: key: Stránka s popisom značky %{key} na wiki tag: Stránka s popisom značky %{key}=%{value} na wiki @@ -465,6 +465,15 @@ sk: introduction: Pre nájdenie okolitých prvkov kliknite na mapu. nearby: Okolité prvky enclosing: Obklopujúce prvky + old_nodes: + not_found: + sorry: 'Ľutujeme, uzol #%{id} verzie %{version} sa nepodarilo nájsÅ¥.' + old_ways: + not_found: + sorry: 'Ľutujeme, cestu #%{id} verzie %{version} sa nepodarilo nájsÅ¥.' + old_relations: + not_found: + sorry: 'Ľutujeme, reláciu #%{id} verzie %{version} sa nepodarilo nájsÅ¥.' changesets: changeset_paging_nav: showing_page: Stránka %{page} @@ -1579,9 +1588,9 @@ sk: befriend_them: Môžete ich tiež pridaÅ¥ ako priateľov na %{befriendurl}. befriend_them_html: Môžete ho/ju tiež pridaÅ¥ ako priateľov na %{befriendurl}. gpx_description: - description_with_tags_html: 'Vyzerá, že váš GPX súbor %{trace_name} s popisom + description_with_tags_html: 'vyzerá, že váš GPX súbor %{trace_name} s popisom %{trace_description} a nasledujúcimi značkami: %{tags}' - description_with_no_tags_html: Vyzerá, že váš súbor GPX %{trace_name} s popisom + description_with_no_tags_html: vyzerá, že váš súbor GPX %{trace_name} s popisom %{trace_description} a bez značiek gpx_failure: hi: Ahoj %{to_user}, @@ -1916,6 +1925,7 @@ sk: legal_2_2_registered_trademarks: registrované ochranné známky OSMF partners_title: Partneri copyright: + title: Autorské práva a licencia foreign: title: O tomto preklade html: V prípade rozporu medzi touto preloženou verziou a %{english_original_link} @@ -1929,7 +1939,6 @@ sk: native_link: slovenskú verziu mapping_link: začaÅ¥ mapovaÅ¥ legal_babble: - title_html: Autorské práva a licencia introduction_1_html: "OpenStreetMap%{registered_trademark_link} sú %{open_data}, ktoré licencované za podmienok \n%{odc_odbl_link} (ODbL) poskytuje %{osm_foundation_link} (OSMF)." @@ -2336,11 +2345,12 @@ sk: identifiable: IDENTIFIKOVATEĽNÁ private: SÚKROMNÁ trackable: STOPOVATEĽNÁ + details_with_tags_html: '%{time_ago} používateľom %{user} v %{tags}' index: public_traces: Verejné GPS stopy public_traces_from: Verejné GPS stopy od %{user} description: PrechádzaÅ¥ nedávno nahrané GPS stopy - tagged_with: označený s %{tags} + tagged_with: ' označený s %{tags}' upload_trace: NahraÅ¥ stopu all_traces: VÅ¡etky stopy my_traces: Moje stopy @@ -2518,9 +2528,14 @@ sk: automaticky. about: header: Slobodné a upravovateľné + paragraph_1: Na rozdiel od iných máp OpenStreetMap tvoria výhradne dobrovoľníci + ako ste vy a každý si ju môže bezplatne opraviÅ¥, aktualizovaÅ¥, stiahnuÅ¥ + a použiÅ¥. paragraph_2: Ak chcete začaÅ¥ prispievaÅ¥, zaregistrujte sa. display name description: VaÅ¡e verejne zobrazené meno užívateľa. Môžete ho potom zmeniÅ¥ v nastaveniach. + by_signing_up_html: Registráciou súhlasíte s naÅ¡imi %{tou_link}, %{privacy_policy_link} + a %{contributor_terms_link}. external auth: 'Autentifikácia treÅ¥ou stranou:' continue: ZaregistrovaÅ¥ sa terms accepted: Ďakujeme za odsúhlasenie nových podmienok prispievania! @@ -2528,6 +2543,7 @@ sk: pozornosÅ¥ naÅ¡im %{privacy_policy_link}. privacy_policy_title: Pravidlá ochrany osobných údajov OSMF vrátane sekcie o e-mailových adresách + consider_pd_html: Moje príspevky považujem za %{consider_pd_link}. use external auth: prípadne využite na registráciu služby tretích strán terms: title: Podmienky diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 013f5f445..eba875e88 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -2076,6 +2076,7 @@ sl: legal_2_2_registered_trademarks: registrirane tržne znamke OSMF partners_title: Partnerji copyright: + title: Avtorske pravice in licenca foreign: title: O tem prevodu html: V primeru neskladja med tem prevodom in %{english_original_link} prevlada @@ -2088,7 +2089,6 @@ sl: native_link: Slovensko verzijo mapping_link: začnete kartirati legal_babble: - title_html: Avtorske pravice in licenca introduction_1_html: |- OpenStreetMap%{registered_trademark_link} so %{open_data}, ki jih je pod licenco %{odc_odbl_link} (ODbL) objavila %{osm_foundation_link} (OSMF). diff --git a/config/locales/sq.yml b/config/locales/sq.yml index f1aa317ee..d8bff3a3c 100644 --- a/config/locales/sq.yml +++ b/config/locales/sq.yml @@ -1052,6 +1052,7 @@ sq: about: next: Tjetra copyright: + title: Të drejtat autoriale dhe licensa foreign: title: Rreth këtij përkthimi html: Në rast të një konflikti ndërmjet kësaj faqeje të përkthyer dhe %{english_original_link}, @@ -1065,7 +1066,6 @@ sq: native_link: Versioni në THIS_LANGUAGE_NAME_HERE mapping_link: fillo hatrografimin legal_babble: - title_html: Të drejtat autoriale dhe licensa credit_title_html: Si të citoni OpenStreetMap credit_1_html: Ne kërkojmë që ju të përdorni kreditet e “© OpenStreetMap contributors”. diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml index 44a9b0f81..4cccc5391 100644 --- a/config/locales/sr-Latn.yml +++ b/config/locales/sr-Latn.yml @@ -928,6 +928,7 @@ sr-Latn: logout_button: Odjavi me site: copyright: + title: Autorska prava i licenca foreign: title: O prevodu html: U slučaju sukoba između prevedene stranice i %{english_original_link}, @@ -941,7 +942,6 @@ sr-Latn: native_link: srpsko izdanje mapping_link: počnite s mapiranjem legal_babble: - title_html: Autorska prava i licenca credit_title_html: Kako da imenujete Openstritmap credit_1_html: |2- Ako koristite naÅ¡e slike mapa, tražimo da zasluge sadrže diff --git a/config/locales/sr.yml b/config/locales/sr.yml index 976f87f10..512f3f3bb 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -1688,6 +1688,7 @@ sr: legal_1_1_privacy_policy: политике приватности partners_title: Партнери copyright: + title: Ауторска права и лиценца foreign: title: О овом преводу html: У случају неслагања између преведене странице и %{english_original_link}, @@ -1701,7 +1702,6 @@ sr: native_link: српско издање mapping_link: почни с уређивањем карте legal_babble: - title_html: Ауторска права и лиценца introduction_2_html: Можете да умножавате, делите, преносите и прилагођавате наше податке, све док наводите OpenStreetMap и њене уреднике. Ако желите да мењате и дограђујете наше податке, можете их делити само под истом лиценцом. diff --git a/config/locales/sv.yml b/config/locales/sv.yml index dd36d9c47..bd635a307 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -2062,6 +2062,7 @@ sv: legal_2_2_registered_trademarks: varmärken registrerade av OSMF partners_title: Partners copyright: + title: Upphovsrätt och licens foreign: title: Om denna översättning html: I händelse av en konflikt mellan denna översatta sida och %{english_original_link} @@ -2075,7 +2076,6 @@ sv: native_link: svensk version mapping_link: börja kartlägga legal_babble: - title_html: Upphovsrätt och licens introduction_1_html: |- OpenStreetMap%{registered_trademark_link} är %{open_data}, licensierad under %{odc_odbl_link} (ODbL) av %{osm_foundation_link} (OSMF). diff --git a/config/locales/te.yml b/config/locales/te.yml index f92484f4c..17a5d7d47 100644 --- a/config/locales/te.yml +++ b/config/locales/te.yml @@ -1803,6 +1803,7 @@ te: open_data_title: ఓపెన్ డేటా partners_title: భాగస్వాములు copyright: + title: కాపీహక్కు, లైసెన్సు foreign: title: ఈ అనువాదం గురించి html: అనువదించిన పేజీకీ %{english_original_link} కూ మధ్య ఘర్షణ ఏర్పడినపుడు @@ -1815,7 +1816,6 @@ te: native_link: THIS_LANGUAGE_NAME_HERE కూర్పు mapping_link: మ్యాపింగు మొదలుపెట్టండి legal_babble: - title_html: కాపీహక్కు, లైసెన్సు introduction_1_open_data: ఓపెన్ డేటా introduction_2_legal_code: చట్టపరమైన కోడ్ credit_title_html: OpenStreetMap కు శ్రేయస్సు నివ్వడం ఎలా diff --git a/config/locales/th.yml b/config/locales/th.yml index 816651756..1546dfd3f 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -1476,6 +1476,7 @@ th: legal_title: ข้อกำหนดทางกฎหมาย partners_title: องค์กรพันธมิตร copyright: + title: ลิขสิทธิ์และสัญญาอนุญาต foreign: title: เกี่ยวกับการแปลนี้ html: หากมีข้อขัดแย้งจากากรตีความหน้าที่แปลนี้กับหน้าเดิมในภาษาอังกฤษ %{english_original_link} @@ -1488,7 +1489,6 @@ th: native_link: รุ่นภาษาTHIS_LANGUAGE_NAME_HERE mapping_link: เริ่มการทำแผนที่ legal_babble: - title_html: ลิขสิทธิ์และสัญญาอนุญาต credit_title_html: วิธีการแสดงที่มาหรือคำขอบคุณ OpenStreetMap credit_1_html: |- เราจำเป็นต้องให้ท่านแสดงที่มาหรือคำขอบคุณแก่ “© ผู้ร่วมสร้างสรรค์ OpenStreetMap diff --git a/config/locales/tl.yml b/config/locales/tl.yml index 25c1f4a5d..4eed4cf1a 100644 --- a/config/locales/tl.yml +++ b/config/locales/tl.yml @@ -1513,6 +1513,7 @@ tl: legal_title: Legal na paunawa partners_title: Mga Kawaksi copyright: + title: Karapatan sa Paglalathala at Lisensiya foreign: title: Tungkol sa salinwikang ito html: Kung sakaling maganap ang isang salungatan sa pagitan ng isinalinwikang @@ -1527,7 +1528,6 @@ tl: native_link: Bersyon ng Tagalog mapping_link: simulan ang pagmamapa legal_babble: - title_html: Karapatan sa Paglalathala at Lisensiya credit_title_html: Paano babanggitin ang OpenStreetMap credit_1_html: 'Kung saan mo ginagamit ang datos ng OpenStreetMap, kailangan mong gawin ang sumusunod na dalawang bagay:' diff --git a/config/locales/tr.yml b/config/locales/tr.yml index dfd2a166f..2f903493d 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -2084,6 +2084,7 @@ tr: legal_2_2_registered_trademarks: OSMF'nin tescilli ticari markaları partners_title: İş birlikçiler copyright: + title: Telif Hakkı ve Lisans foreign: title: Bu çeviri hakkında html: Tercüme edilmiş bu sayfa ile %{english_original_link} arasında meydana @@ -2098,7 +2099,6 @@ tr: native_link: Türkçe sürümü mapping_link: haritacılığa başla legal_babble: - title_html: Telif Hakkı ve Lisans introduction_1_html: OpenStreetMap%{registered_trademark_link} %{odc_odbl_link} (ODbL) altında %{osm_foundation_link} (OSMF) tarafından lisanslanan %{open_data}dir. introduction_1_open_data: açık veri diff --git a/config/locales/uk.yml b/config/locales/uk.yml index 20e1768d2..923ae56e9 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -2120,6 +2120,7 @@ uk: legal_2_2_registered_trademarks: зареєстрованими торговими марками OSMF partners_title: Партнери copyright: + title: Авторські права та ліцензування foreign: title: Про цей переклад html: У разі суперечностей між цим перекладом та %{english_original_link}, @@ -2133,7 +2134,6 @@ uk: native_link: української версії mapping_link: почати мапити legal_babble: - title_html: Авторські права та ліцензування introduction_1_html: OpenStreetMap%{registered_trademark_link} — це %{open_data}, ліцензовані %{osm_foundation_link} (OSMF) на умовах ліцензії %{odc_odbl_link} (ODbL). diff --git a/config/locales/vi.yml b/config/locales/vi.yml index 000e4394f..6c84bcc1c 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -1916,6 +1916,7 @@ vi: legal_2_2_registered_trademarks: nhãn hiệu đăng ký của OSMF partners_title: Nhà bảo trợ copyright: + title: Bản quyền và Giấy phép foreign: title: Thông tin về bản dịch này html: Trong trường hợp có xung đột giữa trang dịch và trang %{english_original_link}, @@ -1928,7 +1929,6 @@ vi: native_link: bản dịch tiếng Việt mapping_link: bắt đầu vẽ bản đồ legal_babble: - title_html: Bản quyền và Giấy phép introduction_1_html: |- OpenStreetMap%{registered_trademark_link} là %{open_data} được %{osm_foundation_link} (OSMF) phát hành theo %{odc_odbl_link} (ODbL). diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index 2f13b6d25..d4a160dbc 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -1980,6 +1980,7 @@ zh-CN: legal_2_2_registered_trademarks: OSMF 的注册商标 partners_title: 合作伙伴 copyright: + title: 著作权与许可 foreign: title: 关于本译文 html: 当该翻译页面与%{english_original_link}冲突时，英语页面会被优先采用 @@ -1990,7 +1991,6 @@ zh-CN: native_link: 简体中文版本 mapping_link: 开始绘制地图 legal_babble: - title_html: 著作权与许可 introduction_1_html: |- OpenStreetMap%{registered_trademark_link} 是%{open_data}，由 %{osm_foundation_link} (OSMF) 在 %{odc_odbl_link} (ODbL) 下获得许可。 diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 14635ba16..0b93da8c5 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -1947,6 +1947,7 @@ zh-TW: legal_2_2_registered_trademarks: OSMF 的註冊商標 partners_title: 合作夥伴 copyright: + title: 版權與授權條款 foreign: title: 關於本翻譯 html: 這個翻譯頁面和 %{english_original_link} 若有衝突，會以英文頁面為準 @@ -1957,7 +1958,6 @@ zh-TW: native_link: 繁體中文版 mapping_link: 開始製圖 legal_babble: - title_html: 版權與授權條款 introduction_1_html: OpenStreetMap%{registered_trademark_link}是%{open_data}，透過%{osm_foundation_link}（OSMF）在%{odc_odbl_link}（ODbL）下授權。 introduction_1_open_data: 開放資料 introduction_1_odc_odbl: 開放資料共享開放資料庫授權