Marown/SWADroid
Marown/SWADroid
1
1
Fork 0
Code Issues 25 Pull Requests Packages Projects Releases 29 Wiki Activity

Fixed merge deficiencies

Browse Source 
git-svn-id: https://forja.rediris.es/svn/cusl6-swadroid/trunk@57 5bc14d19-1e4b-4ba2-aa50-860af135f48c
This commit is contained in:
Juan Miguel Boyero Corral 2011-11-22 22:04:11 +00:00
parent e75464aaa1
commit d92d07ae3e
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SWADroid/res/values-es/strings.xml
View File

@ -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>

3
SWADroid/res/values/strings.xml
View File

@ -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>