use new system of rivers in soriano

2 files changed, 48 insertions, 48 deletions

diff --git a/recursos/4soriano/datos/4soriano.py b/recursos/4soriano/datos/4soriano.py
index 271fa4d..e17eaf9 100644
--- a/recursos/4soriano/datos/4soriano.py
+++ b/recursos/4soriano/datos/4soriano.py
@@ -35,28 +35,28 @@ RIVERS = [
     (_('Río de la Plata'), 253, 117, 847, -60),
     (_('Río Negro'), 252, 396, 144, -10),
     (_('Río San Salvador'), 251, 195, 538, -45),
-    (_('A. de Espinillo'), 250, 127, 551, -35),
-    (_('A. del Sauce'), 249, 113, 690, 15),
-    (_('A. Bizcocho'), 248, 195, 418, 5),
-    (_('A. Magallanes'), 247, 225, 468, 0),
-    (_('A. del Águila'), 246, 276, 506, 20),
-    (_('A. del Corralito'), 245, 332, 535, 15),
-    (_('A. Maciel'), 244, 377, 604, 0),
-    (_('A. San Martín'), 243, 455, 623, 35),
-    (_('A. del Medio'), 242, 495, 660, 0),
-    (_('A. de las Maulas'), 239, 210, 366, -5),
-    (_('A. Bequeló'), 238, 339, 301, -35),
-    (_('A. Coquimbo'), 237, 395, 420, -70),
-    (_('A. Sarandí'), 236, 323, 363, 90),
-    (_('A. Caballudo'), 233, 452, 336, -10),
-    (_('A. Maia'), 232, 320, 250, -45),
-    (_('A. Cololó'), 231, 446, 257, -55),
-    (_('A. Perico'), 229, 486, 228, -75),
-    (_('A. de Vera'), 228, 523, 222, -80),
-    (_('A. Grande'), 227, 669, 316, 55),
-    (_('A. del Perdido'), 224, 628, 599, 80),
-    (_('A. del Durazno'), 223, 575, 560, 75),
-    (_('A. Monzón'), 221, 665, 655, 60)
+    (_('de Espinillo'), 250, 127, 551, -35),
+    (_('del Sauce'), 249, 113, 690, 15),
+    (_('Bizcocho'), 248, 195, 418, 5),
+    (_('Magallanes'), 247, 225, 468, 0),
+    (_('del Águila'), 246, 276, 506, 20),
+    (_('del Corralito'), 245, 332, 535, 15),
+    (_('Maciel'), 244, 377, 604, 0),
+    (_('San Martín'), 243, 455, 623, 35),
+    (_('del Medio'), 242, 495, 660, 0),
+    (_('de las Maulas'), 239, 210, 366, -5),
+    (_('Bequeló'), 238, 339, 301, -35),
+    (_('Coquimbo'), 237, 395, 420, -70),
+    (_('Sarandí'), 236, 323, 363, 90),
+    (_('Caballudo'), 233, 452, 336, -10),
+    (_('Maia'), 232, 320, 250, -45),
+    (_('Cololó'), 231, 446, 257, -55),
+    (_('Perico'), 229, 486, 228, -75),
+    (_('de Vera'), 228, 523, 222, -80),
+    (_('Grande'), 227, 669, 316, 55),
+    (_('del Perdido'), 224, 628, 599, 80),
+    (_('del Durazno'), 223, 575, 560, 75),
+    (_('Monzón'), 221, 665, 655, 60)
 ]
 
 CUCHILLAS = [
diff --git a/recursos/4soriano/datos/levels.py b/recursos/4soriano/datos/levels.py
index d239232..a823f5b 100644
--- a/recursos/4soriano/datos/levels.py
+++ b/recursos/4soriano/datos/levels.py
@@ -11,11 +11,11 @@ LEVEL2 = [
     (_('the city of %s') % _('Mercedes'), 1, _('Mercedes'), _("It's the capital of\nthe department")),
     (_('the town of %s') % _('Sacachispas'), 2, _('Sacachispas'), _("It's in the north")),
     (_('the town of %s') % _('El Tala'), 2, _('El Tala'), _("It's in the northeast")),
-    (_('the city of %s') % _('Palmitas'), 2, _('Palmitas'), _('Está en el centro')),
+    (_('the city of %s') % _('Palmitas'), 2, _('Palmitas'), _("It's in the center")),
     (_('the town of %s') % _('Colonia Concordia'), 2, _('Colonia Concordia'), _("It's in the west")),
-    (_('the town of %s') % _('Egaña'), 2, _('Egaña'), _('Está en el centro')),
-    (_('the town of %s') % _('Risso'), 2, _('Risso'), _('Está en el centro')),
-    (_('the town of %s') % _('Rodó'), 2, _('Rodó'), _('Está en el centro')),
+    (_('the town of %s') % _('Egaña'), 2, _('Egaña'), _("It's in the center")),
+    (_('the town of %s') % _('Risso'), 2, _('Risso'), _("It's in the center")),
+    (_('the town of %s') % _('Rodó'), 2, _('Rodó'), _("It's in the center")),
     (_('the town of %s') % _('Perseverano'), 2, _('Perseverano'), _("It's in the south")),
     (_('the town of %s') % _('Castillo'), 2, _('Castillo'), _("It's in the south")),
     (_('the town of %s') % _('Cuch. del Perdido'), 2, _('Cuch. del Perdido'), _("It's in the southeast")),
@@ -36,28 +36,28 @@ LEVEL3 = [
     (_('the %s') % _('Río de la Plata'), 3, _('Río de la Plata'), _("It's in the southwest")),
     (_('the %s') % _('Río Negro'), 3, _('Río Negro'), _("It's in the north")),
     (_('the %s') % _('Río San Salvador'), 3, _('Río San Salvador'), _("It's in the south")),
-    (_('the %s') % _('Arroyo de Espinillo'), 3, _('A. de Espinillo'), _("It's in the southwest")),
-    (_('the %s') % _('Arroyo del Sauce'), 3, _('A. del Sauce'), _("It's in the southwest")),
-    (_('the %s') % _('Arroyo Bizcocho'), 3, _('A. Bizcocho'), _("It's in the west")),
-    (_('the %s') % _('Arroyo Magallanes'), 3, _('A. Magallanes'), _("It's in the west")),
-    (_('the %s') % _('Arroyo del Águila'), 3, _('A. del Águila'), _("It's in the southwest")),
-    (_('the %s') % _('Arroyo del Corralito'), 3, _('A. del Corralito'), _("It's in the southwest")),
-    (_('the %s') % _('Arroyo Maciel'), 3, _('A. Maciel'), _("It's in the south")),
-    (_('the %s') % _('Arroyo San Martín'), 3, _('A. San Martín'), _("It's in the south")),
-    (_('the %s') % _('Arroyo del Medio'), 3, _('A. del Medio'), _("It's in the south")),
-    (_('the %s') % _('Arroyo de las Maulas'), 3, _('A. de las Maulas'), _("It's in the west")),
-    (_('the %s') % _('Arroyo Bequeló'), 3, _('A. Bequeló'), _('Está en el centro')),
-    (_('the %s') % _('Arroyo Coquimbo'), 3, _('A. Coquimbo'), _('Está en el centro')),
-    (_('the %s') % _('Arroyo Sarandí'), 3, _('A. Sarandí'), _('Está en el centro')),
-    (_('the %s') % _('Arroyo Caballudo'), 3, _('A. Caballudo'), _('Está en el centro')),
-    (_('the %s') % _('Arroyo Maia'), 3, _('A. Maia'), _("It's in the north")),
-    (_('the %s') % _('Arroyo Cololó'), 3, _('A. Cololó'), _("It's in the north")),
-    (_('the %s') % _('Arroyo Perico'), 3, _('A. Perico'), _("It's in the north")),
-    (_('the %s') % _('Arroyo de Vera'), 3, _('A. de Vera'), _("It's in the north")),
-    (_('the %s') % _('Arroyo Grande'), 3, _('A. Grande'), _("It's in the northeast")),
-    (_('the %s') % _('Arroyo del Perdido'), 3, _('A. del Perdido'), _("It's in the southeast")),
-    (_('the %s') % _('Arroyo del Durazno'), 3, _('A. del Durazno'), _("It's in the southeast")),
-    (_('the %s') % _('Arroyo Monzón'), 3, _('A. Monzón'), _("It's in the southeast"))
+    (_('the %s river') % _('de Espinillo'), 3, _('de Espinillo'), _("It's in the southwest")),
+    (_('the %s river') % _('del Sauce'), 3, _('del Sauce'), _("It's in the southwest")),
+    (_('the %s river') % _('Bizcocho'), 3, _('Bizcocho'), _("It's in the west")),
+    (_('the %s river') % _('Magallanes'), 3, _('Magallanes'), _("It's in the west")),
+    (_('the %s river') % _('del Águila'), 3, _('del Águila'), _("It's in the southwest")),
+    (_('the %s river') % _('del Corralito'), 3, _('del Corralito'), _("It's in the southwest")),
+    (_('the %s river') % _('Maciel'), 3, _('Maciel'), _("It's in the south")),
+    (_('the %s river') % _('San Martín'), 3, _('San Martín'), _("It's in the south")),
+    (_('the %s river') % _('del Medio'), 3, _('del Medio'), _("It's in the south")),
+    (_('the %s river') % _('de las Maulas'), 3, _('de las Maulas'), _("It's in the west")),
+    (_('the %s river') % _('Bequeló'), 3, _('Bequeló'), _("It's in the center")),
+    (_('the %s river') % _('Coquimbo'), 3, _('Coquimbo'), _("It's in the center")),
+    (_('the %s river') % _('Sarandí'), 3, _('Sarandí'), _("It's in the center")),
+    (_('the %s river') % _('Caballudo'), 3, _('Caballudo'), _("It's in the center")),
+    (_('the %s river') % _('Maia'), 3, _('Maia'), _("It's in the north")),
+    (_('the %s river') % _('Cololó'), 3, _('Cololó'), _("It's in the north")),
+    (_('the %s river') % _('Perico'), 3, _('Perico'), _("It's in the north")),
+    (_('the %s river') % _('de Vera'), 3, _('de Vera'), _("It's in the north")),
+    (_('the %s river') % _('Grande'), 3, _('Grande'), _("It's in the northeast")),
+    (_('the %s river') % _('del Perdido'), 3, _('del Perdido'), _("It's in the southeast")),
+    (_('the %s river') % _('del Durazno'), 3, _('del Durazno'), _("It's in the southeast")),
+    (_('the %s river') % _('Monzón'), 3, _('Monzón'), _("It's in the southeast"))
 ]
 ]