merge of lanpack changes

12 files changed, 31 insertions, 30 deletions

diff --git a/langpacks/croatian/Untranslated/=CORE=.txt b/langpacks/croatian/Untranslated/=CORE=.txt
index 60ac90000f..a3a0350586 100644
--- a/langpacks/croatian/Untranslated/=CORE=.txt
+++ b/langpacks/croatian/Untranslated/=CORE=.txt
@@ -132,6 +132,7 @@
 [Maximum number of flashes]

 [Close the message window on send]

 [Minimize the message window on send]

+[Use the contact's status icon as the window icon]

 [Save the window size and location individually for each contact]

 [Cascade new windows]

 [Support CTRL+Up/Down in message area to show previously sent messages]

@@ -336,9 +337,8 @@
 [Profile]

 [e.g., Workplace]

 [You can select a different database driver from the default, it may offer more features or abilities, if in doubt use the default.]

-[e.g., dbx mmap]

 [Driver]

-[Problem: Unable to find any database drivers, this means you cannot create a new profile, you need to get dbx_mmap.dll]

+[Problem: Unable to find any database drivers, this means you cannot create a new profile, you need to get dbx_mdbx.dll]

 [Download more plugins]

 [Author(s):]

 [Homepage:]

@@ -815,6 +815,7 @@
 [Nick list members (away)]

 [Message typing area]

 [Chat log symbols (Webdings)]

+[&Leave chat]

 [Message is highlighted]

 [User has performed an action]

 [User has kicked some other user]

@@ -822,7 +823,6 @@
 [User has changed name]

 [User has sent a notice]

 [The topic has been changed]

-[&Leave chat]

 [%s wants your attention in %s]

 [%s speaks in %s]

 [%s has joined %s]

@@ -870,7 +870,7 @@
 [Miranda is trying to upgrade your profile structure.\nIt cannot move profile %s to the new location %s\nBecause profile with this name already exists. Please resolve the issue manually.]

 [Miranda is trying to upgrade your profile structure.\nIt cannot move profile %s to the new location %s automatically\nMost likely this is due to insufficient privileges. Please move profile manually.]

 [Profile cannot be placed into Miranda root folder.\nPlease move Miranda profile to some other location.]

-[Miranda is unable to open '%s' because you do not have any profile plugins installed.\nYou need to install dbx_mmap.dll]

+[Miranda is unable to open '%s' because you do not have any profile plugins installed.\nYou need to install dbx_mdbx.dll]

 [Miranda was unable to open '%s', it's in an unknown format.]

 [Miranda was unable to open '%s'\nIt's inaccessible or used by other application or Miranda instance]

 [Miranda was unable to open '%s'\nThere is no suitable database driver installed]

diff --git a/langpacks/croatian/Untranslated/AutoShutdown.txt b/langpacks/croatian/Untranslated/AutoShutdown.txt
index c90614c408..bfc9d05909 100644
--- a/langpacks/croatian/Untranslated/AutoShutdown.txt
+++ b/langpacks/croatian/Untranslated/AutoShutdown.txt
@@ -31,7 +31,6 @@
 [&Unpause countdown]

 [&Pause countdown]

 [&Cancel countdown]

-[AutoShutdown]

 [Countdown on frame]

 [Progress bar]

 [Header]

@@ -83,5 +82,6 @@
 [Sets all protocols to offline and closes all RAS connections.]

 [Alerts]

 [Automatic shutdown countdown]

+[AutoShutdown]

 [Toggle automatic shutdown]

 [Main]

diff --git a/langpacks/croatian/Untranslated/LinkList.txt b/langpacks/croatian/Untranslated/LinkList.txt
index 79d18cb7a9..91c03d9aca 100644
--- a/langpacks/croatian/Untranslated/LinkList.txt
+++ b/langpacks/croatian/Untranslated/LinkList.txt
@@ -55,10 +55,10 @@
 [no filter]

 [Search filter]

 [no settings]

-[&Create Linklist]

 [Processing history...]

 [Could not create window!]

 [Could not allocate memory!]

+[&Create Linklist]

 [Linklist plugin]

 [Matches for searchtext]

 [Processing list...]

diff --git a/langpacks/croatian/Untranslated/MirLua.txt b/langpacks/croatian/Untranslated/MirLua.txt
index 6aadb660ea..c0fce7cd04 100644
--- a/langpacks/croatian/Untranslated/MirLua.txt
+++ b/langpacks/croatian/Untranslated/MirLua.txt
@@ -4,12 +4,12 @@
 [Popup on script error]

 [General]

 [Popup on obsolete methods]

-[Services]

-[C libs folder]

-[Scripts folder]

 [Script]

 [Loaded]

 [Failed]

 [Open]

 [Reload]

 [Common scripts]

+[Services]

+[C libs folder]

+[Scripts folder]

diff --git a/langpacks/croatian/Untranslated/NewXstatusNotify.txt b/langpacks/croatian/Untranslated/NewXstatusNotify.txt
index 41d355a998..780111603d 100644
--- a/langpacks/croatian/Untranslated/NewXstatusNotify.txt
+++ b/langpacks/croatian/Untranslated/NewXstatusNotify.txt
@@ -104,6 +104,8 @@
 [Sound file]

 [** All contacts **]

 [(default sound)]

+[Notification enabled]

+[Notification disabled]

 [<no status message>]

 [Contact]

 [<unknown>]

@@ -162,10 +164,8 @@
 [Extra status message removed]

 [Enable status notification]

 [Disable status notification]

-[Notification enabled]

-[Notification disabled]

-[New Status Notify]

 [Toggle status notification]

+[New Status Notify]

 [Status change]

 [This is status message]

 [This is extra status]

diff --git a/langpacks/croatian/Untranslated/Nudge.txt b/langpacks/croatian/Untranslated/Nudge.txt
index 294e91763a..a3e09f6f0a 100644
--- a/langpacks/croatian/Untranslated/Nudge.txt
+++ b/langpacks/croatian/Untranslated/Nudge.txt
@@ -33,14 +33,14 @@
 [Width of move]

 [Static]

 [Shaking Message Window Options]

+[Nudge as Default]

 [You are not allowed to send too much nudge (only 1 each %d sec, %d sec left)]

+[Show Nudge]

+[Nudge for %s]

 [Nudge]

 [Default Nudge]

-[Nudge as Default]

 [Send nudge]

 [Send &nudge]

-[Show Nudge]

-[Nudge for %s]

 [You received a nudge]

 [You sent a nudge]

 [Events]

diff --git a/langpacks/croatian/Untranslated/Popup.txt b/langpacks/croatian/Untranslated/Popup.txt
index 90b4f9f05e..a97c7c7e2b 100644
--- a/langpacks/croatian/Untranslated/Popup.txt
+++ b/langpacks/croatian/Untranslated/Popup.txt
@@ -183,7 +183,6 @@
 [Failed to GetClassInfoExW from EDIT class.]

 [Failed to register custom edit box window class.\r\n\r\ncbSize: %i\r\nstyle: %p\r\nlpfnWndProc: %i\r\ncbClsExtra: %i\r\ncbWndExtra: %i\r\nhInstance: %i\r\nhIcon: %i\r\nhCursor: %i\r\nhbrBackground: %i\r\nlpszMenuName: %s\r\nlpszClassName: %s\r\nhIconSm: %i\r\n]

 [Notify]

-[The skin you are trying to load is designed\r\nfor newer version of Popup plus. And will not\r\ndisplay properly.\r\n\r\nPlease choose another skin.]

 [Auto]

 [Favorite]

 [Block]

diff --git a/langpacks/croatian/Untranslated/QuickContacts.txt b/langpacks/croatian/Untranslated/QuickContacts.txt
index f16166d889..80194e78a7 100644
--- a/langpacks/croatian/Untranslated/QuickContacts.txt
+++ b/langpacks/croatian/Untranslated/QuickContacts.txt
@@ -13,13 +13,13 @@
 [But keep subcontacts of protocols in above list if meta is hidden]

 [Enter username:]

 [Show all contacts (Ctrl+A)]

-[Quick Contacts]

-[Open dialog]

+[Show all contacts]

+[Send message]

 [Send file]

 [Send URL]

 [Open user info]

 [Open history]

 [Open contact menu]

-[Show all contacts]

+[Quick Contacts]

+[Open dialog]

 [Quick Contacts...]

-[Send message]

diff --git a/langpacks/croatian/Untranslated/RemovePersonalSettings.txt b/langpacks/croatian/Untranslated/RemovePersonalSettings.txt
index a76bf60aeb..cd989b5de7 100644
--- a/langpacks/croatian/Untranslated/RemovePersonalSettings.txt
+++ b/langpacks/croatian/Untranslated/RemovePersonalSettings.txt
@@ -1,6 +1,6 @@
 [Remove personal settings to allow you to send a profile to other user(s) without sending personal data.]

-[Remove Personal Settings...]

 [Configuration file could not be found!]

 [Settings are deleted now.]

+[Remove Personal Settings...]

 [All your personal settings will be erased!\nMake sure you are running this from a copy of your profile (and not over the original one).\nRunning this will erase files/folders under Miranda main folder.\n\nAre you sure you want to remove all your personal settings?\n\n(You cannot say that I don't told you about the risks :P)]

 [Remove Personal Settings]

diff --git a/langpacks/croatian/Untranslated/Scriver.txt b/langpacks/croatian/Untranslated/Scriver.txt
index 77efb62dae..4e0da420b2 100644
--- a/langpacks/croatian/Untranslated/Scriver.txt
+++ b/langpacks/croatian/Untranslated/Scriver.txt
@@ -6,11 +6,12 @@
 [Save size and location for each contact]

 [Minimize on send]

 [Hide windows on close]

-[Send message on 'Enter']

-[Send message on double 'Enter']

 [Remember unsent messages]

 [Delete temporary contacts on closing]

 [Show warning when message has not been received after]

+[Send message on 'Enter']

+[Send message on double 'Enter']

+[Send message on 'Ctrl+Enter']

 [Enable tabs]

 [Always show tab bar]

 [Tabs at the bottom]

@@ -32,6 +33,7 @@
 [inactive]

 [Min input area size]

 [lines]

+[You can use embedded variables here: %name% for contact's name, %status% for its status, %statusmsg% for its status message and %account% for its account's name]

 [Message window event log]

 [Enable IEView]

 [Show icons]

diff --git a/langpacks/croatian/Untranslated/TabSRMM.txt b/langpacks/croatian/Untranslated/TabSRMM.txt
index 6359cfe449..0deafb47f2 100644
--- a/langpacks/croatian/Untranslated/TabSRMM.txt
+++ b/langpacks/croatian/Untranslated/TabSRMM.txt
@@ -831,7 +831,6 @@
 [Advanced layout with avatars]

 [Advanced with avatars, vertical orientation]

 [This version of TabSRMM requires Windows 2000 or later.]

-[TabSRMM message (%s)]

 [Previews not available when using History++ plugin for message log display.]

 [%d unread]

 [Chat room %s]

@@ -943,6 +942,7 @@
 [Force History++]

 [Force IEView]

 [Set messaging options for %s]

+[TabSRMM message (%s)]

 [Important release notes|A test warning message]

 [Icon pack version check|The installed icon pack is outdated and might be incompatible with TabSRMM version 3.\n\n\\b1Missing or misplaced icons are possible issues with the currently installed icon pack.\\b0]

 [Edit user notes|You are editing the user notes. Click the button again or use the hotkey (default: Alt-N) to save the notes and return to normal messaging mode]

diff --git a/langpacks/croatian/Untranslated/WhoUsesMyFiles.txt b/langpacks/croatian/Untranslated/WhoUsesMyFiles.txt
index dddfa95212..9361a265ef 100644
--- a/langpacks/croatian/Untranslated/WhoUsesMyFiles.txt
+++ b/langpacks/croatian/Untranslated/WhoUsesMyFiles.txt
@@ -22,6 +22,12 @@
 [Alert computer name with username]

 [Disabled options will be available in the next version]

 [Show current connections]

+[Popup plugin not found!]

+[Error]

+[Common Dialog Error 0x%lx]

+[Not implemented yet...]

+[Who uses my files]

+[Services]

 [User]

 [File]

 [Access]

@@ -29,14 +35,8 @@
 [Error opening file]

 [Error memory allocation]

 [Error creating menu]

-[Popup plugin not found!]

-[Error]

 [Enable WUMF popups]

 [Disable WUMF popups]

-[Common Dialog Error 0x%lx]

-[Not implemented yet...]

 [Show connections list]

-[Who uses my files]

-[Services]

 [Popups]

 [WUMF: Show connections]