diff options
| -rw-r--r-- | recursos/0uruguay/datos/0uruguay.py | 6 | ||||
| -rw-r--r-- | recursos/0uruguay/datos/levels.py | 6 | ||||
| -rw-r--r-- | recursos/4colonia/datos/levels.py | 22 | ||||
| -rw-r--r-- | recursos/4lavalleja/datos/4lavalleja.py | 4 | ||||
| -rw-r--r-- | recursos/4lavalleja/datos/levels.py | 4 | ||||
| -rw-r--r-- | recursos/4maldonado/datos/levels.py | 2 | ||||
| -rw-r--r-- | recursos/4montevideo/datos/4montevideo.py | 6 | ||||
| -rw-r--r-- | recursos/4montevideo/datos/levels.py | 8 |
8 files changed, 29 insertions, 29 deletions
diff --git a/recursos/0uruguay/datos/0uruguay.py b/recursos/0uruguay/datos/0uruguay.py index 443b22b..2bbf694 100644 --- a/recursos/0uruguay/datos/0uruguay.py +++ b/recursos/0uruguay/datos/0uruguay.py @@ -67,9 +67,9 @@ CITIES = [ (_('Dolores'), 45, 635, 2, 36, 0), (_('Fraile Muerto'), 558, 447, 2, 62, 0), (_('Guichón'), 181, 422, 2, 30, -10), - (_('J. Batlle y Ordóñez'), 504, 602, 2, 0, 12), - (_('J. Pedro Varela'), 585, 600, 2, 0, -12), - (_('José E. Rodó'), 143, 650, 2, 0, 12), + (_('José Batlle y Ordóñez'), 504, 602, 2, 0, 12), + (_('José Pedro Varela'), 585, 600, 2, 0, -12), + (_('José Enrique Rodó'), 143, 650, 2, 0, 12), (_('Juan Lacaze'), 154, 776, 2, 53, -2), (_('La Coronilla'), 732, 666, 2, 5, 10), (_('La Paloma'), 633, 803, 2, 30, 12), diff --git a/recursos/0uruguay/datos/levels.py b/recursos/0uruguay/datos/levels.py index afe9d7d..be5b255 100644 --- a/recursos/0uruguay/datos/levels.py +++ b/recursos/0uruguay/datos/levels.py @@ -87,9 +87,9 @@ LEVEL3 = [ (_('Fraile Muerto'), _("It's in %s") % _("Cerro Largo")), (_('Fray Bentos'), _("It's in %s") % _("Rio Negro")), (_('Guichón'), _("It's in %s") % _("Paysandú")), - (_('J. Batlle y Ordóñez'), _("It's in %s") % _("Lavalleja")), - (_('J. Pedro Varela'), _("It's in %s") % _("Lavalleja")), - (_('José E. Rodó'), _("It's in %s") % _("Soriano")), + (_('José Batlle y Ordóñez'), _("It's in %s") % _("Lavalleja")), + (_('José Pedro Varela'), _("It's in %s") % _("Lavalleja")), + (_('José Enrique Rodó'), _("It's in %s") % _("Soriano")), (_('Juan Lacaze'), _("It's in %s") % _("Colonia")), (_('La Coronilla'), _("It's in %s") % _("Rocha")), (_('La Paloma'), _("It's in %s") % _("Rocha")), diff --git a/recursos/4colonia/datos/levels.py b/recursos/4colonia/datos/levels.py index e2e2087..2716d34 100644 --- a/recursos/4colonia/datos/levels.py +++ b/recursos/4colonia/datos/levels.py @@ -52,21 +52,21 @@ LEVEL2 = [ (_('where there is a\nlarge soft drink factory'), 2, _('Antolin'), _("It's in the center")), (_('with the name of\na median stay'), 2, _('La Estanzuela'), _("It's in the south")), (_('where was the\nbarn of the Uruguay'), 2, _('Semillero'), _("It's in the south")), - (_('where at one time\nhad a large native\ntree forest'), 2, _('Ombúes de Lavalle'), _("It's in the north")), + (_('where there was once\na large native forest'), 2, _('Ombúes de Lavalle'), _("It's in the north")), (_('a town that\ngrew up around\nthe train station'), 2, _('Barker'), _("It's in the west")), - (_('a city with more\nthan 200 years'), 2, _('Rosario'), _("It's in the east")), + (_('a city more than\n200 years old'), 2, _('Rosario'), _("It's in the east")), (_('a town whose name\nis in honor of an\nimportant Uruguayan writer'), 2, _('Florencio Sánchez'), _("It's on the border\nwith %s") % _('Soriano')), (_('a city whose name\nis derived from\nits founder'), 2, _('Juan Lacaze'), _('Has a important port')), (_('called the garden city'), 2, _('Colonia Valdense'), _("It's in the west")), (_('a city founded\nby Swiss immigrants'), 2, _('Nueva Helvecia'), _("It's in the east")), (_('where its people\nare mainly engaged\nin farming'), 2, _('Miguelete'), _("It's in the north")), (_('which at the time\nwas a village\nof stonecutters'), 2, _('Cufré'), _("It's on the border\nwith %s") % _('San José')), - (_('a city founded by\nimmigrants Waldenses\nof Piedmont region'), 2, _('La Paz'), _("It is near %s") % _('Rosario')), - (_('where they meet\nthree routes'), 2, _('Tres Esquinas'), _("It's in the north")), - (_('a town named from\na natural source of water'), 2, _('Manantiales'), _("It's in the north")), + (_('a city founded by\nWaldensian immigrants\nfrom the Piedmont region'), 2, _('La Paz'), _("It is near %s") % _('Rosario')), + (_('where three\nroutes meet'), 2, _('Tres Esquinas'), _("It's in the north")), + (_('a town named for its\nnatural water source'), 2, _('Manantiales'), _("It's in the north")), (_('a town with a\nregular polygon name'), 2, _('El Cuadro'), _("It's in the center")), (_('a town with a\ngeographical name'), 2, _('El Cerro'), _("It's in the west")), - (_('a town bearing\nthe name a\npoisonous vermin'), 2, _('Víboras'), _("It's in the west")), + (_('a town bearing\nthe name of a\npoisonous creature'), 2, _('Víboras'), _("It's in the west")), (_('a town that has\nthe name of a\npart of a church tower'), 2, _('Campana'), _("It's in the north")), (_('where there were\nmany weapons'), 2, _('Cerro de las Armas'), _("It's in the north")) ] @@ -75,20 +75,20 @@ LEVEL2 = [ LEVEL3 = [ 1, - _('Beachs'), + _('Beaches'), ['lineasDepto', 'capitales', 'ciudades'], ['capitales', 'ciudades'], [ - (_('a resort that "gets sleepy"'), 2, _('El Ensueño'), _("It's in the south")), - (_('a resort with holy name'), 2, _('Santa Regina'), _("It's on the border\nwith %s") % _('San José')), + (_('a resort that\n"gets sleepy"'), 2, _('El Ensueño'), _("It's in the south")), + (_('a resort named\nfor a saint'), 2, _('Santa Regina'), _("It's on the border\nwith %s") % _('San José')), (_('a place that has\nmany trees of a\ncertain kind'), 2, _('Los Pinos'), _('Try again')), - (_('a city whose name\nis synonymous of\npromoting'), 2, _('Fomento'), _("It's in the southeast")), + (_('a city whose name\nis synonymous with\npromoting'), 2, _('Fomento'), _("It's in the southeast")), (_('a city with the\nname of a fine\nwater course'), 2, _('Riachuelo'), _("It is near %s") % _('Colonia')), (_('a resort with\nname of people\ncarrying the cannons'), 2, _('Artilleros'), _("It's in the south")), (_('a place that is\nthe mouth of another'), 2, _('Boca del Rosario'), _("It is near %s") % _('Juan Lacaze')), (_('a resort with\nwhite sand'), 2, _('Blancarena'), _("It's in the southeast")), (_('a resort with\nGreek style city name'), 2, _('Britópolis'), _("It's on the border\nwith %s") % _('San José')), - (_('a resort with holy name'), 2, _('Santa Ana'), _("It's in the south")) + (_('a resort named\nfor a saint'), 2, _('Santa Ana'), _("It's in the south")) ] ] diff --git a/recursos/4lavalleja/datos/4lavalleja.py b/recursos/4lavalleja/datos/4lavalleja.py index bdf0a76..2697836 100644 --- a/recursos/4lavalleja/datos/4lavalleja.py +++ b/recursos/4lavalleja/datos/4lavalleja.py @@ -15,8 +15,8 @@ STATES = [ CITIES = [ (_('Minas'), 201, 689, 1, 0, 14), - (_('Batlle y Ordoñez'), 269, 164, 2, 0, -12), - (_('J. P. Varela'), 572, 155, 2, 0, 14), + (_('José Batlle y Ordóñez'), 269, 164, 2, 0, -12), + (_('José Pedro Varela'), 572, 155, 2, 0, 14), (_('Pirarajá'), 433, 330, 2, 0, -14), (_('Polanco'), 248, 397, 2, 0, -14), (_('Gaetán'), 135, 498, 2, 12, -14), diff --git a/recursos/4lavalleja/datos/levels.py b/recursos/4lavalleja/datos/levels.py index aee2319..4ecdfc4 100644 --- a/recursos/4lavalleja/datos/levels.py +++ b/recursos/4lavalleja/datos/levels.py @@ -24,8 +24,8 @@ LEVEL2 = [ [], [ (_('the city of %s') % _('Minas'), 2, _('Minas'), _("It's the capital of\nthe department")), - (_('the town of %s') % _('Batlle y Ordoñez'), 2, _('Batlle y Ordoñez'), _("It's in the northwest")), - (_('the town of %s') % _('J. P. Varela'), 2, _('J. P. Varela'), _("It's in the northeast")), + (_('the town of %s') % _('José Batlle y Ordóñez'), 2, _('José Batlle y Ordóñez'), _("It's in the northwest")), + (_('the town of %s') % _('José Pedro Varela'), 2, _('José Pedro Varela'), _("It's in the northeast")), (_('the town of %s') % _('Pirarajá'), 2, _('Pirarajá'), _("It's in the north")), (_('the town of %s') % _('Polanco'), 2, _('Polanco'), _("It's in the center")), (_('the town of %s') % _('Gaetán'), 2, _('Gaetán'), _("It's in the west")), diff --git a/recursos/4maldonado/datos/levels.py b/recursos/4maldonado/datos/levels.py index 26a2d9d..8357f0e 100644 --- a/recursos/4maldonado/datos/levels.py +++ b/recursos/4maldonado/datos/levels.py @@ -67,7 +67,7 @@ LEVEL3 = [ (_('the %(m)s') % {'m': _('Cerro del Toro')}, 5, _('Cerro del Toro'), _("It is near %s") % _('Piriápolis')), (_('the %(m)s') % {'m': _('Cerro San Antonio')}, 5, _('Cerro San Antonio'), _("It is near %s") % _('Piriápolis')), (_('the %(m)s') % {'m': _('Cerro Pan de Azúcar')}, 5, _('Cerro Pan de Azúcar'), _("It's in the south")), - (_('the %(m)s') % {'m': _('Cerro Catedral')}, 5, _('Cerro Catedral'), _("It's the highest of Uruguay")) + (_('the %(m)s') % {'m': _('Cerro Catedral')}, 5, _('Cerro Catedral'), _("It's the highest in Uruguay")) ] ] diff --git a/recursos/4montevideo/datos/4montevideo.py b/recursos/4montevideo/datos/4montevideo.py index 04593b2..c2a7cbd 100644 --- a/recursos/4montevideo/datos/4montevideo.py +++ b/recursos/4montevideo/datos/4montevideo.py @@ -89,14 +89,14 @@ ROUTES = [ (_('8 de Octubre'), 244, 559, 579, 45), (_('Belloni'), 243, 584, 412, 90), (_('Mendoza'), 242, 500, 352, 90), - (_('Gral. Flores'), 241, 527, 550, 60), + (_('General Flores'), 241, 527, 550, 60), (_('Propios'), 240, 489, 530, -40), (_('Instrucciones'), 239, 485, 457, 47), (_('Agraciada'), 238, 444, 570, -50), (_('Garzón'), 237, 416, 420, -90), (_('Accesos'), 236, 392, 576, 0), - (_('Ruta 1'), 235, 202, 513, -40), - (_('Ruta 5'), 234, 309, 410, -70), + (_('Route %s') % 1, 235, 202, 513, -40), + (_('Route %s') % 5, 234, 309, 410, -70), (_('Luis Batlle Berres'), 233, 253, 456, -35), (_('Camino Sanguinetti'), 232, 120, 475, 50), (_('Camino Tomkinson'), 231, 265, 552, 35), diff --git a/recursos/4montevideo/datos/levels.py b/recursos/4montevideo/datos/levels.py index 2c3add4..08d78ea 100644 --- a/recursos/4montevideo/datos/levels.py +++ b/recursos/4montevideo/datos/levels.py @@ -59,10 +59,10 @@ LEVEL2 = [ (_('the second highest\npoint in the department'), 2, _('Cerrito de la Victoria'), _('It is a popular neighborhood')), (_('the stream that borders with Canelones'), 3, _('Arroyo Carrasco'), _('Flows into the %s') % _('Río de la Plata')), (_('the neighborhood where\nthe city was originally\nfounded in San Felipe\nand Santiago of Montevideo'), 2, _('Ciudad Vieja'), _('It is on the bay')), - (_('the neighborhood where\nthey operated railway\nworkshops'), 2, _('Peñarol'), _('An important football\nteam named after him')), + (_('the neighborhood where\nthey operated railway\nworkshops'), 2, _('Peñarol'), _('An important football\nteam is named after him')), (_('The neighborhood is\nnamed after the area\nwhere there were\nnumerous water wells'), 2, _('Aguada'), _('It is currently\nlocated where the \nLegislative Palace')), (_('the beach where\nattending washerwomen\ndoing laundry wells'), 2, _('Pocitos'), _('It is a very busy beach')), - (_('the neighborhood\nfrom where the parade of Llamadas start'), 2, _('Sur'), _("It's in the south")), + (_('the neighborhood where\nthe parade of Llamadas starts'), 2, _('Sur'), _("It's in the south")), (_('where is the\n"World Football Monument"'), 2, _('Parque Batlle'), _('The "World Soccer\nMonument" is the\nEstadio Centenario')), (_('the river that supplies\ndrinking water to\nthe department of\nMontevideo'), 3, _('Río Santa Lucía'), _("It's on the border\nwith %s") % _('San José')) ] @@ -122,8 +122,8 @@ LEVEL5 = [ (_("the %s Avenue") % _('Agraciada'), 6, _('Agraciada'), _('Try again')), (_("the %s Avenue") % _('Garzón'), 6, _('Garzón'), _('Try again')), (_('los Accesos de las\nRutas 1 y 5'), 6, _('Accesos'), _('Try again')), - (_('Ruta 1'), 6, _('Ruta 1'), _('Try again')), - (_('Ruta 5'), 6, _('Ruta 5'), _('Try again')), + (_('Route %s') % 1, 6, _('Route %s') % 1, _('Try again')), + (_('Route %s') % 5, 6, _('Route %s') % 5, _('Try again')), (_("the %s Avenue") % _('Luis Batlle Berres'), 6, _('Luis Batlle Berres'), _('Try again')), (_('Camino Sanguinetti'), 6, _('Camino Sanguinetti'), _('Try again')), (_('Camino Tomkinson'), 6, _('Camino Tomkinson'), _('Try again')), |