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/serbian/Untranslated/AutoShutdown.txt | 2 +- langpacks/serbian/Untranslated/LinkList.txt | 2 +- langpacks/serbian/Untranslated/MirLua.txt | 6 +++--- langpacks/serbian/Untranslated/NewXstatusNotify.txt | 6 +++--- langpacks/serbian/Untranslated/Nudge.txt | 6 +++--- langpacks/serbian/Untranslated/Popup.txt | 1 - langpacks/serbian/Untranslated/QuickContacts.txt | 8 ++++---- langpacks/serbian/Untranslated/RemovePersonalSettings.txt | 2 +- langpacks/serbian/Untranslated/Scriver.txt | 1 + langpacks/serbian/Untranslated/TabSRMM.txt | 2 +- langpacks/serbian/Untranslated/WhoUsesMyFiles.txt | 10 +++++----- 11 files changed, 23 insertions(+), 23 deletions(-) (limited to 'langpacks/serbian/Untranslated') diff --git a/langpacks/serbian/Untranslated/AutoShutdown.txt b/langpacks/serbian/Untranslated/AutoShutdown.txt index 02c15a97ea..0ab1a0ff9d 100644 --- a/langpacks/serbian/Untranslated/AutoShutdown.txt +++ b/langpacks/serbian/Untranslated/AutoShutdown.txt @@ -29,7 +29,6 @@ [&Unpause countdown] [&Pause countdown] [&Cancel countdown] -[AutoShutdown] [Countdown on frame] [Progress bar] [Header] @@ -77,5 +76,6 @@ [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] [Main] diff --git a/langpacks/serbian/Untranslated/LinkList.txt b/langpacks/serbian/Untranslated/LinkList.txt index 9edbec3ede..543be65128 100644 --- a/langpacks/serbian/Untranslated/LinkList.txt +++ b/langpacks/serbian/Untranslated/LinkList.txt @@ -43,10 +43,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/serbian/Untranslated/MirLua.txt b/langpacks/serbian/Untranslated/MirLua.txt index f56b24422d..22dce1542c 100644 --- a/langpacks/serbian/Untranslated/MirLua.txt +++ b/langpacks/serbian/Untranslated/MirLua.txt @@ -3,12 +3,12 @@ [Scripts] [Popup on script error] [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/serbian/Untranslated/NewXstatusNotify.txt b/langpacks/serbian/Untranslated/NewXstatusNotify.txt index e9988c4cf9..89f2316451 100644 --- a/langpacks/serbian/Untranslated/NewXstatusNotify.txt +++ b/langpacks/serbian/Untranslated/NewXstatusNotify.txt @@ -82,6 +82,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] @@ -137,10 +139,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/serbian/Untranslated/Nudge.txt b/langpacks/serbian/Untranslated/Nudge.txt index 80376d6120..e3cc4350f6 100644 --- a/langpacks/serbian/Untranslated/Nudge.txt +++ b/langpacks/serbian/Untranslated/Nudge.txt @@ -23,14 +23,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/serbian/Untranslated/Popup.txt b/langpacks/serbian/Untranslated/Popup.txt index 09444cc24b..598e8de899 100644 --- a/langpacks/serbian/Untranslated/Popup.txt +++ b/langpacks/serbian/Untranslated/Popup.txt @@ -157,7 +157,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/serbian/Untranslated/QuickContacts.txt b/langpacks/serbian/Untranslated/QuickContacts.txt index cb60a2f239..c5fbc5fd30 100644 --- a/langpacks/serbian/Untranslated/QuickContacts.txt +++ b/langpacks/serbian/Untranslated/QuickContacts.txt @@ -12,13 +12,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/serbian/Untranslated/RemovePersonalSettings.txt b/langpacks/serbian/Untranslated/RemovePersonalSettings.txt index a76bf60aeb..cd989b5de7 100644 --- a/langpacks/serbian/Untranslated/RemovePersonalSettings.txt +++ b/langpacks/serbian/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/serbian/Untranslated/Scriver.txt b/langpacks/serbian/Untranslated/Scriver.txt index 1a6b707b3d..2822ebe1d3 100644 --- a/langpacks/serbian/Untranslated/Scriver.txt +++ b/langpacks/serbian/Untranslated/Scriver.txt @@ -26,6 +26,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/serbian/Untranslated/TabSRMM.txt b/langpacks/serbian/Untranslated/TabSRMM.txt index 35d09106fe..ee727977ec 100644 --- a/langpacks/serbian/Untranslated/TabSRMM.txt +++ b/langpacks/serbian/Untranslated/TabSRMM.txt @@ -717,7 +717,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] @@ -823,6 +822,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/serbian/Untranslated/WhoUsesMyFiles.txt b/langpacks/serbian/Untranslated/WhoUsesMyFiles.txt index 89c584afe5..4dc03609ab 100644 --- a/langpacks/serbian/Untranslated/WhoUsesMyFiles.txt +++ b/langpacks/serbian/Untranslated/WhoUsesMyFiles.txt @@ -19,18 +19,18 @@ [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] +[Services] [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] -[Services] [WUMF: Show connections] -- cgit v1.2.3