diff options
author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-12-15 21:16:26 +0200 |
---|---|---|
committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-12-15 21:16:47 +0200 |
commit | 7c1cd47772ac7a19534770d6e7479f6e907a181c (patch) | |
tree | cb5b5a38cad8f90bca4f0770c0048cca4d1e35a3 /indra/newview/skins/default/xui/es/strings.xml | |
parent | ac54b72974f3d00d0e02fdc5aec86f1e632df76d (diff) | |
parent | 0a873cd95547f003878c6d00d0883ff792f4a865 (diff) |
Merge branch 'master' (DRTVWR-552) into DRTVWR-527-maint
# Conflicts:
# indra/media_plugins/cef/media_plugin_cef.cpp - setOnLoadEndCallback
# indra/newview/llviewerassetstorage.cpp - mAssetCoroCount
Diffstat (limited to 'indra/newview/skins/default/xui/es/strings.xml')
-rw-r--r-- | indra/newview/skins/default/xui/es/strings.xml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml index 7017a7a5ab..e5598978ce 100644 --- a/indra/newview/skins/default/xui/es/strings.xml +++ b/indra/newview/skins/default/xui/es/strings.xml @@ -22,9 +22,6 @@ <string name="StartupInitializingTextureCache"> Iniciando la caché de las texturas... </string> - <string name="StartupInitializingVFS"> - Iniciando VFS... - </string> <string name="StartupRequireDriverUpdate"> Error de inicialización de gráficos. Actualiza tu controlador de gráficos. </string> @@ -65,7 +62,6 @@ Factor LOD: [LOD_FACTOR] Calidad de renderización: [RENDER_QUALITY] Modelo de iluminación avanzado: [GPU_SHADERS] Memoria de textura: [TEXTURE_MEMORY]MB -VFS (cache) hora de creación: [VFS_TIME] </string> <string name="AboutOSXHiDPI"> Modo de visualización HiDPi: [HIDPI] |