langpacks: update

5 files changed, 8 insertions, 6 deletions

diff --git a/langpacks/spanish/Untranslated/BasicHistory.txt b/langpacks/spanish/Untranslated/BasicHistory.txt
index 5d90faaa78..77e719b79d 100644
--- a/langpacks/spanish/Untranslated/BasicHistory.txt
+++ b/langpacks/spanish/Untranslated/BasicHistory.txt
@@ -128,7 +128,7 @@
 [Invalid codepage]

 [Browse CSS file]

 [Export and Delete]

-[Import and Marge]

+[Import and Merge]

 [Minute]

 [Hour]

 [At Start]

diff --git a/langpacks/spanish/Untranslated/ICQ.txt b/langpacks/spanish/Untranslated/ICQ.txt
index 6afe288470..0d8529e909 100644
--- a/langpacks/spanish/Untranslated/ICQ.txt
+++ b/langpacks/spanish/Untranslated/ICQ.txt
@@ -176,7 +176,6 @@
 [The password does not match your current password. Check Caps Lock and try again.]

 [Change ICQ Details]

 [The password does not match the password you originally entered. Check Caps Lock and try again.]

-[The ICQ server does not support passwords longer than 8 characters. Please use a shorter password.]

 [<unremovable once applied>]

 [<empty>]

 [Unknown value]

diff --git a/langpacks/spanish/Untranslated/StatusManager.txt b/langpacks/spanish/Untranslated/StatusManager.txt
index c88127ccef..38b8df02fa 100644
--- a/langpacks/spanish/Untranslated/StatusManager.txt
+++ b/langpacks/spanish/Untranslated/StatusManager.txt
@@ -19,5 +19,5 @@
 [No internet connection seems available... (next retry (%d) in %d s)]
 [Status was set ok]
 [Giving up]
-[Basic]
 [You broke the Internet!]
+[Basic]
diff --git a/langpacks/spanish/Untranslated/StopSpam.txt b/langpacks/spanish/Untranslated/StopSpam.txt
index 33f066be52..8735aaed04 100644
--- a/langpacks/spanish/Untranslated/StopSpam.txt
+++ b/langpacks/spanish/Untranslated/StopSpam.txt
@@ -14,8 +14,11 @@
 [Answer is not case sensitive]

 [Remove all temporary contacts after restart]

 [Log Spammers to system history]

-[No more spam! Robots can't go! Only human beings invited!\r\n\r\nThis plugin works pretty simple:\r\nWhile messages from users on your contact list go as there is no any anti-spam software, messages from unknown users are not delivered to you. But also they are not ignored, this plugin replies with a simple question, and if user gives the right answer, plugin adds him to your contact list so that he can contact you.]

 [StopSpam automatic message:\r\n]

+[No more spam! Robots can't go! Only human beings invited!\r\n\r\nThis plugin works pretty simple:\r\nWhile messages from users on your contact list go as there is no any anti-spam software, messages from unknown users are not delivered to you. But also they are not ignored, this plugin replies with a simple question, and if user gives the right answer, plugin adds him to your contact list so that he can contact you.]

 [Not In List]

+[Spammers made me to install small anti-spam system you are now speaking with. Please reply "nospam" without quotes and spaces if you want to contact me.]

+[StopSpam: send a message and reply to an anti-spam bot question.]

+[Congratulations! You just passed human/robot test. Now you can write me a message.]

 [StopSpam]

 [Remove Temporary Contacts]

diff --git a/langpacks/spanish/Untranslated/StopSpamMod.txt b/langpacks/spanish/Untranslated/StopSpamMod.txt
index 0b69020690..a32b49e906 100644
--- a/langpacks/spanish/Untranslated/StopSpamMod.txt
+++ b/langpacks/spanish/Untranslated/StopSpamMod.txt
@@ -34,7 +34,7 @@
 [StopSpam Logs]

 [Remove Temporary Contacts]

 [No more spam! Robots can't go! Only human beings invited!\r\n\r\nThis plugin works pretty simple:\r\nWhile messages from users on your contact list go as there is no any anti-spam software, messages from unknown users are not delivered to you. But also they are not ignored, this plugin replies with a simple question, and if user gives the right answer, plugin adds him to your contact list so that he can contact you.]

-[Spammers made me to install small anti-spam system you are now speaking with.\r\nPlease reply "nospam" without quotes and spaces if you want to contact me.]

-[StopSpam: send a message and reply to an anti-spam bot question.]

+[Spammers made me to install small anti-spam system you are now speaking with. Please reply "nospam" without quotes and spaces if you want to contact me.]

 [Congratulations! You just passed human/robot test. Now you can write me a message.]

+[StopSpam: send a message and reply to an anti-spam bot question.]

 [If math expression is turned on, you can use following expression in message text:\nXX+XX-X/X*X\neach X will be replaced by one random number and answer will be expression result.\nMessage must contain only one expression without spaces.]