From 82c72733ea37b9c9c895964a7a5742e364cc97d1 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 5 Jun 2018 14:04:37 +0300 Subject: merge of lanpack changes --- langpacks/spanish/Untranslated/AutoShutdown.txt | 2 +- langpacks/spanish/Untranslated/LinkList.txt | 2 +- langpacks/spanish/Untranslated/MirLua.txt | 4 ++-- langpacks/spanish/Untranslated/NewXstatusNotify.txt | 6 +++--- langpacks/spanish/Untranslated/Nudge.txt | 6 +++--- langpacks/spanish/Untranslated/Popup.txt | 1 - langpacks/spanish/Untranslated/QuickContacts.txt | 6 +++--- langpacks/spanish/Untranslated/RemovePersonalSettings.txt | 2 +- langpacks/spanish/Untranslated/Scriver.txt | 1 + langpacks/spanish/Untranslated/TabSRMM.txt | 2 +- langpacks/spanish/Untranslated/WhoUsesMyFiles.txt | 8 ++++---- 11 files changed, 20 insertions(+), 20 deletions(-) (limited to 'langpacks/spanish/Untranslated') diff --git a/langpacks/spanish/Untranslated/AutoShutdown.txt b/langpacks/spanish/Untranslated/AutoShutdown.txt index f6645b47da..4b50a55aaf 100644 --- a/langpacks/spanish/Untranslated/AutoShutdown.txt +++ b/langpacks/spanish/Untranslated/AutoShutdown.txt @@ -29,7 +29,6 @@ [&Unpause countdown] [&Pause countdown] [&Cancel countdown] -[AutoShutdown] [Countdown on frame] [Progress bar] [Header] @@ -77,4 +76,5 @@ [Locks the computer. To unlock the computer, you must log in.] [Sets all protocols to offline and closes all RAS connections.] [Automatic shutdown countdown] +[AutoShutdown] [Toggle automatic shutdown] diff --git a/langpacks/spanish/Untranslated/LinkList.txt b/langpacks/spanish/Untranslated/LinkList.txt index 9e7e5e0a8f..6377b20030 100644 --- a/langpacks/spanish/Untranslated/LinkList.txt +++ b/langpacks/spanish/Untranslated/LinkList.txt @@ -40,10 +40,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/spanish/Untranslated/MirLua.txt b/langpacks/spanish/Untranslated/MirLua.txt index 7b2ac4237d..4e8b414b4f 100644 --- a/langpacks/spanish/Untranslated/MirLua.txt +++ b/langpacks/spanish/Untranslated/MirLua.txt @@ -3,11 +3,11 @@ [Scripts] [Popup on script error] [Popup on obsolete methods] -[C libs folder] -[Scripts folder] [Script] [Loaded] [Failed] [Open] [Reload] [Common scripts] +[C libs folder] +[Scripts folder] diff --git a/langpacks/spanish/Untranslated/NewXstatusNotify.txt b/langpacks/spanish/Untranslated/NewXstatusNotify.txt index 8efe9fe76f..c7fe321f27 100644 --- a/langpacks/spanish/Untranslated/NewXstatusNotify.txt +++ b/langpacks/spanish/Untranslated/NewXstatusNotify.txt @@ -70,6 +70,8 @@ [Wave files] [Sound file] [(default sound)] +[Notification enabled] +[Notification disabled] [] [%s is now %s] [%s, %s. %s changed status to %s (was %s)\r\n] @@ -125,10 +127,8 @@ [Extra status message removed] [Enable status notification] [Disable status notification] -[Notification enabled] -[Notification disabled] -[New Status Notify] [Toggle status notification] +[New Status Notify] [This is status message] [This is extra status] [Show available variables] diff --git a/langpacks/spanish/Untranslated/Nudge.txt b/langpacks/spanish/Untranslated/Nudge.txt index cdbf87aca9..7208178c9e 100644 --- a/langpacks/spanish/Untranslated/Nudge.txt +++ b/langpacks/spanish/Untranslated/Nudge.txt @@ -21,14 +21,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] [Window Shaking] diff --git a/langpacks/spanish/Untranslated/Popup.txt b/langpacks/spanish/Untranslated/Popup.txt index 320f7f09d0..5af0813d55 100644 --- a/langpacks/spanish/Untranslated/Popup.txt +++ b/langpacks/spanish/Untranslated/Popup.txt @@ -143,7 +143,6 @@ [Refresh List] [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] -[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/spanish/Untranslated/QuickContacts.txt b/langpacks/spanish/Untranslated/QuickContacts.txt index bce23561c3..589fc27274 100644 --- a/langpacks/spanish/Untranslated/QuickContacts.txt +++ b/langpacks/spanish/Untranslated/QuickContacts.txt @@ -12,12 +12,12 @@ [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 file] [Send URL] [Open user info] [Open history] [Open contact menu] -[Show all contacts] +[Quick Contacts] +[Open dialog] [Quick Contacts...] diff --git a/langpacks/spanish/Untranslated/RemovePersonalSettings.txt b/langpacks/spanish/Untranslated/RemovePersonalSettings.txt index a76bf60aeb..cd989b5de7 100644 --- a/langpacks/spanish/Untranslated/RemovePersonalSettings.txt +++ b/langpacks/spanish/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/spanish/Untranslated/Scriver.txt b/langpacks/spanish/Untranslated/Scriver.txt index ee2c464fb1..f2eb87ac5f 100644 --- a/langpacks/spanish/Untranslated/Scriver.txt +++ b/langpacks/spanish/Untranslated/Scriver.txt @@ -25,6 +25,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] [Enable IEView] [Show time] [Show date] diff --git a/langpacks/spanish/Untranslated/TabSRMM.txt b/langpacks/spanish/Untranslated/TabSRMM.txt index be10aceb67..4de826ebba 100644 --- a/langpacks/spanish/Untranslated/TabSRMM.txt +++ b/langpacks/spanish/Untranslated/TabSRMM.txt @@ -696,7 +696,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] @@ -802,6 +801,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/spanish/Untranslated/WhoUsesMyFiles.txt b/langpacks/spanish/Untranslated/WhoUsesMyFiles.txt index 8fb4de02c8..d4967fec44 100644 --- a/langpacks/spanish/Untranslated/WhoUsesMyFiles.txt +++ b/langpacks/spanish/Untranslated/WhoUsesMyFiles.txt @@ -19,17 +19,17 @@ [Alert computer name with username] [Disabled options will be available in the next version] [Show current connections] +[Popup plugin not found!] +[Common Dialog Error 0x%lx] +[Not implemented yet...] +[Who uses my files] [User] [Access] [Plugin WhoUsesMyFiles requires admin privileges in order to work.] [Error opening file] [Error memory allocation] [Error creating menu] -[Popup plugin not found!] [Enable WUMF popups] [Disable WUMF popups] -[Common Dialog Error 0x%lx] -[Not implemented yet...] [Show connections list] -[Who uses my files] [WUMF: Show connections] -- cgit v1.2.3