summaryrefslogtreecommitdiff
path: root/langpacks/spanish
diff options
context:
space:
mode:
authorKirill Volinsky <mataes2007@gmail.com>2017-08-22 22:57:30 +0300
committerKirill Volinsky <mataes2007@gmail.com>2017-08-22 22:57:30 +0300
commit5cd3afbd509c515604921b2713960fb25b5bce73 (patch)
tree378ad602ca789af385da06a442d64b67bf1b96a3 /langpacks/spanish
parentf29a8526f837b9f8bf04be88a619d536256b4b99 (diff)
parentd3ba3219acc0b3bde46efee9658f36938500ecf6 (diff)
Merge branch 'master' of https://github.com/miranda-ng/miranda-ng
Diffstat (limited to 'langpacks/spanish')
-rw-r--r--langpacks/spanish/=CORE=.txt4
-rw-r--r--langpacks/spanish/Plugins/Jabber.txt2
-rw-r--r--langpacks/spanish/Plugins/Omegle.txt2
-rw-r--r--langpacks/spanish/Plugins/Tox.txt2
-rw-r--r--langpacks/spanish/Plugins/VKontakte.txt2
-rw-r--r--langpacks/spanish/Untranslated/=CORE=.txt2
-rw-r--r--langpacks/spanish/Untranslated/Jabber.txt1
-rw-r--r--langpacks/spanish/Untranslated/UInfoEx.txt2
8 files changed, 6 insertions, 11 deletions
diff --git a/langpacks/spanish/=CORE=.txt b/langpacks/spanish/=CORE=.txt
index 6198ff6ff9..5ea013e64a 100644
--- a/langpacks/spanish/=CORE=.txt
+++ b/langpacks/spanish/=CORE=.txt
@@ -785,8 +785,6 @@ Aquí usted puede agregar contactos a su lista de contactos
Configure las opciones de Miranda NG
[Apply]
Aplicar
-[Switch to simple options]
-Cambiar a opciones sencillas
[Please select a subentry from the list]
Por favor seleccione una subentrada de la lista
[Install database settings]
@@ -2059,8 +2057,6 @@ Error escribiendo archivo
Personalizar
[Sample text]
Texto de ejemplo
-[Fonts]
-Fuentes
[Headers]
Cabeceras
[Generic text]
diff --git a/langpacks/spanish/Plugins/Jabber.txt b/langpacks/spanish/Plugins/Jabber.txt
index add112f584..fb5b743533 100644
--- a/langpacks/spanish/Plugins/Jabber.txt
+++ b/langpacks/spanish/Plugins/Jabber.txt
@@ -2,7 +2,7 @@
;============================================================
; File: Jabber.dll
; Plugin: Jabber protocol
-; Version: 0.11.0.4
+; Version: 0.11.0.5
; Authors: George Hazan, Maxim Mluhov, Victor Pavlychko, Artem Shpynov, Michael Stepura
;============================================================
[Jabber (XMPP) protocol support for Miranda NG.]
diff --git a/langpacks/spanish/Plugins/Omegle.txt b/langpacks/spanish/Plugins/Omegle.txt
index 0046a27f04..bc9e19850e 100644
--- a/langpacks/spanish/Plugins/Omegle.txt
+++ b/langpacks/spanish/Plugins/Omegle.txt
@@ -2,7 +2,7 @@
;============================================================
; File: Omegle.dll
; Plugin: Omegle protocol
-; Version: 0.1.3.1
+; Version: 0.1.3.2
; Authors: Robert Pösel
;============================================================
[Server:]
diff --git a/langpacks/spanish/Plugins/Tox.txt b/langpacks/spanish/Plugins/Tox.txt
index f62dda16ee..8c7fcaf703 100644
--- a/langpacks/spanish/Plugins/Tox.txt
+++ b/langpacks/spanish/Plugins/Tox.txt
@@ -2,7 +2,7 @@
;============================================================
; File: Tox.dll
; Plugin: Tox protocol
-; Version: 0.11.1.24
+; Version: 0.11.1.25
; Authors: Miranda NG Team
;============================================================
[Name:]
diff --git a/langpacks/spanish/Plugins/VKontakte.txt b/langpacks/spanish/Plugins/VKontakte.txt
index cb0c3b15e9..0d9f817c34 100644
--- a/langpacks/spanish/Plugins/VKontakte.txt
+++ b/langpacks/spanish/Plugins/VKontakte.txt
@@ -2,7 +2,7 @@
;============================================================
; File: VKontakte.dll
; Plugin: VKontakte protocol
-; Version: 0.1.2.21
+; Version: 0.1.2.22
; Authors: Miranda NG Team
;============================================================
[VKontakte protocol support for Miranda NG.]
diff --git a/langpacks/spanish/Untranslated/=CORE=.txt b/langpacks/spanish/Untranslated/=CORE=.txt
index 7b2044911c..82777da7e1 100644
--- a/langpacks/spanish/Untranslated/=CORE=.txt
+++ b/langpacks/spanish/Untranslated/=CORE=.txt
@@ -41,7 +41,7 @@
[Widowed]
[Actively searching]
[In love]
-[It\'s complicated]
+[It's complicated]
[In a civil union]
[&Open chat window]
[Chat log symbols (Webdings)]
diff --git a/langpacks/spanish/Untranslated/Jabber.txt b/langpacks/spanish/Untranslated/Jabber.txt
index 0ebfaa5445..3e79e6e86a 100644
--- a/langpacks/spanish/Untranslated/Jabber.txt
+++ b/langpacks/spanish/Untranslated/Jabber.txt
@@ -665,7 +665,6 @@
[List Editor...]
[No compatible file transfer mechanism exists]
[Protocol is offline or no JID]
-[OMEMO session does not exist yet]
[No valid OMEMO session exists]
[Command completed successfully]
[Error occurred during processing command]
diff --git a/langpacks/spanish/Untranslated/UInfoEx.txt b/langpacks/spanish/Untranslated/UInfoEx.txt
index 59b5aef922..1c13bfe781 100644
--- a/langpacks/spanish/Untranslated/UInfoEx.txt
+++ b/langpacks/spanish/Untranslated/UInfoEx.txt
@@ -434,7 +434,7 @@
[Widowed]
[Actively searching]
[In love]
-[It\'s complicated]
+[It's complicated]
[In a civil union]
[jun.]
[sen.]