From d92d07ae3e1386ea822ab712ba0d4aac8f5aa786 Mon Sep 17 00:00:00 2001
From: Juan Miguel Boyero Corral <juanmi1982@gmail.com>
Date: Tue, 22 Nov 2011 22:04:11 +0000
Subject: [PATCH] Fixed merge deficiencies

git-svn-id: https://forja.rediris.es/svn/cusl6-swadroid/trunk@57 5bc14d19-1e4b-4ba2-aa50-860af135f48c
---
 SWADroid/res/values-es/strings.xml | 4 +---
 SWADroid/res/values/strings.xml    | 3 +--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/SWADroid/res/values-es/strings.xml b/SWADroid/res/values-es/strings.xml
index e3f04a95..87ee4ca1 100644
--- a/SWADroid/res/values-es/strings.xml
+++ b/SWADroid/res/values-es/strings.xml
@@ -15,13 +15,11 @@
     <string name="saveMsg_preferences">Configuración guardada</string>
     <string name="saveSummary_preferences">Guarda la configuración actual</string>
     <string name="saveTitle_preferences">Guardar Configuración</string>
-    
     <string name="preferencesTitle_menu">Configuración</string>
     <string name="loginTitle_menu">Conectar</string>
     <string name="loginProgressTitle">Identificación</string>
     <string name="loginProgressDescription">Conectando...</string>
+    <string name="errorMsgWorkaroundEmulator">Mierda. Ese bug del emulador de Android ha vuelto a aparecer. Reintentando...</string>
     <string name="errorMsgLaunchingActivity">Ha ocurrido un error durante la ejecución de la operación</string>
     <string name="upgradeMsg_DB">Actualizando base de datos...</string><string name="errorCopyMsg_DB">Error copiando base de datos</string>
-    <string name="errorMsgLaunchingActivity">Ha ocurrido un error durante la ejecución de la operación</string>
-    <string name="errorMsgWorkaroundEmulator">Mierda. Ese bug del emulador de Android ha vuelto a aparecer. Reintentando...</string>
 </resources>
diff --git a/SWADroid/res/values/strings.xml b/SWADroid/res/values/strings.xml
index 611ac80c..1a122403 100644
--- a/SWADroid/res/values/strings.xml
+++ b/SWADroid/res/values/strings.xml
@@ -15,13 +15,12 @@
     <string name="saveMsg_preferences">Preferences have been saved</string>
     <string name="saveSummary_preferences">Save actual preferences</string>
     <string name="saveTitle_preferences">Save preferences</string>
-    
     <string name="preferencesTitle_menu">Preferences</string>
     <string name="loginTitle_menu">Login</string>
     <string name="loginProgressTitle">Login</string>
     <string name="loginProgressDescription">Connecting...</string>
     <string name="errorMsgLaunchingActivity">An error occurred during the execution of the operation</string>
+    <string name="errorMsgWorkaroundEmulator">Damn. That Android emulator bug appeared again. Retrying...</string>
     <string name="upgradeMsg_DB">Upgrading database...</string>
     <string name="errorCopyMsg_DB">Error copying database</string>
-    <string name="errorMsgWorkaroundEmulator">Damn. That Android emulator bug appeared again. Retrying...</string>
 </resources>