diff options
| author | Vadim Dashevskiy <watcherhd@gmail.com> | 2013-01-19 13:50:47 +0000 |
|---|---|---|
| committer | Vadim Dashevskiy <watcherhd@gmail.com> | 2013-01-19 13:50:47 +0000 |
| commit | d6d3e7b429b634b0907940f67a3254e799df3c26 (patch) | |
| tree | cf785d4646439e8a7ddc380c3ec4630448741c3d /langpacks/english/Plugins | |
| parent | 5b06e6394baeb07b10b6f82ae67e95882cd7a52a (diff) | |
- langpacks/english: updated
git-svn-id: http://svn.miranda-ng.org/main/trunk@3168 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'langpacks/english/Plugins')
90 files changed, 136 insertions, 723 deletions
diff --git a/langpacks/english/Plugins/AIM.txt b/langpacks/english/Plugins/AIM.txt index 0c9f6f6b73..0412bdb409 100644 --- a/langpacks/english/Plugins/AIM.txt +++ b/langpacks/english/Plugins/AIM.txt @@ -67,14 +67,6 @@ [&Deny]
[Message]
[Room]
-;file \protocols\AimOscar\src\avatars.cpp
-[.gif]
-[.png]
-[.bmp]
-[.jpg]
-[%%miranda_avatarcache%%\\%s]
-[%miranda_avatarcache%]
-[\\%s]
;file \protocols\AimOscar\src\chat.cpp
[Others]
[&Invite user...]
@@ -153,12 +145,12 @@ [AIM Link Protocol]
;file \protocols\AimOscar\src\popup.cpp
[%s Protocol]
-[ %s]
[Open mail account?]
;file \protocols\AimOscar\src\proto.cpp
[%s server connection]
[%s Client-to-client connection]
;file \protocols\AimOscar\src\server.cpp
+[[Auto-Response]:]
[Contact tried to open an audio/video conference (currently not supported)]
[No information has been provided by the server.]
[Successfully removed buddy from list.]
@@ -172,7 +164,6 @@ [Successfully modified group.]
[Item you want to modify not found in list.]
[Unknown error when attempting to modify a group. Error code %#x]
-[%S@%S (%d)\r\n%s ]
[You've got mail! Checked at]
[Error uploading avatar. (Too small)]
[Error uploading avatar. (Too big)]
@@ -228,6 +219,5 @@ ;file \protocols\AimOscar\src\utility.cpp
[Please, enter a username in the options dialog.]
[Please, enter a password in the options dialog.]
-[%miranda_userdata%]
[Failed to open file: %s %s]
[open]
diff --git a/langpacks/english/Plugins/AVS.txt b/langpacks/english/Plugins/AVS.txt index f471908707..93e219ec41 100644 --- a/langpacks/english/Plugins/AVS.txt +++ b/langpacks/english/Plugins/AVS.txt @@ -45,32 +45,17 @@ [Protocols have different avatars]
;file \plugins\AVS\src\main.cpp
[AVS-HASH-%x]
-[%s@%s]
[SHELLDLL_DefView]
[Grow avatar to fit max allowed protocol size]
-[.png]
-[.jpg]
-[.ico]
-[.bmp]
-[.gif]
-[.swf]
-[.xml]
-[.jpeg]
-[.rle]
[All Files]
[Windows Bitmaps]
-[ (*.bmp;*.rle)]
[JPEG Bitmaps]
-[ (*.jpg;*.jpeg)]
[GIF Bitmaps]
-[ (*.gif)]
[PNG Bitmaps]
-[ (*.png)]
[Flash Animations]
-[ (*.swf)]
[XML Files]
-[ (*.xml)]
[GlobalAvatar]
+[%s\\my_global_avatar%s]
[Set My Avatar]
[Set My Avatar for %s]
[mir_av_]
@@ -84,11 +69,9 @@ [Own Avatars]
[Avatar]
[gdi32]
-[%miranda_userdata%]
[Fatal error, image services not found. Avatar services will be disabled.]
[Avatar Service]
;file \plugins\AVS\src\options.cpp
-[%%miranda_path%%\\%s]
[Set avatar options for %s]
[Delete picture file from disk (may be necessary to force a reload, but will delete local pictures)?]
[Reset contact picture]
diff --git a/langpacks/english/Plugins/Alarms.txt b/langpacks/english/Plugins/Alarms.txt index d44a0f05c6..eca616783e 100644 --- a/langpacks/english/Plugins/Alarms.txt +++ b/langpacks/english/Plugins/Alarms.txt @@ -76,8 +76,6 @@ [Background]
[Window]
;file \plugins\Alarms\src\frame.cpp
-[%dh %dm]
-[%dm]
[Events]
[Hide Reminders]
[Show Reminders]
diff --git a/langpacks/english/Plugins/AssocMgr.txt b/langpacks/english/Plugins/AssocMgr.txt index 12a146dd1e..b98653cfe0 100644 --- a/langpacks/english/Plugins/AssocMgr.txt +++ b/langpacks/english/Plugins/AssocMgr.txt @@ -12,7 +12,6 @@ [&Start Miranda NG automatically when the Computer starts (using current profile)]
[Only associate with Miranda NG while it is &running]
;file \plugins\AssocMgr\src\assoclist.cpp
-[%hs:]
[%hs files]
[Type]
[Description]
@@ -45,10 +44,8 @@ ;file \plugins\AssocMgr\src\reg.cpp
[Access failed:\n%.64hs(%.128s)\n%.250hs(%u)\n%.256hs (%u)]
[Registry Warning]
+["%s" "/profile:%s"]
[rundll32.exe %s,WaitForDDE "/profile:%s"]
-[.exe]
-[.dll]
-[%s,%i]
[Path]
[System]
[Multi User]
diff --git a/langpacks/english/Plugins/AutoRun.txt b/langpacks/english/Plugins/AutoRun.txt index 8fbcf3dd3b..30df877266 100644 --- a/langpacks/english/Plugins/AutoRun.txt +++ b/langpacks/english/Plugins/AutoRun.txt @@ -13,5 +13,6 @@ ;file \plugins\AutoRun\src\autorun.h
[Software\\Microsoft\\Windows\\CurrentVersion\\Run]
;file \plugins\AutoRun\src\main.cpp
+["%s" "/profile:%s"]
[MirandaNG]
[Services]
diff --git a/langpacks/english/Plugins/AutoShutdown.txt b/langpacks/english/Plugins/AutoShutdown.txt index 27fac413a5..547e43783f 100644 --- a/langpacks/english/Plugins/AutoShutdown.txt +++ b/langpacks/english/Plugins/AutoShutdown.txt @@ -54,7 +54,6 @@ [&Unpause Countdown]
[&Pause Countdown]
[&Cancel Countdown]
-[%s %s]
[AutoShutdown]
;file \plugins\AutoShutdown\src\main.cpp
[Header]
@@ -83,7 +82,6 @@ [Software\\Microsoft\\Windows\\CurrentVersion\\Policies\\System]
[DisableLockWorkstation]
[RASAPI32]
-[.DLL]
[Control Panel\\Desktop]
[ScreenSaveActive]
[ScreenSaverIsSecure]
@@ -121,6 +119,5 @@ [Alerts]
[Automatic Shutdown Countdown]
;file \plugins\AutoShutdown\src\utils.cpp
-[ \r\n\t]
[Toggle Automatic Shutdown]
[Main]
diff --git a/langpacks/english/Plugins/AvatarHistory.txt b/langpacks/english/Plugins/AvatarHistory.txt index c346a57813..0c01258597 100644 --- a/langpacks/english/Plugins/AvatarHistory.txt +++ b/langpacks/english/Plugins/AvatarHistory.txt @@ -68,11 +68,11 @@ [Avatar History]
[Contact changed avatar]
[Contact removed avatar]
+[%s\\Avatars History]
[Avatars]
[\\Avatars History]
[Avatar History: Unable to create shortcut]
[AVH Debug: Shortcut created successfully]
-[%s.%s]
[CopyImageFile]
[AVH Debug]
[Invalid contact/avatar... skipping]
@@ -82,11 +82,6 @@ [Hashes are the same... skipping]
[Avatar History: Unable to save avatar]
[AVH Debug: File copied successfully]
-[.png]
-[.bmp]
-[.gif]
-[.jpg]
-[.jpeg]
[Unknown UIN]
[GetHistoryFolder]
[Unknown Protocol]
diff --git a/langpacks/english/Plugins/BasicHistory.txt b/langpacks/english/Plugins/BasicHistory.txt index c8d3b8c689..ab2f68118d 100644 --- a/langpacks/english/Plugins/BasicHistory.txt +++ b/langpacks/english/Plugins/BasicHistory.txt @@ -99,7 +99,6 @@ [%016llx]
;file \plugins\BasicHistory\src\ExportManager.cpp
[%s Files (*.%s)]
-[*.%s]
[Import]
[Export]
[<ext>]
@@ -133,7 +132,6 @@ [File contain history for different contact. Do you want to change contact and import?]
[Error]
[Number of history items to delete: %d.\nAre you sure you want to do this?]
-[\r\n]
;file \plugins\BasicHistory\src\Options.cpp
[Message]
[File transfer]
@@ -180,13 +178,11 @@ [File do not exist. Enter correct file path.]
[Invalid file]
[All Files (*.*)]
-[*.*]
[Enter filter name]
[Filter name exists]
[Event already exists]
[Browse WinSCP file]
[Save WinSCP log file]
-[%d;%s]
[You've entered invalid codepage. Select codepage from combo box or enter correct number.]
[Invalid codepage]
[Browse CSS file]
@@ -236,23 +232,18 @@ [.mes#event1 { background-color: #EEEEEE; }\n]
[.mes#event2 { background-color: #CCD9F4; }\n]
[.mes#session { background-color: #FFFDD7; }\n]
-[) - ]
-[ - ]
[)</h3>\n]
[<h6>]
[Filter:]
[Conversation started at %s]
[out]
[inc]
-[>\n]
[\n</div>\n]
;file \plugins\BasicHistory\src\RichHtmlExport.cpp
-[&<>\t\r\n]
[&]
[<]
[>]
[<br>]
-['" []<>\r\n]
[<link rel="Stylesheet" href="]
[\\history.css" type="text/css">\n]
[<script type="text/javascript" src="]
@@ -272,6 +263,7 @@ [.ico" class=sessionimage width="16" height="16" onclick="toggleFolder('group]
[', this)"/></span>\n]
[.ico" class=sessionimage width="16" height="16"/></div>\n]
+[" alt="]
;file \plugins\BasicHistory\src\Scheduler.cpp
[History task]
[Contacts]
@@ -292,14 +284,14 @@ [Cannot compress file(s).]
[Cannot send FTP file(s).]
[<contact>]
-[%d-%02d-%02d %02d%02d]
[Task finished]
[Task '%s' execution failed]
[Task '%s' finished successfully]
+["%s" /nointeractiveinput /log="%s" /script=script.sc]
[Task '%s' execution failed:]
;file \plugins\BasicHistory\src\Searcher.cpp
+["%s" not found]
[Search]
[You have reached the end of the group.]
[You have reached the end of the history.]
;file \plugins\BasicHistory\src\TxtExport.cpp
-[)\n]
diff --git a/langpacks/english/Plugins/Boltun.txt b/langpacks/english/Plugins/Boltun.txt index f200209016..8c1ed0b098 100644 --- a/langpacks/english/Plugins/Boltun.txt +++ b/langpacks/english/Plugins/Boltun.txt @@ -31,7 +31,6 @@ [%s (*.mindw)\1*.mindw\1%s (*.*)\1*.*\1]
[SMILES]
;file \plugins\Boltun\src\boltun.h
-[boltun.mindw]
[Mind Files]
[All Files]
[Hello. I'm Boltun! I'll talk to you, while my owner is away. Please write without mistakes!]
@@ -64,7 +63,6 @@ [(repeat_norm) ]
[(repeat_silence)]
[(widelyused_all) ]
-[.?!]
[BEST(0)]
[LOOKSLIKE(1)]
[BAD(2)]
diff --git a/langpacks/english/Plugins/BossKey.txt b/langpacks/english/Plugins/BossKey.txt index bcddbc0e96..4b3355e77c 100644 --- a/langpacks/english/Plugins/BossKey.txt +++ b/langpacks/english/Plugins/BossKey.txt @@ -44,7 +44,6 @@ [Alt + ]
[Win + ]
[Hide Miranda NG]
-[%s [%s]]
[Hide]
[Hide/Show Miranda]
[bosskeyname]
diff --git a/langpacks/english/Plugins/BuddyExpectator.txt b/langpacks/english/Plugins/BuddyExpectator.txt index f9185fad22..7558be78ef 100644 --- a/langpacks/english/Plugins/BuddyExpectator.txt +++ b/langpacks/english/Plugins/BuddyExpectator.txt @@ -45,7 +45,6 @@ [NeverHide]
[Hiding %s (%S)]
[%d days since last message]
-[%s %s]
[Disable Miss You]
[You awaited this contact!]
[has gone online for the first time.]
diff --git a/langpacks/english/Plugins/ChangeKeyboardLayout.txt b/langpacks/english/Plugins/ChangeKeyboardLayout.txt index c5607be31c..0c68e70f8b 100644 --- a/langpacks/english/Plugins/ChangeKeyboardLayout.txt +++ b/langpacks/english/Plugins/ChangeKeyboardLayout.txt @@ -48,8 +48,5 @@ [PopUps]
;file \plugins\ChangeKeyboardLayout\src\main.cpp
[`1234567890- = \\qwertyuiop[]asdfghjkl;'zxcvbnm,./~!@#$%^&*()_+|QWERTYUIOP{}ASDFGHJKL:"ZXCVBNM<>?]
-[ \t\n\r]
;file \plugins\ChangeKeyboardLayout\src\options.cpp
[Ghbdtn? rfr ltkf&]
-;file \plugins\ChangeKeyboardLayout\src\text_operations.cpp
-[\n\n]
diff --git a/langpacks/english/Plugins/ClientChangeNotify.txt b/langpacks/english/Plugins/ClientChangeNotify.txt index 4f24cf5750..68d621630f 100644 --- a/langpacks/english/Plugins/ClientChangeNotify.txt +++ b/langpacks/english/Plugins/ClientChangeNotify.txt @@ -34,6 +34,7 @@ [static]
[changed client to %s (was %s)]
[changed client to %s]
+[Miranda NG ICQ 0.93.5.3007]
[%s (was %s)]
[) changed client to ]
[Client change notifications:]
@@ -46,6 +47,7 @@ [PopUps]
[ClientChangeNotify: Client changed]
[ClientChangeNotify]
+[ClientChangeNotify?puts(p,?dbsetting(%subject%,Protocol,p))?if2(_?dbsetting(,?get(p),?pinfo(?get(p),uidsetting)),).log]
[`[`!cdate()-!ctime()`]` ?cinfo(%subject%,display) (?cinfo(%subject%,id)) changed client to %extratext%]
;file \plugins\ClientChangeNotify\src\Misc.h
[open]
diff --git a/langpacks/english/Plugins/Clist_blind.txt b/langpacks/english/Plugins/Clist_blind.txt index fbea1f03a8..1d9c68edd9 100644 --- a/langpacks/english/Plugins/Clist_blind.txt +++ b/langpacks/english/Plugins/Clist_blind.txt @@ -114,7 +114,6 @@ [Invisible]
[Out to lunch]
[On the phone]
-[%name% [%status% %protocol%] %status_message%]
[Group: %name% %count% [%mode%]]
[Divider: %s]
[Info: %s]
@@ -124,11 +123,5 @@ ;file \plugins\Clist_blind\src\cluiopts.cpp
;file \plugins\Clist_blind\src\init.cpp
[Unknown Protocol]
-[%name%]
-[%count%]
-[%mode%]
[Expanded]
[Colapsed]
-[%status%]
-[%protocol%]
-[%status_message%]
diff --git a/langpacks/english/Plugins/Clist_modern.txt b/langpacks/english/Plugins/Clist_modern.txt index 7de5e06291..4cf5050d66 100644 --- a/langpacks/english/Plugins/Clist_modern.txt +++ b/langpacks/english/Plugins/Clist_modern.txt @@ -331,9 +331,6 @@ [&Delete Group]
;file \plugins\Clist_modern\src\modern_aniavatars.cpp
[MirandaModernAniAvatar]
-;file \plugins\Clist_modern\src\modern_cachefuncs.cpp
-[%s: %s]
-[%s - %s]
;file \plugins\Clist_modern\src\modern_clc.cpp
[Contact List/Avatar Overlay]
[Contact List/Status Overlay]
@@ -349,8 +346,6 @@ [Do You want contact '%s' to be removed from MetaContact '%s' and added to '%s'?]
[Changing MetaContacts (Moving)]
[Do You want contact '%s' to be added to MetaContact '%s'?]
-;file \plugins\Clist_modern\src\modern_clcitems.cpp
-[%s|]
;file \plugins\Clist_modern\src\modern_clcopts.cpp
[Contact List/Contact names]
[Contact List/Row Items]
@@ -385,13 +380,11 @@ [Progman]
[Fonts]
;file \plugins\Clist_modern\src\modern_clistevents.cpp
-[%s: %s (%s)]
[EventArea]
[Event Area]
[No Events]
;file \plugins\Clist_modern\src\modern_clistmenus.cpp
[&Contact rate]
-[%s (%s)]
[Show even if offline]
;file \plugins\Clist_modern\src\modern_clistopts.cpp
[Avatar]
@@ -503,8 +496,8 @@ [SkinFolder]
[Profile]
;file \plugins\Clist_modern\src\modern_skinopt.cpp
-[%s (*.msf)%c*.MSF%c%c]
[Miranda skin file]
+[JID: fyr@jabber.ru]
[%Default Skin%]
[%%Default Skin%%]
;file \plugins\Clist_modern\src\modern_statusbar.cpp
diff --git a/langpacks/english/Plugins/Clist_nicer.txt b/langpacks/english/Plugins/Clist_nicer.txt index d50a81a8e2..313937dfdc 100644 --- a/langpacks/english/Plugins/Clist_nicer.txt +++ b/langpacks/english/Plugins/Clist_nicer.txt @@ -317,8 +317,6 @@ [Select view mode]
[Setup view modes]
[Clear view mode]
-;file \plugins\Clist_nicer\src\clcitems.cpp
-[%s|]
;file \plugins\Clist_nicer\src\clcopts.cpp
[Not focused]
[Offline]
@@ -407,7 +405,6 @@ [The clist cannot be docked when using the default title bar and border. Use a toolwindow or borderless style instead.]
[Clist docking]
;file \plugins\Clist_nicer\src\extBackg.cpp
-[*.clist]
[*.clist\0]
[Load and apply]
;file \plugins\Clist_nicer\src\init.cpp
diff --git a/langpacks/english/Plugins/CmdLine.txt b/langpacks/english/Plugins/CmdLine.txt index 37b91e57fc..00aef19629 100644 --- a/langpacks/english/Plugins/CmdLine.txt +++ b/langpacks/english/Plugins/CmdLine.txt @@ -45,7 +45,6 @@ [Could not find contact handle for contact '%s'.]
[Setting '%s/%s' deleted.]
[Wrote '%s:%s' to database entry '%s/%s'.]
-['%s/%s' - %s.]
[Could not retrieve setting '%s/%s': %s.]
[Setting '%s/%s' was not found.]
['%s' proxy was disabled.]
@@ -53,6 +52,7 @@ [%s proxy server: %s %s:%d.]
[%s proxy set to %s %s:%d.]
[%s The port or the proxy type parameter is invalid.]
+[[me]]
[No unread messages found.]
[%s:%s - %d unread events.]
[Contact '%s' has '%d' events in history.]
@@ -64,4 +64,3 @@ ;file \plugins\CmdLine\src\utils.cpp
[Notify]
[Warning]
-[%ld]
diff --git a/langpacks/english/Plugins/Console.txt b/langpacks/english/Plugins/Console.txt index a00d415a07..d147ee72eb 100644 --- a/langpacks/english/Plugins/Console.txt +++ b/langpacks/english/Plugins/Console.txt @@ -33,7 +33,6 @@ [*** Console paused ***]
[*** Console resumed ***]
[*** Console cleared ***]
-[%s - %s\\%s]
[Miranda Console]
[Services]
[Console]
diff --git a/langpacks/english/Plugins/CrashDumper.txt b/langpacks/english/Plugins/CrashDumper.txt index f09417f00c..fbc26dbf77 100644 --- a/langpacks/english/Plugins/CrashDumper.txt +++ b/langpacks/english/Plugins/CrashDumper.txt @@ -27,7 +27,6 @@ [Version Information To File]
[Show Version Information]
[Upload Version Information]
-[%miranda_userdata%]
[Version Information]
[Copy to clipboard]
[Store to file]
@@ -35,6 +34,7 @@ [Show with DLLs]
[Upload]
[Open crash report directory]
+[Open miranda-vi.org]
[Copy Version Info to clipboard]
[Show Version Info]
;file \plugins\CrashDumper\src\dumper.cpp
diff --git a/langpacks/english/Plugins/DbChecker.txt b/langpacks/english/Plugins/DbChecker.txt index 22c635ef7d..52a5a529d3 100644 --- a/langpacks/english/Plugins/DbChecker.txt +++ b/langpacks/english/Plugins/DbChecker.txt @@ -63,24 +63,29 @@ [Database]
[ProfileDir]
[./Profiles]
-[.dat]
[%.2lf MB]
-[\\*.*]
[Total size]
[Wasted]
[\\Profiles]
+[[ini]\\]
+[[prf]\\]
+[Software\\Microsoft\\Windows\\CurrentVersion\\App Paths\\miranda32.exe]
[Path]
+[[reg]\\]
[Miranda Databases (*.dat)\0*.DAT\0All Files (*)\0*\0]
[Miranda Databases (*.dat)]
[All Files]
;file \plugins\DbChecker\src\wizard.cpp
;file \plugins\DbChecker\src\worker.cpp
[Errors were encountered, however you selected not to backup the original database. It is strongly recommended that you do so in case important data was omitted. Do you wish to keep a backup of the original database?]
+[%s\\Backup of %s]
+[%s\\Backup (%d) of %s]
[Unable to rename original file]
[Unable to delete original file]
[Unable to rename output file]
[Database worker thread activated]
[<check only>]
+[ (Output).dat]
[Can't create output file (%u)]
[Processing aborted by user]
[Elapsed time: %d sec]
diff --git a/langpacks/english/Plugins/DbEditorPP.txt b/langpacks/english/Plugins/DbEditorPP.txt index 99ca8aa69e..16ac05b0fd 100644 --- a/langpacks/english/Plugins/DbEditorPP.txt +++ b/langpacks/english/Plugins/DbEditorPP.txt @@ -169,6 +169,9 @@ [Type]
[Size]
[BLOB]
+[BYTE]
+[WORD]
+[DWORD]
[STRING]
[UNICODE]
[<unsupported>]
diff --git a/langpacks/english/Plugins/Db_autobackups.txt b/langpacks/english/Plugins/Db_autobackups.txt index a601cf2b17..d3dbf8fe3c 100644 --- a/langpacks/english/Plugins/Db_autobackups.txt +++ b/langpacks/english/Plugins/Db_autobackups.txt @@ -20,11 +20,8 @@ [Disable progress bar]
[Disable Popups]
;file \plugins\Db_autobackups\src\backup.cpp
-[%s (*.dat)]
[Miranda Databases]
-[%s (*.*)]
[All Files]
-[.bak]
[Backup in Progress]
[Rotating backup files...]
[Copying database file...]
@@ -33,24 +30,16 @@ [Backup Profile]
[Save Profile As...]
[Database]
-[%miranda_userdata%]
[Database/Database Backups]
;file \plugins\Db_autobackups\src\options.cpp
-[%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s]
-[%miranda_path%]
[path to root miranda folder]
-[%miranda_profile%]
[path to current miranda profile]
-[%miranda_profilename%]
[name of current miranda profile (filename, without extension)]
[will return parsed string %miranda_profile%\\Profiles\\%miranda_profilename%]
-[%appdata%]
[same as environment variable %APPDATA% for currently logged-on Windows user]
-[%username%]
[username for currently logged-on Windows user]
-[%mydocuments%]
-[%desktop%]
-[%xxxxxxx%]
+["My Documents" folder for currently logged-on Windows user]
+["Desktop" folder for currently logged-on Windows user]
[any environment variable defined in current Windows session (like %systemroot%, %allusersprofile%, etc.)]
[Variables]
[Days]
diff --git a/langpacks/english/Plugins/Dbx_mmap_SA.txt b/langpacks/english/Plugins/Dbx_mmap_SA.txt index e92de16c58..e3fa5efabc 100644 --- a/langpacks/english/Plugins/Dbx_mmap_SA.txt +++ b/langpacks/english/Plugins/Dbx_mmap_SA.txt @@ -54,7 +54,6 @@ [Dll]
[Name]
[Version]
-[%d.%d.%d.%d]
[Please type in your password for]
[Too many errors!]
[Password is not correct!]
diff --git a/langpacks/english/Plugins/Dbx_tree.txt b/langpacks/english/Plugins/Dbx_tree.txt index 18032c3020..af0a8fbdaf 100644 --- a/langpacks/english/Plugins/Dbx_tree.txt +++ b/langpacks/english/Plugins/Dbx_tree.txt @@ -11,7 +11,6 @@ ;file \plugins\Dbx_tree\src\Compatibility.cpp
[Trying to write malformed UTF8 setting "%hs" in module "%hs"]
;file \plugins\Dbx_tree\src\DataBase.cpp
-[.pri]
[Header Block not found! File damaged: "%s"]
[Header Block cannot be read! File damaged: "%s"]
[Header Block in "%s" damaged!]
@@ -23,7 +22,6 @@ [SetEndOfFile failed]
[FlushFileBuffers failed]
;file \plugins\Dbx_tree\src\FileAccess.cpp
-[.jrn]
[Couldn't flush the journal because ReadFile failed!]
[Your database journal wasn't completely written to disk.]
[CreateFile failed on Journal %s]
@@ -34,6 +32,8 @@ [Journal "%s" was found on start.\nBackups "%s"and "%s" could not be created in "%s".]
;file \plugins\Dbx_tree\src\FileBTree.h
[Signature check failed]
+;file \plugins\Dbx_tree\src\Logger.cpp
+[[%s - %s]\n%s\n\nSystem Error Code: %d\n%s\n\n]
;file \plugins\Dbx_tree\src\MappedMemory.cpp
[Cannot set end of file]
[CreateFileMapping failed]
diff --git a/langpacks/english/Plugins/FTPFile.txt b/langpacks/english/Plugins/FTPFile.txt index 867524c9dc..e3ad54ffbb 100644 --- a/langpacks/english/Plugins/FTPFile.txt +++ b/langpacks/english/Plugins/FTPFile.txt @@ -63,7 +63,6 @@ [Delete from List]
[Copy Link]
;file \plugins\FTPFileYM\src\dialog.cpp
-[* %s]
[User Info]
[Copy Link to Clipboard]
[FTP File Manager]
@@ -92,7 +91,6 @@ [FTP File - Select files]
[FTP File - Select a folder]
[Folder not found!]
-[*.*]
[The selected folder does not contain any files.\nFTP File sends files only from the selected folder, not from subfolders.]
[CANCELED]
[COMPLETED]
@@ -107,8 +105,6 @@ [Error occured when zipping the file(s).]
[%0.1f kB/s]
[%0.1f%% (%d kB/%d kB)]
-[%dd %02d:%02d:%02d]
-[%02d:%02d:%02d]
[%s (%d kB/%d kB)]
[Do you really want to cancel this upload?]
[Status: %s\r\nFile: %s\r\nServer: %s]
@@ -121,6 +117,7 @@ [WAITTING...]
[Download link:]
[Do you really want to cancel running upload?]
+[%s\r\nSpeed: %s\r\nCompleted: %s\r\nRemaining: %s]
;file \plugins\FTPFileYM\src\manager.cpp
[You have to fill and enable at least one FTP server in setting.]
[Clear All]
@@ -137,4 +134,3 @@ [Advanced]
;file \plugins\FTPFileYM\src\serverlist.cpp
;file \plugins\FTPFileYM\src\utils.cpp
-[...]
diff --git a/langpacks/english/Plugins/Facebook.txt b/langpacks/english/Plugins/Facebook.txt index 4d25daae96..6cd5d3c6df 100644 --- a/langpacks/english/Plugins/Facebook.txt +++ b/langpacks/english/Plugins/Facebook.txt @@ -74,7 +74,6 @@ [Multichat]
;file \protocols\FacebookRM\src\messages.cpp
[You cannot send messages when you are offline.]
-[.jpg]
;file \protocols\FacebookRM\src\process.cpp
[Contact is back on server-list.]
[Contact is no longer on server-list.]
@@ -82,8 +81,6 @@ ;file \protocols\FacebookRM\src\proto.cpp
[%s server connection]
[Unable to get Netlib connection for Facebook]
-[%miranda_avatarcache%]
-[%s %s %s]
[Network]
[Account]
[Advanced]
diff --git a/langpacks/english/Plugins/Fingerprint.txt b/langpacks/english/Plugins/Fingerprint.txt index be0db03bf1..a9ffab94db 100644 --- a/langpacks/english/Plugins/Fingerprint.txt +++ b/langpacks/english/Plugins/Fingerprint.txt @@ -627,7 +627,6 @@ [xeus 2]
[*xeus*]
[xeus]
-[Ya.Online]
[*yaxim*]
[yaxim]
[*AmIRC*]
@@ -779,7 +778,6 @@ [MSN Messenger v7.x]
[MSN*6.*]
[MSN Messenger v6.x]
-[MSN*4.x-5.x]
[MSN Messenger v4.x-5.x]
[MSN*Mac*]
[MSN for Mac]
@@ -829,6 +827,7 @@ [*weather*]
[Weather]
[*RSS*0.9*]
+[RSS 0.9x]
[*RSS*2.*]
[RSS 2]
[*RSS*1.*]
@@ -883,9 +882,7 @@ [Amatory]
[*bri*edition*]
[Bri edition]
-[*6.6.6*]
[Devil Suite]
-[*[E33*]*]
[E33]
[*FR*Pack*]
[Miranda FR]
diff --git a/langpacks/english/Plugins/FlashAvatars.txt b/langpacks/english/Plugins/FlashAvatars.txt index df4f9557de..e37113186b 100644 --- a/langpacks/english/Plugins/FlashAvatars.txt +++ b/langpacks/english/Plugins/FlashAvatars.txt @@ -1,13 +1,11 @@ #muuid {72765a6f-b017-42f1-b30f-5e0941273a3f}
;langpack template for FlashAvatars
;file \plugins\FlashAvatars\src\cflash.cpp
-[%miranda_avatarcache%]
[Flash]
[Flash.ocx not registered!]
[You don't have installed ShockwaveFlash interface in your system.]
[Bugged Flash detected!]
[You have installed Flash 8.\r\nThis version of Flash contains a bug which can causes random crashes.\r\nIt is recommended to upgrade or downgrade your Flash library]
-[.xml]
[AtlAxWin]
[atl]
[Flash Avatars]
diff --git a/langpacks/english/Plugins/Folders.txt b/langpacks/english/Plugins/Folders.txt index e7dbd827d0..31c3d862ca 100644 --- a/langpacks/english/Plugins/Folders.txt +++ b/langpacks/english/Plugins/Folders.txt @@ -21,6 +21,3 @@ ;file \plugins\Folders\src\hooked_events.cpp
[Folders]
[Customize]
-;file \plugins\Folders\src\services.cpp
-[\t \\]
-[%miranda_userdata%]
diff --git a/langpacks/english/Plugins/GG.txt b/langpacks/english/Plugins/GG.txt index 148c176072..d4f1cebbf8 100644 --- a/langpacks/english/Plugins/GG.txt +++ b/langpacks/english/Plugins/GG.txt @@ -76,12 +76,10 @@ [Concurrent %s Login Sessions\nView information on active concurrent sessions]
[Sign out all sessions]
;file \protocols\Gadu-Gadu\src\avatar.cpp
-[%miranda_avatarcache%]
[Can not create avatars cache directory. ERROR: %d: %s\n%s]
[jpg]
[gif]
[png]
-[\\%s.%s]
[\\%s avatar.%s]
[Can not create avatar file. ERROR: %d: %s\n%s]
[Can not open avatar file. ERROR: %d: %s\n%s]
@@ -101,8 +99,6 @@ [<none>]
[Server hostname %s is invalid. Using default hostname provided by the network.]
[Connection cannot be established. errno=%d: %s]
-[, %s %s]
-[, %s %d]
[Age:]
[List import successful.]
[List remove successful.]
@@ -110,7 +106,6 @@ [Unknown client]
[You have logged in at another location]
[You are logged in at another location]
-[%s (%s)]
[Incoming image]
;file \protocols\Gadu-Gadu\src\dialogs.cpp
[Male]
@@ -151,14 +146,14 @@ [HTTP failed reading]
[HTTP failed writing]
[Unknown HTTP error]
+[%s\\*.(null)]
[&Unblock]
[&Block]
[Contact list]
;file \protocols\Gadu-Gadu\src\gg_proto.cpp
[%s connection]
-[%miranda_userdata%]
+[%s\\%s\\ImageCache]
[Gadu-Gadu Number]
-[%d %d]
;file \protocols\Gadu-Gadu\src\groupchat.cpp
[Open &conference...]
[&Clear ignored conferences]
@@ -196,18 +191,12 @@ [Save image to disk]
[Image from %s]
[Image for %s]
-[%s (%d / %d)]
[Select picture to send]
[bmp]
[jpeg]
[Can not create image cache directory. ERROR: %d: %s\n%s]
-[\\%s]
[%.*s (%u)%s]
[Cannot save received image to file. ERROR: %d: %s\n%s]
-[.bmp]
-[.gif]
-[.jpg]
-[.png]
[Can not open image file. ERROR: %d: %s\n%s]
[Image exceeds maximum allowed size of 255 KB.]
;file \protocols\Gadu-Gadu\src\import.cpp
@@ -215,12 +204,9 @@ [List cannot be imported because of error:\n\t%s (Error: %d)]
[List cannot be removeed because of error: %s (Error: %d)]
[Text files]
-[ (*.txt)]
[All Files]
-[ (*)]
[List cannot be imported from file "%s" because of error:\n\t%s (Error: %d)]
[contacts]
-[.txt]
[List cannot be exported to file "%s" because of error:\n\t%s (Error: %d)]
[List cannot be exported because of error:\n\t%s (Error: %d)]
[Import List From &Server]
@@ -234,15 +220,9 @@ [Password could not be reminded because of error:\n\t%s (Error: %d)]
[Password was sent to your e-mail.]
;file \protocols\Gadu-Gadu\src\popups.cpp
-[%s/%s]
[Notify]
[Error]
;file \protocols\Gadu-Gadu\src\services.cpp
-[.jpeg]
-[.ico]
-[.rle]
-[.swf]
-[.xml]
[Can not remove old avatar file before refresh. ERROR: %d: %s\n%s]
[Can not remove old avatar file. ERROR: %d: %s\n%s]
[To remove your Gadu-Gadu avatar, you must use the gg.pl website.]
diff --git a/langpacks/english/Plugins/GTalkExt.txt b/langpacks/english/Plugins/GTalkExt.txt index aeba9f632c..50e726e1e1 100644 --- a/langpacks/english/Plugins/GTalkExt.txt +++ b/langpacks/english/Plugins/GTalkExt.txt @@ -58,7 +58,6 @@ [feature]
[new-mail]
[true]
-[%x%08x]
;file \protocols\GTalkExt\src\inbox.cpp
[mail]
;file \protocols\GTalkExt\src\menu.cpp
@@ -66,8 +65,6 @@ ;file \protocols\GTalkExt\src\notifications.cpp
[AntiShittyFullscreenDetectionWindowClass]
[You've received an e-mail\n%s unread threads]
-[%s [%s]]
-[ %s <%s>\n]
;file \protocols\GTalkExt\src\options.cpp
[PopUps]
[Network]
diff --git a/langpacks/english/Plugins/ICQ.txt b/langpacks/english/Plugins/ICQ.txt index 01554699f2..2fb6319d38 100644 --- a/langpacks/english/Plugins/ICQ.txt +++ b/langpacks/english/Plugins/ICQ.txt @@ -200,16 +200,7 @@ [** This message was blocked by the ICQ server ** You are too evil.]
[** Unknown missed message event.]
;file \protocols\IcqOscarJ\src\icq_avatar.cpp
-[%%miranda_avatarcache%%\\]
-[%miranda_avatarcache%]
[avatar]
-[.jpg]
-[.gif]
-[.png]
-[.bmp]
-[.xml]
-[.swf]
-[.dat]
[Error uploading avatar to server, server temporarily unavailable.]
[Error uploading avatar to server, server refused to accept the image.]
;file \protocols\IcqOscarJ\src\icq_constants.h
diff --git a/langpacks/english/Plugins/IEView.txt b/langpacks/english/Plugins/IEView.txt index 53bcf91411..3f01bddac4 100644 --- a/langpacks/english/Plugins/IEView.txt +++ b/langpacks/english/Plugins/IEView.txt @@ -73,4 +73,3 @@ [File received]
;file \plugins\IEView\src\TabSRMMHTMLBuilder.cpp
;file \plugins\IEView\src\TemplateHTMLBuilder.cpp
-[.xml]
diff --git a/langpacks/english/Plugins/IRC.txt b/langpacks/english/Plugins/IRC.txt index 220a6f1bda..82d9fa17b3 100644 --- a/langpacks/english/Plugins/IRC.txt +++ b/langpacks/english/Plugins/IRC.txt @@ -197,12 +197,6 @@ [Downloading list - %u channels]
[Done: %u channels]
[(probably truncated by server)]
-[ - ]
-[ - ( ]
-[%ud, %uh, %um, %us]
-[%uh, %um, %us]
-[%um, %us]
-[%us]
[online since %s, idle %s]
[is an identified user]
[is a registered nick]
@@ -211,7 +205,6 @@ [WHO]
[USERHOST]
[IRC error]
-[%s %s %s %s ]
[Please enter the hostmask (nick!user@host)\nNOTE! Contacts on your contact list are never ignored]
[Ignore]
[ +qnidcm]
@@ -221,13 +214,10 @@ [Ban'n Kick]
[Jerk]
[Try server %99[^ ,], port %19s]
-[\0035\002]
[*Disconnected*]
[The usage of /AWAY in your perform buffer is restricted\n as IRC sends this command automatically.]
[IRC Error]
;file \protocols\IRCG\src\input.cpp
-[\r\n]
-[\r\r]
[%question]
[%mnick]
[%anick]
@@ -235,7 +225,6 @@ [%module]
[%name]
[%network]
-[%me]
[%color]
[%bold]
[%underline]
@@ -269,7 +258,6 @@ [Network log]
;file \protocols\IRCG\src\irclib.cpp
[QUIT]
-[\0035%s \002%s\002 (]
[Failed to connect to]
[NICK %s\r\n]
[Miranda]
@@ -355,7 +343,6 @@ [CTCP %s reply sent to %s]
[CTCP %s reply sent to %s: %s]
[Notice to %s: ]
-[ : ]
;file \protocols\IRCG\src\services.cpp
[&Quick connect]
[&Join channel]
@@ -372,16 +359,6 @@ [Please enter a channel to join]
[Change nick name]
[Please enter a unique nickname]
-[\002]
-[\026]
-[\037]
-[\003]
-[\00399,99]
-[\00399]
-[\003%u,]
-[\00399,]
-[\003%u,99]
-[ - ]
[Please enter your authentification code]
[Authentificate nick]
[Are you sure you want to unregister your current nick?]
@@ -457,15 +434,11 @@ [Send &File]
[Add to &ignore list]
[&Add User]
-[\0033%s \002%s\002 (]
[Connecting to]
[Reconnecting to]
;file \protocols\IRCG\src\tools.cpp
-[\r\n\r\n]
-[%02u]
[Offline]
[Unknown]
-[%s - %s]
;file \protocols\IRCG\src\userinfo.cpp
;file \protocols\IRCG\src\windows.cpp
[Please wait...]
@@ -488,5 +461,3 @@ [Edit ban]
[Edit invite?]
[Edit exception?]
-[%s+%s]
-[%s %s %s]
diff --git a/langpacks/english/Plugins/Import.txt b/langpacks/english/Plugins/Import.txt index 327714e072..414b3e3355 100644 --- a/langpacks/english/Plugins/Import.txt +++ b/langpacks/english/Plugins/Import.txt @@ -74,12 +74,8 @@ [&Import...]
;file \plugins\Import\src\miranda.cpp
[%miranda_path%\\Profiles]
-[%miranda_path%]
-[%miranda_profile%]
-[%miranda_profilename%]
[The given file does not exist. Please check that you have entered the name correctly.]
[Miranda Import]
-[%s (*.dat, *.bak)%c*.dat;*.bak%c%s (*.*)%c*.*%c%c]
[Miranda NG database]
[All Files]
;file \plugins\Import\src\utils.cpp
diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt index 5308c48977..2fc35c1f0a 100644 --- a/langpacks/english/Plugins/Jabber.txt +++ b/langpacks/english/Plugins/Jabber.txt @@ -200,7 +200,6 @@ [Send]
;file \protocols\JabberG\src\jabber.cpp
[Jabber Link Protocol]
-[%d.%d.%d.%d]
;file \protocols\JabberG\src\jabber.h
[I'm happy Miranda NG user. Get it at http://miranda-ng.org/.]
;file \protocols\JabberG\src\jabber_adhoc.cpp
@@ -229,7 +228,6 @@ [button]
[Execute]
[Requesting command list. Please wait...]
-[%s %s]
[Jabber Ad-Hoc commands at]
[Sending Ad-Hoc command to]
[prev]
@@ -322,8 +320,6 @@ [Supports GTalk private multi-user chat]
[feature]
[var]
-[%s/%s]
-[%s#%s]
[Bombus]
[BombusMod]
[neos]
@@ -427,7 +423,6 @@ [invite]
[reason]
[Send groupchat invitation.]
-[%s (%s)]
[not on roster]
[Member Info:]
[Member Information]
@@ -444,7 +439,6 @@ [moderator]
[groupchat]
[body]
-[%s: ]
[Reason to kick]
[Reason to ban]
[outcast]
@@ -561,16 +555,10 @@ [subscription]
;file \protocols\JabberG\src\jabber_disco.h
[Jid: %s\r\n]
-[%s: %s\r\n]
-[\r\n%s:\r\n]
[Identities]
-[ %c %s (%s: %s, %s: %s)\r\n]
-[ %c %s: %s, %s: %s\r\n]
[Category]
[Type]
[Supported features]
-[ %c %s\r\n]
-[\r\n%s: %s\r\n]
[Info request error]
[Items request error]
;file \protocols\JabberG\src\jabber_events.cpp
@@ -587,7 +575,6 @@ [fixed]
[static]
[edit]
-[\r\n]
[option]
;file \protocols\JabberG\src\jabber_form2.cpp
[abuse-addresses]
@@ -811,19 +798,16 @@ [no-valid-streams]
[bad-profile]
;file \protocols\JabberG\src\jabber_groupchat.cpp
-[%s@%s/%s]
[history]
[since]
[Failed to retrieve room list from server.]
[No rooms available on server.]
[Room list request timed out.]
-[%s@%s (%s)]
[<no nick>]
[Loading...]
[Please wait for room list to download.]
[Please specify groupchat directory first.]
[Bookmarks...]
-[%s <%s>]
[available]
[away]
[dnd]
@@ -857,7 +841,6 @@ [meinvz*]
[Protocols/Jabber/Accounts]
[Status Icons/%s/]
-[ %s]
[transport]
[Privacy Lists]
[Notes]
@@ -916,7 +899,6 @@ [jabber:iq:auth]
[digest]
[resource]
-[%s %s.]
[Authentication failed for]
[Jabber Authentication]
[session]
@@ -926,7 +908,6 @@ [NICKNAME]
[EMAIL]
[BDAY]
-[%d-%d-%d]
[GENDER]
[ADR]
[TEL]
@@ -957,7 +938,6 @@ [Ban List]
[Admin List]
[Owner List]
-[%s %s?]
[Removing]
;file \protocols\JabberG\src\jabber_iq_handlers.cpp
[Miranda NG Jabber]
@@ -981,7 +961,6 @@ [Server's Choice]
[&Convert to Contact]
[&Convert to Chat Room]
-[%s [%s, %d]]
[subscribed]
[unsubscribed]
[Options...]
@@ -1003,16 +982,13 @@ [Highest priority (server's choice)]
[Status Message]
;file \protocols\JabberG\src\jabber_message_handlers.cpp
-[%s:\n%s\n%s]
-[%s:\n%s]
;file \protocols\JabberG\src\jabber_message_manager.cpp
[event]
[normal]
;file \protocols\JabberG\src\jabber_misc.cpp
[CHAT plugin is required for conferences. Install it before chatting]
[%%miranda_avatarcache%%\\Jabber]
-[%miranda_avatarcache%]
-[%s@]
+[%s\\Jabber]
[ avatar.]
[Miranda IM Jabber]
[GTalk]
@@ -1023,7 +999,6 @@ [ (SecureIM)]
[Miranda IM]
[Miranda NG]
-[ [%s]]
[From]
[Both]
[Errors]
@@ -1043,7 +1018,6 @@ [offline]
[Incoming note]
;file \protocols\JabberG\src\jabber_opt.cpp
-[%s %s@%S:%d?]
[Afar]
[Abkhazian]
[Afrikaans]
@@ -1229,7 +1203,6 @@ [Yoruba]
[Zhuang; Chuang]
[Zulu]
-[%s@%s]
[Office]
[These changes will take effect the next time you connect to the Jabber network.]
[Jabber Protocol Option]
@@ -1286,7 +1259,6 @@ [Subscription]
[Uploading...]
[Downloading...]
-[%s (*.xml)%c*.xml%c%c]
[XML for MS Excel (UTF-8 encoded)]
[xml]
[Workbook]
@@ -1317,7 +1289,6 @@ [Vkontakte]
[Some changes will take effect the next time you connect to the Jabber network.]
;file \protocols\JabberG\src\jabber_password.cpp
-[%s %s@]
[Set New Password for]
[New password does not match.]
[Current password is incorrect.]
@@ -1366,7 +1337,6 @@ [presence-in]
[presence-out]
[queries]
-[%s %s %s]
[allow]
[List has no rules, empty lists will be deleted then changes applied]
[allow ]
@@ -1402,14 +1372,13 @@ [add]
[No compatible file transfer machanism exist]
[Protocol is offline or no jid]
+[[This message is encrypted.]]
[jabber:x:encrypted]
-[): ]
[paused]
[composing]
;file \protocols\JabberG\src\jabber_proxy.cpp
[rid]
;file \protocols\JabberG\src\jabber_rc.cpp
-[%u%u]
[bad-sessionid]
[Command completed successfully]
[info]
@@ -1484,7 +1453,6 @@ [On the phone]
[Out to lunch]
[Idle]
-[ | ]
[Nick:]
[Status:]
[Status text:]
@@ -1529,7 +1497,6 @@ [failure]
[stream:error]
[item/tune[@xmlns=']
-[%02d:%02d:%02d]
[received]
[Subject: ]
[Message redirected from: %s\r\n%s]
@@ -1553,7 +1520,6 @@ [service-unavailable]
[Sending registration information...]
;file \protocols\JabberG\src\jabber_userinfo.cpp
-[%s: %s]
[Resource]
[<not specified>]
[Software]
@@ -1586,15 +1552,11 @@ [format]
[GIF %s (*.gif)]
[JPEG %s (*.jpg;*.jpeg)]
-[%s (*.*)]
[Unknown format]
-[*.*]
[<Photo not available while offline>]
[<No photo>]
[Photo]
;file \protocols\JabberG\src\jabber_util.cpp
-[%%%02X]
-[%2x]
[Redirect]
[Bad request]
[Unauthorized]
@@ -1612,26 +1574,18 @@ [Service unavailable]
[Remote server timeout]
[Unknown error]
-[%s -1: %s]
[Error]
[Unknown error message]
-[%s %d: %s\r\n%s]
-[%s %d: %s]
-[%d:%d:%d]
[priority]
[photo]
[show]
[Advanced Status]
[Set mood...]
[Set activity...]
-[%04d-%02d-%02dT%02d:%02d:%02dZ]
-[%04d-%02d-%02dT%02d:%02d:%02d.%dZ]
-[%s (%d)]
;file \protocols\JabberG\src\jabber_vcard.cpp
[prodid]
[Male]
[Female]
-[.\\]
[jab]
[Only JPG, GIF, and BMP image files smaller than 40 KB are supported.]
[Jabber vCard]
@@ -1658,8 +1612,6 @@ ;file \protocols\JabberG\src\jabber_xml.h
[Hello]
;file \protocols\JabberG\src\jabber_xstatus.cpp
-[%s [%s]]
-[...%s]
[publish]
[current]
[<advanced status slot>]
@@ -1839,8 +1791,6 @@ [source]
[track]
[uri]
-[%title% - %artist%]
-[%s - %s]
[listening_to]
[Listening To]
[Protocols/Jabber/Moods]
@@ -1849,4 +1799,3 @@ [items]
;file \protocols\JabberG\src\ui_utils.cpp
[Set filter...]
-[%s [%s: %s]]
diff --git a/langpacks/english/Plugins/KeepStatus.txt b/langpacks/english/Plugins/KeepStatus.txt index 459886b8fd..6e4dd11cf9 100644 --- a/langpacks/english/Plugins/KeepStatus.txt +++ b/langpacks/english/Plugins/KeepStatus.txt @@ -15,6 +15,7 @@ [%s Login error (next retry (%d) in %ds)]
[%s Status error (next retry (%d) in %ds)]
[Status error (next retry (%d) in %ds)]
+[%s\t(will be set to %s)\r\n]
[will be set to]
[Resetting status... (last try (%d))%s]
[Resetting status... (next retry (%d) in %ds)%s]
diff --git a/langpacks/english/Plugins/KeyboardNotify.txt b/langpacks/english/Plugins/KeyboardNotify.txt index cd3c11ff92..7a58299b00 100644 --- a/langpacks/english/Plugins/KeyboardNotify.txt +++ b/langpacks/english/Plugins/KeyboardNotify.txt @@ -110,9 +110,7 @@ [Themes]
[Protocol]
[Keyboard Notify Theme]
-[ (*.knt)]
[All Files]
-[*.*]
[knt]
[\n; Automatically generated Keyboard Notify Theme file\n\n\n]
[\n; End of automatically generated Keyboard Notify Theme file\n]
diff --git a/langpacks/english/Plugins/LangMan.txt b/langpacks/english/Plugins/LangMan.txt index 344052eff7..e0d637fde5 100644 --- a/langpacks/english/Plugins/LangMan.txt +++ b/langpacks/english/Plugins/LangMan.txt @@ -31,12 +31,12 @@ ;file \plugins\LangMan\src\langpack.cpp
[Plugins\\Language\\]
[English (default)]
+[%s\\Plugins\\%s]
;file \plugins\LangMan\src\main.cpp
[Reload langpack]
[Docs\\]
;file \plugins\LangMan\src\options.cpp
[UXTHEME]
-[%hs (%s)]
[All installed plugins are included.]
[(incompatible)]
[Unknown]
diff --git a/langpacks/english/Plugins/LinkList.txt b/langpacks/english/Plugins/LinkList.txt index 2cd8388831..df2edba922 100644 --- a/langpacks/english/Plugins/LinkList.txt +++ b/langpacks/english/Plugins/LinkList.txt @@ -57,31 +57,27 @@ [Could not allocate memory!]
[There are no links in history!]
;file \plugins\HistoryLinkListPlus\src\linklist_dlg.cpp
-[%s [%s]]
[Linklist Plugin]
[mailto:]
-[%s: %s]
;file \plugins\HistoryLinkListPlus\src\linklist_fct.cpp
[www.]
[icq#]
[gopher://]
[news://]
[file://]
-[\\\\]
-[.com/]
-[.net/]
-[.org/]
-[.ru]
[d-t]
[Arial]
-[%s '%s': %d\n\n]
[Matches for searchtext]
[Courier]
[Processing list...]
-[\n\n]
+[[mail]]
+[[file]]
+[[UNK ]]
+[[in ]]
+[[out]]
[No messages found!\nPlease change current filter options.]
[\n[in ] ]
[URL ]
-[%s: %s %s]
+[[out] ]
[RTF File\0*.rtf\0All Files\0*.*\0\0]
[Save RTF File]
diff --git a/langpacks/english/Plugins/ListeningTo.txt b/langpacks/english/Plugins/ListeningTo.txt index 451e12e078..e9cad8da85 100644 --- a/langpacks/english/Plugins/ListeningTo.txt +++ b/langpacks/english/Plugins/ListeningTo.txt @@ -84,9 +84,7 @@ [Is equals]
[Is different]
;file \plugins\ListeningTo\src\options.cpp
-[%artist% - %title%]
[<Unknown>]
-[%listening%]
[<Nothing is playing now>]
[Status]
[Listening info]
@@ -104,8 +102,6 @@ [ERROR: Too little pieces]
[END: Stoped playing]
[ERROR: not enought info]
-[%d:%02d:%02d]
-[%d:%02d]
[END: Success]
[SendTimerProc]
[It's time to process]
diff --git a/langpacks/english/Plugins/MRA.txt b/langpacks/english/Plugins/MRA.txt index 36e8619461..166ebdd0c2 100644 --- a/langpacks/english/Plugins/MRA.txt +++ b/langpacks/english/Plugins/MRA.txt @@ -8,7 +8,7 @@ ;file \protocols\MRA\res\resource.rc
[E-mail:]
[Password:]
-[Create a new account]
+[Create a new Mail.ru account]
[Configuration]
[Login Server:]
[Port:]
@@ -96,18 +96,8 @@ [Writed:]
[0/500]
;file \protocols\MRA\src\MraAvatars.cpp
-[.dat]
-[.png]
-[.jpg]
-[.ico]
-[.bmp]
-[.gif]
-[.swf]
-[.xml]
[Avatars]
[plugin connections]
-[%%miranda_avatarcache%%\\%s]
-[%miranda_avatarcache%]
;file \protocols\MRA\src\MraChat.cpp
[get]
;file \protocols\MRA\src\MraFilesQueue_mod.cpp
@@ -117,7 +107,6 @@ ;file \protocols\MRA\src\MraProto.cpp
[%s connection]
[E-mail address]
-[%04ld.%02ld.%02ld %02ld:%02ld: ]
;file \protocols\MRA\src\Mra_options.cpp
[Network]
[Account]
diff --git a/langpacks/english/Plugins/MSN.txt b/langpacks/english/Plugins/MSN.txt index 9498f3dbc1..8f8def5ad2 100644 --- a/langpacks/english/Plugins/MSN.txt +++ b/langpacks/english/Plugins/MSN.txt @@ -61,7 +61,6 @@ [&Cancel]
[Add]
;file \protocols\MSN\src\msn_chat.cpp
-[%s %s%s]
[Chat #]
[Others]
[&Invite user...]
@@ -73,7 +72,6 @@ [%I64u bytes]
[Accept NetMeeting request from %s?]
[MSN Protocol]
-[%title% - %artist%]
[MSN Alert]
[Chat session established by my request]
[Chat session established by contact request]
@@ -99,8 +97,6 @@ [Hotmail from %s (%S)]
[Hotmail from %s]
[Unread mail is available: %d in Inbox and %d in other folders).]
-[%s [%d]]
-[%s [%d][%d]]
;file \protocols\MSN\src\msn_menu.cpp
[Open &Hotmail Inbox]
[Send &Hotmail E-mail]
@@ -114,24 +110,17 @@ [&Start Netmeeting]
;file \protocols\MSN\src\msn_misc.cpp
[%%miranda_userdata%%\\Avatars\\%s]
-[%miranda_userdata%]
-[\\%s.]
+[%s\\Avatars\\%s]
[\\%s avatar.]
-[\\%s]
[jpg]
[bmp]
[png]
[gif]
[unk]
-[.gif]
-[.bmp]
-[.png]
-[\\%s.%s]
+[%s\\%s\\CustomSmiley]
[Miranda]
-[%s/%s]
[Notify]
[Error]
-[%s:\n%s]
;file \protocols\MSN\src\msn_msgqueue.cpp
;file \protocols\MSN\src\msn_opts.cpp
[Protocol icon]
@@ -177,7 +166,6 @@ ;file \protocols\MSN\src\msn_svcs.cpp
[Music]
[No Title]
-[%s - %s]
[MSN requires message send timeout in your Message window plugin to be not less then 60 sec. Please correct the timeout value.]
[Convert to Chat]
;file \protocols\MSN\src\msn_ws.cpp
diff --git a/langpacks/english/Plugins/MenuEx.txt b/langpacks/english/Plugins/MenuEx.txt index 2be7d3c30d..ac88eec624 100644 --- a/langpacks/english/Plugins/MenuEx.txt +++ b/langpacks/english/Plugins/MenuEx.txt @@ -51,8 +51,6 @@ [You Were Added]
[Typing Notify]
[Please authorize me to add you to my contact list.]
-[%s [%s]]
-[\r\n]
[Do you want to send authorization request\nto new contact?]
[Miranda NG]
[Open ignore settings]
diff --git a/langpacks/english/Plugins/MirOTR.txt b/langpacks/english/Plugins/MirOTR.txt index 13558732d2..7a94207b1d 100644 --- a/langpacks/english/Plugins/MirOTR.txt +++ b/langpacks/english/Plugins/MirOTR.txt @@ -74,6 +74,7 @@ [OTR encrypted session with '%s' could not be started]
[OTR could not encrypt when sending message]
[OTR Information]
+[[OTR INFO] ]
[Authentication from %s]
[Authenticae %s]
[Unknown]
@@ -166,7 +167,6 @@ [OTR - sending raw message]
[OTR - receiving message]
;file \plugins\MirOTR\MirOTR\src\utils.cpp
-[%02X]
[%s Message]
[%s Warning]
[%s Error]
diff --git a/langpacks/english/Plugins/ModernOpt.txt b/langpacks/english/Plugins/ModernOpt.txt index d147240131..618c1fce25 100644 --- a/langpacks/english/Plugins/ModernOpt.txt +++ b/langpacks/english/Plugins/ModernOpt.txt @@ -42,5 +42,3 @@ [Configure]
[Update]
[Download]
-;file \plugins\ModernOpt\src\mopt_selector.cpp
-[*.*]
diff --git a/langpacks/english/Plugins/Msg_Export.txt b/langpacks/english/Plugins/Msg_Export.txt index ab1c858827..8f50bc9a8a 100644 --- a/langpacks/english/Plugins/Msg_Export.txt +++ b/langpacks/english/Plugins/Msg_Export.txt @@ -51,7 +51,6 @@ [Syntax highlight]
[UTF8]
[ANSI]
-[.rtf]
[Failed to create file]
[Failed to save file]
[History was saved successfully in file\r\n]
@@ -84,8 +83,6 @@ [C:\\Backup\\MsgExport\\]
[%dbpath%\\MsgExport\\%group% - ]
[%dbpath%\\MsgExport\\%group%\\]
-[D s]
-[D m :]
[You have unapplyed changes do you wish to apply these first ?]
[Executable files (*.exe;*.com;*.bat;*.cmd)\0*.exe;*.com;*.bat;*.cmd\0All files(*.*)\0*.*\0]
[Failed to get the shells allocator !]
@@ -98,15 +95,7 @@ ;file \plugins\Msg_Export\src\utils.cpp
[No_Nick]
[No_Group]
-[%FirstName%]
-[%LastName%]
[%e-mail%]
-[%Nick%]
-[%City%]
-[%State%]
-[%Phone%]
-[%Homepage%]
-[%About%]
[Debug information\r\nsDBPath :]
[\r\nsMirandaPath :]
[\r\nsDefaultFile :]
@@ -115,18 +104,9 @@ [\r\n--------------- It was translated to ---------------\r\n]
[\r\nErrorCode : %d\r\n]
[DB: Attempt to get wrong type of value, string]
-[%dbpath%]
-[%nick%]
[(Unknown Contact)]
[File name for the user "%s" has changed !\n\nfrom:\t%s\nto:\t%s\n\nDo you wish to rename file ?]
[Failed to rename file\n\nfrom:\t%s\nto:\t%s\n\nFailed with error: %s]
-[%UIN%]
-[%protocol%]
-[%identifier%]
-[%group%]
-[%year%]
-[%month%]
-[%day%]
[\nError :]
[Message has not been saved !\n]
[Do you wish to save debug information ?]
@@ -149,10 +129,6 @@ [State : %State%\r\n]
[Phone : %Phone%\r\n]
[Homepage : %Homepage%\r\n]
-[%User%]
-[%Proto%]
-[%Age%]
-[%Gender%]
[Failed to write user details to file :\n]
[%-*s]
[Failed to write timestamp and username to file :\n]
diff --git a/langpacks/english/Plugins/MyDetails.txt b/langpacks/english/Plugins/MyDetails.txt index 29065765bc..710183ec62 100644 --- a/langpacks/english/Plugins/MyDetails.txt +++ b/langpacks/english/Plugins/MyDetails.txt @@ -68,7 +68,6 @@ [Listening To]
[My Details]
[Show My Details]
-[ ...]
[Enable Listening To for %s]
[Set My Avatar for %s...]
[Set My Nickname for %s...]
diff --git a/langpacks/english/Plugins/NewEventNotify.txt b/langpacks/english/Plugins/NewEventNotify.txt index b98a4e1dd0..d70fd5325c 100644 --- a/langpacks/english/Plugins/NewEventNotify.txt +++ b/langpacks/english/Plugins/NewEventNotify.txt @@ -36,10 +36,8 @@ [No popups for RSS contacts]
[No popups for read messages]
;file \plugins\NewEventNotify\src\main.cpp
-[%s (%s)]
[TMsgWindow]
[TfrmContainer]
-[%s (%s): %s]
[Message Session]
[Message Received]
;file \plugins\NewEventNotify\src\menuitem.cpp
@@ -55,9 +53,4 @@ [This is a sample file event :-D]
[This is a sample other event ;-D]
[Plugin Test]
-[\0\0]
[Number of new message: ]
-[%s...\n]
-[%Y.%m.%d]
-[ %H:%M]
-[%s[b][i]%s[/i][/b]\n]
diff --git a/langpacks/english/Plugins/NewXstatusNotify.txt b/langpacks/english/Plugins/NewXstatusNotify.txt index ce2a66b048..3d9e628b53 100644 --- a/langpacks/english/Plugins/NewXstatusNotify.txt +++ b/langpacks/english/Plugins/NewXstatusNotify.txt @@ -93,7 +93,6 @@ [Protocols]
[Enable/Disable protocols which you don't wish to be notified for:]
;file \plugins\NewXstatusNotify\src\indsnd.cpp
-[%s (*.wav)%c*.WAV%c%s (*.*)%c*%c]
[Wave Files]
[All Files]
[wav]
@@ -104,8 +103,6 @@ ;file \plugins\NewXstatusNotify\src\main.cpp
[<no status message>]
[Contact]
-[\r\n]
-[ (%s)]
[connecting]
[aborting]
[playing]
@@ -163,10 +160,8 @@ [Toggle status notification]
;file \plugins\NewXstatusNotify\src\options.cpp
[%s_TSMChange]
-[%s (*.*)%c*.*%c%s (*.log)%c*.log%c%s (*.txt)%c*.txt%c]
[Log]
[log]
-[%s %s]
[This is status message]
[Do you want to reset all templates to default?]
[Reset templates]
@@ -194,7 +189,6 @@ [Activity]
[Xstatus]
[<unknown>]
-[%s (%s)]
[%s, %s. %s removed %s.\r\n]
[%s, %s. %s changed %s to: %s.\r\n]
;file \plugins\NewXstatusNotify\src\xstatus.h
diff --git a/langpacks/english/Plugins/New_GPG.txt b/langpacks/english/Plugins/New_GPG.txt index b4103bc192..6cc23c1c4d 100644 --- a/langpacks/english/Plugins/New_GPG.txt +++ b/langpacks/english/Plugins/New_GPG.txt @@ -60,6 +60,7 @@ [Strip all tags in outgoing messages]
[Turn on presence signing (Jabber) (required by xep 0-27)]
;file \plugins\New_GPG\src\gpg_wrapper.cpp
+[" --homedir "]
[LANGUAGE=en@quot\0LC_ALL=English\0]
;file \plugins\New_GPG\src\init.cpp
[<GPGdec>]
@@ -90,6 +91,7 @@ [Failed to open file]
[Error]
[Generating new random key, please wait]
+[\\GnuPG\\gnupg.nls\\en@quot.mo]
[gpg binary found in miranda folder, but english locale does not exists.\nit's highly recommended to place \\gnupg.nls\\en@quot.mo in gnupg folder under miranda root.\nwithout this file you may expirense many problem with gpg output on non english systems.\nand plugin may completely do not work.\nyou have beed warned.]
[Warning]
[Software\\GNU\\GnuPG]
@@ -103,6 +105,7 @@ [\\GnuPG]
[gpg]
[Your GPG version is supported. The language file was found.\nGPG plugin should work fine.\nPress OK to continue.]
+[Choose gpg.exe]
[Set home diractory]
[gpg binary does not exists.\nplease choose another location]
[please choose gpg binary location]
@@ -125,6 +128,7 @@ [Expiration date]
[Failed to export public key.]
[ --keyserver "]
+[" --recv-keys ]
[access_test\n]
[TEMP]
[GPG binary is set and valid (this is good).\n]
@@ -153,9 +157,7 @@ [\\tmp\\]
[ -d -a "]
[failed to decrypt message, GPG returned error, turn on debug log for more details]
-[.asc]
[GPG_Key_Auto_Exchange:0]
-[\r\n]
[We trying to encrypt with untrusted key, do you want to trust this key permanently ?]
[failed o encrypt message, GPG returned error, turn on debug log for more details]
[Something wrong, gpg does not understand us, aborting encryption.]
@@ -193,9 +195,7 @@ [Where is no public or private key.]
;file \plugins\New_GPG\src\utilities.cpp
[Do you want to toggle encryption for all subcontacts ?]
-[%s: %s]
[Send publick key]
-[.gpg]
[ -o ]
[Target file exists, do you want to replace it ?]
[ -d "]
@@ -222,4 +222,3 @@ [Keys export result]
[Choose file to import keys from]
[Keys import result]
-[\r\r]
diff --git a/langpacks/english/Plugins/NewsAggregator.txt b/langpacks/english/Plugins/NewsAggregator.txt index 872db10cd9..a179b721f1 100644 --- a/langpacks/english/Plugins/NewsAggregator.txt +++ b/langpacks/english/Plugins/NewsAggregator.txt @@ -51,7 +51,6 @@ [Enter Feed URL]
[Enter checking interval]
[Enter message format]
-[%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s]
[The title of the item.]
[The item synopsis.]
[The URL of the item.]
@@ -64,25 +63,15 @@ [Tags Mask Reset]
[Wait...]
[Change Feed]
-[%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s]
[Contact deleting]
[Network]
;file \plugins\NewsAggregator\Src\Services.cpp
[Enable/disable auto update]
;file \plugins\NewsAggregator\Src\Utils.cpp
[NewsAggregator HTTP connection]
-[.jpg]
-[.jpeg]
-[.png]
-[.gif]
-[.ico]
-[.bmp]
-[.swf]
-[.xml]
[Cannot upload VersionInfo. Incorrect username or password]
[Cannot upload VersionInfo. Unknown error]
[Feed]
-[%3s, %d %3s %d %d:%d:%d %1s%02d%02d]
[Jan]
[Feb]
[Mar]
@@ -95,14 +84,13 @@ [Oct]
[Nov]
[Dec]
-[%04d%02d%02dT%02d:%02d:%02d]
-[%d-%d-%d %d:%d:%d %1s%02d%02d]
-[%d:%d:%d]
[rss]
[rdf]
[title]
+[%s\nis a valid feed's address.]
[New Aggregator]
[feed]
+[%s\nis a not valid feed's address.]
[version]
[RSS %s]
[RSS 1.0]
diff --git a/langpacks/english/Plugins/PManagerEx.txt b/langpacks/english/Plugins/PManagerEx.txt index 9d7d01cbdb..e5f0cec037 100644 --- a/langpacks/english/Plugins/PManagerEx.txt +++ b/langpacks/english/Plugins/PManagerEx.txt @@ -4,7 +4,8 @@ [open]
[Miranda NG will exit and Database checker will start.\n\nAre you sure you want to do this?]
[Check Database]
-[%miranda_profilename%]
+["%s" /restart:%d /svc:dbchecker]
+["%s" /restart:%d /profile=%s]
[Database]
[Load profile]
[Change profile]
diff --git a/langpacks/english/Plugins/PackUpdater.txt b/langpacks/english/Plugins/PackUpdater.txt index 1c2286d943..0001cf4872 100644 --- a/langpacks/english/Plugins/PackUpdater.txt +++ b/langpacks/english/Plugins/PackUpdater.txt @@ -52,14 +52,18 @@ [Component Name]
[Current Version]
[New Version]
-[.html]
+[%s\\Pack]
+[%s\\Plugins]
+[%s\\Icons]
+[%s\\Others]
+[%s\\Backups]
[Downloading pack updates...]
[Downloading update...]
[Downloads complete. Start updating? All your data will be saved and Miranda NG will be closed.]
[Download complete. Start updating? All your data will be saved and Miranda NG will be closed.]
[%miranda_path%\\Plugins]
+[%s\\Backups\\%s]
[%miranda_path%\\Icons]
-[%miranda_path%]
[You have chosen not to install the pack update immediately.\nYou can install it manually from this location:\n\n%s]
;file \plugins\PackUpdater\Src\Notifications.h
[Close popup]
@@ -76,7 +80,6 @@ ['Yes' Button]
['No' Button]
[Pack Updater HTTP connection]
-[%d.%d.%d.%d]
[URL for checking updates not found.]
[Downloading version info...]
[FileInfo_%d]
@@ -92,8 +95,6 @@ [Force]
[Plugins\\%s]
[Plugins\\%s\\%s]
-[%SystemRoot%]
-[%ProgramFiles%]
[Update is not possible!\nYou have no Administrator's rights.\nPlease run Miranda NG with Administrator's rights.]
[No updates found.]
[No files for update.]
diff --git a/langpacks/english/Plugins/PasteIt.txt b/langpacks/english/Plugins/PasteIt.txt index ab37f7331e..8d03dad084 100644 --- a/langpacks/english/Plugins/PasteIt.txt +++ b/langpacks/english/Plugins/PasteIt.txt @@ -60,7 +60,6 @@ [Web page]
;file \plugins\PasteIt\src\PasteIt.cpp
[All Files (*.*)]
-[\0*.*\0]
[Paste It - Select file]
[Error]
[Paste from clipboard]
diff --git a/langpacks/english/Plugins/PluginUpdater.txt b/langpacks/english/Plugins/PluginUpdater.txt index 41b9fdcb8d..b9cb916270 100644 --- a/langpacks/english/Plugins/PluginUpdater.txt +++ b/langpacks/english/Plugins/PluginUpdater.txt @@ -48,6 +48,8 @@ [Boxes]
[PopUps]
;file \plugins\PluginUpdater\src\Notifications.cpp
+[%s\\Backups]
+[%s\\Temp]
[Skipped.]
[Will be deleted!]
[Downloading...]
@@ -56,11 +58,8 @@ [Plugin Updater]
[Download complete. Start updating? All your data will be saved and Miranda NG will be closed.]
[You have chosen not to install the plugin updates immediately.\nYou can install it manually from this location:\n\n%s]
-[%miranda_path%]
-[.test]
[Component Name]
[State]
-[%miranda_profilename%]
[ /restart:%d /profile=%s]
;file \plugins\PluginUpdater\src\Notifications.h
[Close popup]
@@ -74,8 +73,6 @@ [%miranda_path%\"DEFAULT_UPDATES_FOLDER)));\r\n lstrcpyn(tszRoot, tszFolder, SIZEOF(tszRoot));\r\n }\r\n\r\n LoadOptions();\r\n InitPopupList();\r\n NetlibInit();\r\n IcoLibInit();\r\n\r\n // Add cheking update menu item\r\n hCheckUpdates = CreateServiceFunction(MODNAME"/CheckUpdates", MenuCommand);\r\n\r\n CLISTMENUITEM mi = { sizeof(mi) };\r\n mi.position = -0x7FFFFFFF;\r\n mi.flags = CMIF_ICONFROMICOLIB;\r\n mi.icolibItem = Skin_GetIconHandle("check_update]
[Check for plugin updates]
;file \plugins\PluginUpdater\src\Scanner.cpp
-[.dll]
-[.exe]
[platform]
[Downloading version info...]
[An error occured while downloading the update.]
@@ -85,5 +82,6 @@ ['Yes' Button]
['No' Button]
[Plugin Updater HTTP connection]
+["%s" /restart:%d /profile=%s]
;file \plugins\PluginUpdater\src\Minizip\ioapi.c
[r+b]
diff --git a/langpacks/english/Plugins/PopUp.txt b/langpacks/english/Plugins/PopUp.txt index 66e3ac07e7..9dc2aeb144 100644 --- a/langpacks/english/Plugins/PopUp.txt +++ b/langpacks/english/Plugins/PopUp.txt @@ -116,8 +116,6 @@ [Pin popup]
[Copy to clipboard]
[Action]
-;file \plugins\Popup\src\avatars.cpp
-[.gif]
;file \plugins\Popup\src\bitmap_funcs.cpp
[You need the png2dib plugin v. 0.1.3.x or later to process PNG images]
;file \plugins\Popup\src\common.h
@@ -157,11 +155,9 @@ [Error: I could not register the PopUp Window class.\r\n]
[The plugin will not operate.]
;file \plugins\Popup\src\opt_adv.cpp
-[%d%%]
[No effect]
[Fade in/out]
;file \plugins\Popup\src\opt_class.cpp
-[%s/%s]
[CLASS Plugins]
[Ph'nglui mglw'nafh Cthulhu R'lyeh wgah'nagl fhtagn!]
;file \plugins\Popup\src\opt_gen.cpp
@@ -178,7 +174,6 @@ ['Reorder Popups' option is currently diabled.\r\n]
[This may cause misaligned popups when used with\r\n]
[avatars and text replacement (mainly NewStatusNotify).\r\n]
-[\r\n]
[Do you want to enable popup reordering now?\r\n]
[Popup Plus Warning]
[Cancel]
@@ -187,7 +182,6 @@ [PopupPlusDlgBox]
[Skin preview]
[Just take a look at this skin... ;)]
-[%s/%hs]
[Show clock]
[Drop shadow effect (Windows XP+)]
[Drop shadow effect (Windows XP+)/non rectangular]
@@ -210,11 +204,8 @@ ;file \plugins\Popup\src\skin.cpp
[res:]
[Skin]
-[*.popupskin]
[* Popup Classic]
-[res:classic.popupskin]
[\\skins\\popup]
-[*.*]
[The skin you are trying to load is designed\r\n]
[for newer version of Popup Plus. And will not\r\n]
[display properly.\r\n]
diff --git a/langpacks/english/Plugins/QuickContacts.txt b/langpacks/english/Plugins/QuickContacts.txt index 20ab7bd4c3..16ed49fa9d 100644 --- a/langpacks/english/Plugins/QuickContacts.txt +++ b/langpacks/english/Plugins/QuickContacts.txt @@ -26,7 +26,6 @@ [Open contact menu]
[Show all contacts]
[Quick Contacts...]
-[%s (%s)]
[Ctrl+A]
[Send message]
[Ctrl+V]
diff --git a/langpacks/english/Plugins/QuickReplies.txt b/langpacks/english/Plugins/QuickReplies.txt index 446bbc6772..fed7edbfed 100644 --- a/langpacks/english/Plugins/QuickReplies.txt +++ b/langpacks/english/Plugins/QuickReplies.txt @@ -17,6 +17,5 @@ [Button]
[Quick Replies\r\nLeft button - open menu\r\nRight button - options page]
;file \plugins\QuickReplies\src\options.cpp
-[\r\n]
[Message Sessions]
[Quick Replies]
diff --git a/langpacks/english/Plugins/Quotes.txt b/langpacks/english/Plugins/Quotes.txt index 83e3382732..6459f09e0e 100644 --- a/langpacks/english/Plugins/Quotes.txt +++ b/langpacks/english/Plugins/Quotes.txt @@ -121,36 +121,23 @@ [blob]
[Xml File (*.xml)]
[All files (*.*)]
-[*.*]
[xml]
[Group]
;file \plugins\Quotes\src\Locale.cpp
[Control Panel\\International]
-[%d.%m.%y]
[dd/MM/yy]
-[%d/%m/%y]
[yyyy-MM-dd]
-[%y-%m-%d]
-[%H:%M:%S]
[H:mm]
[HH:mm]
-[%H:%M]
[sShortDate]
[sLongDate]
[sShortTime]
[sTimeFormat]
-;file \plugins\Quotes\src\Log.cpp
-[ ================================>\n]
-[\n\n]
;file \plugins\Quotes\src\ModuleInfo.cpp
[Miranda could not load Quotes plugin. XML parser is missing.]
[Miranda could not load Quotes plugin. Microsoft HTML parser is missing.]
-;file \plugins\Quotes\src\OptionDukasCopy.cpp
-[ - ]
;file \plugins\Quotes\src\QuoteChart.cpp
[DioksinChart]
-[%d/%m/%y %H:%M:%S]
-[%d.%m.%y %H:%M:%S]
[Log File]
[Miranda's History]
[All]
@@ -187,10 +174,7 @@ [Open]
[snap-data]
;file \plugins\Quotes\src\QuotesProviderVisitorDbSettings.cpp
-[%r>%p]
-[%s %r]
[\\nCurrent = %r\\nPrevious = %p]
-;file \plugins\Quotes\src\QuotesProviderVisitorFormater.cpp
;file \plugins\Quotes\src\QuotesProviderVisitorFormatSpecificator.cpp
[Quote Symbol]
[Quote Name]
@@ -205,11 +189,8 @@ [Fetch Time]
[Fetch Date]
[Fetch Time and Date]
-[\\%]
[Percentage Character (%)]
-[\\t]
[Tabulation]
-[\\\\]
[Left slash (\\)]
[Open Price]
[Percent Change to After Hours]
@@ -221,8 +202,6 @@ ;file \plugins\Quotes\src\QuotesProviderYahoo.cpp
[&f=snl1ohgpc1]
;file \plugins\Quotes\src\SettingsDlg.cpp
-[%quotename%]
-[%miranda_userdata%]
[Log Files (*.txt,*.log)]
[log]
[Enter integer value]
@@ -230,9 +209,6 @@ [Enter log file format.]
[Enter history format.]
[Enter popup window format.]
-[.log]
-;file \plugins\Quotes\src\WinCtrlHelper.cpp
-[\r\n]
;file \plugins\Quotes\src\XMLEngineMI.cpp
[version]
[encoding]
diff --git a/langpacks/english/Plugins/Restart.txt b/langpacks/english/Plugins/Restart.txt index 9910881894..104c3966c5 100644 --- a/langpacks/english/Plugins/Restart.txt +++ b/langpacks/english/Plugins/Restart.txt @@ -1,5 +1,5 @@ ;#muuid not found, please specify manually!
;langpack template for Restart
;file \plugins\Restart\src\restart.cpp
-[%miranda_profilename%]
+["%s" /restart:%d /profile=%s]
[Restart]
diff --git a/langpacks/english/Plugins/Scriver.txt b/langpacks/english/Plugins/Scriver.txt index 9e40dd88ff..189abe2a39 100644 --- a/langpacks/english/Plugins/Scriver.txt +++ b/langpacks/english/Plugins/Scriver.txt @@ -213,8 +213,6 @@ [Baltic]
[Vietnamese]
[Korean (Johab)]
-;file \plugins\Scriver\src\infobar.cpp
-[%s (%s)]
;file \plugins\Scriver\src\input.cpp
[mailto:]
;file \plugins\Scriver\src\msgdialog.cpp
@@ -225,7 +223,6 @@ [User Details]
[History]
[Send]
-[\\*]
[Look up '%s':]
[Add Contact Permanently to List]
[View User's Details]
@@ -300,7 +297,6 @@ [User list background]
[User list members (away)]
[Messaging]
-[%s/%s]
[User list lines]
[User list background (selected)]
[Offline]
@@ -329,29 +325,18 @@ [Outgoing]
;file \plugins\Scriver\src\msgtimedout.cpp
[An unknown error has occured.]
-[%s - %s]
[Send Error]
;file \plugins\Scriver\src\msgwindow.cpp
-[%name%]
-[%status%]
-[%statusmsg%]
-[%account%]
[Message Session]
-[%name% - ]
-[%name% (%status%) : ]
[Always On Top]
;file \plugins\Scriver\src\sendqueue.cpp
[The message send timed out.]
-;file \plugins\Scriver\src\utils.cpp
;file \plugins\Scriver\src\chat\clist.cpp
[Chat rooms]
[Join chat]
[Open chat window]
;file \plugins\Scriver\src\chat\colorchooser.cpp
;file \plugins\Scriver\src\chat\log.cpp
-[%%%c#%02X%02X%02X]
-[%%%c]
-[%s ]
[%s has joined]
[You have joined %s]
[%s has left]
@@ -426,57 +411,33 @@ [Show pop-up for status changes]
[Appearance and functionality of chat windows]
[Icons to display in the tray]
-[%s - %s\n%s - %s\n%s - %s\n\n]
-[%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n\n]
-[%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s]
-[%nick%]
[nick of current contact (if defined)]
-[%proto%]
[protocol name of current contact (if defined). Account name is used when protocol supports multiaccounts]
-[%userid%]
[UserID of current contact (if defined). It is like UIN Number for ICQ, JID for Jabber, etc.]
-[%miranda_path%]
[path to root miranda folder]
-[%miranda_profile%]
[path to current miranda profile]
-[%miranda_profilename%]
[name of current miranda profile (filename, without extension)]
-[%miranda_userdata%]
[will return parsed string %miranda_profile%\\Profiles\\%miranda_profilename%]
-[%appdata%]
[same as environment variable %APPDATA% for currently logged-on Windows user]
-[%username%]
[username for currently logged-on Windows user]
-[%mydocuments%]
-[%desktop%]
-[%xxxxxxx%]
+["My Documents" folder for currently logged-on Windows user]
+["Desktop" folder for currently logged-on Windows user]
[any environment variable defined in current Windows session (like %systemroot%, %allusersprofile%, etc.)]
-[%d%]
[day of month, 1-31]
-[%dd%]
[day of month, 01-31]
-[%m%]
[month number, 1-12]
-[%mm%]
[month number, 01-12]
-[%mon%]
[abbreviated month name]
-[%month%]
[full month name]
-[%yy%]
[year without century, 01- 99]
-[%yyyy%]
[year with century, 1901-9999]
-[%wday%]
[abbreviated weekday name]
-[%weekday%]
[full weekday name]
[Variables]
[Appearance]
[Default events to show in new chat rooms if the 'event filter' is enabled]
[Select Folder]
[PopUps]
-[%n:]
[Group chats]
[Message is highlighted]
[User has performed an action]
@@ -488,7 +449,6 @@ ;file \plugins\Scriver\src\chat\services.cpp
[Server: %s]
;file \plugins\Scriver\src\chat\tools.cpp
-[ - %s]
[%s wants your attention in %s]
[%s speaks in %s]
[%s has joined %s]
@@ -499,7 +459,6 @@ [%s enables '%s' status for %s in %s]
[%s disables '%s' status for %s in %s]
[%s says: %s]
-[%s %s]
[%s has left (%s)]
[%s has disconnected (%s)]
[%s kicked %s (%s)]
@@ -507,9 +466,6 @@ [The topic is '%s']
[The topic is '%s' (set by %s)]
[ab+]
-[%s * %s]
-[%s %c %s\r\n]
-[%s %s\r\n]
[%#d]
[%#m]
[mon]
@@ -536,15 +492,11 @@ [Show/hide the nicklist (CTRL+N)]
[Control this room (CTRL+O)]
[Enable/disable the event filter (CTRL+F)]
-[%s: %s\r\n%s: %s\r\n%s: %s]
[AQG_glo']
[%s: Chat Room (%u user)]
[%s: Chat Room (%u users)]
[%s: Message Session]
[%s: Message Session (%u users)]
[%s: Server]
-[%s : %s]
[AQGgl']
[AQGg']
-[%c%s]
-[%s: ]
diff --git a/langpacks/english/Plugins/SeenPlugin.txt b/langpacks/english/Plugins/SeenPlugin.txt index 135ef581b8..c56b924261 100644 --- a/langpacks/english/Plugins/SeenPlugin.txt +++ b/langpacks/english/Plugins/SeenPlugin.txt @@ -41,7 +41,6 @@ [Test\nTest]
[Alert when user status changes]
;file \plugins\SeenPlugin\src\history.cpp
-[%s: %s]
[last seen history]
[View User's Details]
[User Menu]
@@ -59,8 +58,6 @@ ;file \plugins\SeenPlugin\src\menu.cpp
[<unknown>]
[<none>]
-;file \plugins\SeenPlugin\src\missed.cpp
-[ [%i]]
;file \plugins\SeenPlugin\src\options.cpp
[Last Seen Variables]
[Contacts]
@@ -140,8 +137,6 @@ [Nov.]
[Dec.]
[<never seen>]
-[%04i]
-[%02i]
[Idle]
[ProtoUnknown]
[\x0D\x0A]
diff --git a/langpacks/english/Plugins/SendSS.txt b/langpacks/english/Plugins/SendSS.txt index 793d36b8d7..353b084999 100644 --- a/langpacks/english/Plugins/SendSS.txt +++ b/langpacks/english/Plugins/SendSS.txt @@ -30,7 +30,6 @@ [Target Tool]
;file \plugins\SendScreenshotPlus\src\CSend.cpp
[Unable to initiate transfer.]
-[\r\n]
[Initialising...]
[Connecting...]
[Connecting to proxy...]
@@ -44,7 +43,6 @@ [%s (%i):\nAn internal GC error occurred.]
[%s (%i):\nContact has no open GC session.]
[An unknown error has occured.]
-[%s - %s]
[Error]
;file \plugins\SendScreenshotPlus\src\CSend.h
[Unable to initiate %s.]
@@ -107,7 +105,6 @@ [Warning: No IconPack found in one of the following directories: 'customize\\icons', 'icons' or 'plugins'!]
[Plugins\\]
;file \plugins\SendScreenshotPlus\src\UAboutForm.cpp
-[\r\n\r\n]
[Credits]
[< Copyright]
[Copyright]
@@ -117,7 +114,6 @@ [Window]
[Desktop]
[<entire desktop>]
-[%i. %s%s]
[Monitor]
[ (primary)]
[PNG]
@@ -133,7 +129,6 @@ [ImageShack]
[Information]
[Open Folder]
-[...]
[Fill description textbox.]
[Delete after send]
[Capture]
@@ -143,9 +138,8 @@ [Screenshot ]
[for Client area ]
[of "]
+[" Window]
[png]
[jpg]
[bmp]
-[.tif]
[gif]
-[.gif]
diff --git a/langpacks/english/Plugins/Sessions.txt b/langpacks/english/Plugins/Sessions.txt index 4fd598f811..325a7393f1 100644 --- a/langpacks/english/Plugins/Sessions.txt +++ b/langpacks/english/Plugins/Sessions.txt @@ -49,7 +49,6 @@ [Sessions Manager]
[Session name is empty, enter the name and try again]
[No sessions to open]
-[%s - %s]
[Last Sessions is empty]
[No contacts to open]
[This Session already opened]
diff --git a/langpacks/english/Plugins/SimpleAR.txt b/langpacks/english/Plugins/SimpleAR.txt index 768c221f53..d5f05968d4 100644 --- a/langpacks/english/Plugins/SimpleAR.txt +++ b/langpacks/english/Plugins/SimpleAR.txt @@ -25,7 +25,6 @@ [Turn off Autoanswer]
[Turn on Autoanswer]
[Dear %user%, the owner left the following message:]
-[%user%]
;file \plugins\SimpleAR\src\Options.cpp
[Simple Auto Replier]
[Plugins]
diff --git a/langpacks/english/Plugins/SimpleStatusMsg.txt b/langpacks/english/Plugins/SimpleStatusMsg.txt index 00e4f1f7f4..80783c0d18 100644 --- a/langpacks/english/Plugins/SimpleStatusMsg.txt +++ b/langpacks/english/Plugins/SimpleStatusMsg.txt @@ -101,7 +101,6 @@ [ - Winamp]
[SimpleStatusMsg]
[%rand(]
-[,)%%]
[Change Status Message]
[Open Status Message Dialog]
[Status Message]
@@ -128,7 +127,6 @@ [Show next to cancel button]
[Flat, next to cancel button]
[Show in message list]
-[%s *]
[Are you sure you want to clear predefined status messages?]
[Confirm clearing predefined]
[<Last status>]
diff --git a/langpacks/english/Plugins/SmileyAdd.txt b/langpacks/english/Plugins/SmileyAdd.txt index aa317b61cb..be721621f8 100644 --- a/langpacks/english/Plugins/SmileyAdd.txt +++ b/langpacks/english/Plugins/SmileyAdd.txt @@ -33,13 +33,10 @@ [Max "Custom Smiley" height]
[High Quality smiley scaling]
[Min smiley height]
-;file \plugins\SmileyAdd\src\customsmiley.cpp
-[\\*.*]
;file \plugins\SmileyAdd\src\dlgboxsubclass.cpp
[Edit]
[Show Smiley Selection Window]
;file \plugins\SmileyAdd\src\download.cpp
-[.*/(.*)]
[\\SmileyCache]
[%miranda_userdata%\\SmileyCache]
[SmileyAdd HTTP connections]
@@ -68,10 +65,7 @@ [Top]
[Bottom]
[Smiley Packs]
-[ (*.msl;*.asl;*.xep)]
[All Files]
-[ (*.*)]
-[*.*]
[msl]
;file \plugins\SmileyAdd\src\services.cpp
[<None>]
@@ -82,18 +76,12 @@ [Time elapsed: %u]
;file \plugins\SmileyAdd\src\smileys.cpp
[hContact]
-[(.*)\\|(.*)\\|(.*)]
[(?:ftp|https|http|file|aim|webcal|irc|msnim|xmpp|gopher|mailto|news|nntp|telnet|wais|prospero)://?[\\w.?%:/$+;]*]
-[\\d{1,2}:\\d{2}:\\d{2}|\\d{1,2}:\\d{2}]
-[\\s+]
-[%%_{1,2}%%]
-[%%''%%]
+[[\\s"][a-zA-Z]:[\\\\/][\\w.\\-\\\\/]*]
[Nothing loaded]
[Smiley Pack %s not found.\n]
[Select correct Smiley Pack in the Miranda Options | Customize | Smileys.]
-[.xep]
[There were problems loading smiley pack (it should be corrected).\nSee Network Log for details.]
-[(.*\\\\)(.*)\\.|$]
[^\\s*(Name|Author|Date|Version|ButtonSmiley)\\s*=\\s*"(.*)"]
[Name]
[Author]
@@ -103,10 +91,7 @@ [^\\s*(Selection|Window)Size\\s*=\\s*(\\d+)\\s*,\\s*(\\d+)]
[Selection]
[Window]
-[(?:\\s*"(.*)\]
-[(?:[\\s,]+(\\-?\\d+))]
[(?:[\\s,]+(R|S)?"(.*?)\]
-[(?:[\\s,]+"(.*?)\]
[Smiley #%u in file %s for Smiley Pack %s not found.]
[<]
[>]
diff --git a/langpacks/english/Plugins/SpellChecker.txt b/langpacks/english/Plugins/SpellChecker.txt index c55d1f9390..60d4223843 100644 --- a/langpacks/english/Plugins/SpellChecker.txt +++ b/langpacks/english/Plugins/SpellChecker.txt @@ -49,14 +49,11 @@ [Tagalog (Philippines)]
[de_frami_neu]
[German (Germany)]
-[%s_%s]
-[%s (%s)]
-[%s [%s]]
-[.aff]
[Thunderbird]
[Firefox]
[Software\\Microsoft\\Windows\\ShellNoRoam\\MUICache]
[Path]
+[%s\\Dictionaries]
;file \plugins\SpellChecker\src\options.cpp
[Message Sessions]
[Auto-replacements]
diff --git a/langpacks/english/Plugins/SplashScreen.txt b/langpacks/english/Plugins/SplashScreen.txt index ac6bf1c93a..ba0e742fca 100644 --- a/langpacks/english/Plugins/SplashScreen.txt +++ b/langpacks/english/Plugins/SplashScreen.txt @@ -24,50 +24,13 @@ [Fade out:]
[Advaimg library not found. Please get it from nigtlies to be able to use images.]
[Preview...]
-;file \plugins\SplashScreen\src\bitmap_funcs.cpp
-[.png]
-[Loading splash file]
-[done]
-[MyBitmap::loadFromFile]
-[Bitmap load failed]
-;file \plugins\SplashScreen\src\debug.h
-[%s:\t\t%s\n]
;file \plugins\SplashScreen\src\main.cpp
-[%miranda_path%]
-[Miranda version]
-[Dll Name]
-[Advaimg path]
[Your advaimg.dll is either obsolete or damaged. Get latest from Miranda alpha builds.]
[Error]
-[Loading advaimg]
-[SoundFilePath]
-[Found file]
-[Extention]
-[.bmp]
-[File has valid ext]
-[final file]
-[Skin]
-[UseSound]
-[Sounds enabled.]
-[Sounds disabled.]
-[Module]
-[Setting]
-[Value]
-[PluginDisable]
-[Disabled.]
-[Enabled.]
-[PlugDisableHook]
-[Triggered]
-[Posted WM_LOADED message]
[Call Splash Service]
-[Loading modules]
-[Unload]
-[Job done]
;file \plugins\SplashScreen\src\options.cpp
-[%s (*.png, *.bmp)%c*.png;*.bmp%c%c]
[Graphic files]
[Set path]
-[%s (*.wav, *.mp3)%c*.wav;*.mp3%c%c]
[Sound Files]
[Set sound path]
[Skins]
@@ -88,6 +51,7 @@ [Timer TimeToShow]
[set]
[Timer Modules loaded]
+[Loading splash file]
[Thread]
[start]
[Preview]
diff --git a/langpacks/english/Plugins/StartupStatus.txt b/langpacks/english/Plugins/StartupStatus.txt index 5cc1a060df..827433235b 100644 --- a/langpacks/english/Plugins/StartupStatus.txt +++ b/langpacks/english/Plugins/StartupStatus.txt @@ -8,7 +8,6 @@ ;file \plugins\StatusPlugins\StartupStatus\options.cpp
[<last>]
[<current>]
-[.\\%s]
[Left]
[Right]
[None]
diff --git a/langpacks/english/Plugins/StopSpam.txt b/langpacks/english/Plugins/StopSpam.txt index 3d625d110c..6786f03bbf 100644 --- a/langpacks/english/Plugins/StopSpam.txt +++ b/langpacks/english/Plugins/StopSpam.txt @@ -27,16 +27,8 @@ [Main]
[Messages]
[Protocols]
-;file \plugins\StopSpamPlus\src\headers.h
-[ \f\n\r\t\v]
;file \plugins\StopSpamPlus\src\options.cpp
-[No more spam! Robots can't go! Only human beings invited!\r\n\r\n]
-[This plugin works pretty simple:\r\n]
-[While 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.]
+[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]
;file \plugins\StopSpamPlus\src\services.cpp
[Not In List]
@@ -46,9 +38,7 @@ [Please reply "nospam" without quotes and spaces if you want to contact me.\r\n]
[Внимание! Антиспам защита. Ответьте "nospam" без кавычек и пробелов, если хотите связаться со мной.]
[StopSpam: send a message and reply to a anti-spam bot question.\r\n]
-[Антиспам: отправьте сообщение и ответьте на вопрос антиспам системы.]
[nospam]
[Congratulations! You just passed human/robot test. Now you can write me a message.\r\n]
-[Поздравляю! Вы прошли антиспам проверку. Теперь вы можете писать мне.]
;file \plugins\StopSpamPlus\src\stopspam.cpp
[Remove Temporary Contacts]
diff --git a/langpacks/english/Plugins/StopSpamMod.txt b/langpacks/english/Plugins/StopSpamMod.txt index e321c9d164..a51429bdda 100644 --- a/langpacks/english/Plugins/StopSpamMod.txt +++ b/langpacks/english/Plugins/StopSpamMod.txt @@ -51,12 +51,14 @@ [Spammers]
[NotSpammers]
[Not Spammers]
+[Remove Temporary Contacts]
;file \plugins\StopSpamMod\src\options.cpp
-[Spammers made me to install small anti-spam system you are now speaking with.\r\n]
-[Please reply "nospam" without quotes and spaces if you want to contact me.]
+[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.]
[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 ruandom number and answer will be expression result\nMessage must contain only one expression without spaces]
[Info]
[Message Sessions]
+[StopSpam]
[Main]
[Messages]
[Protocols]
@@ -68,15 +70,3 @@ [Mark for delete]
[Deleted]
[Not In List]
-[www]
-[.ru]
-[.com]
-[.de]
-[.cz]
-[.org]
-[.net]
-[.su]
-[.ua]
-[.tv]
-[ - ]
-[): ]
diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt index ea0390f871..9d9c3bd22d 100644 --- a/langpacks/english/Plugins/TabSRMM.txt +++ b/langpacks/english/Plugins/TabSRMM.txt @@ -471,12 +471,10 @@ [The requested action requires a valid contact selection. Please select a contact from the contact list and repeat]
[Parameter mismatch]
[TSStatusBarClass]
-[%%%d.%ds...]
[Message Session]
[Default container]
[Attach to]
[Meta Contact]
-[%s: %s [%s] %s]
[(Forced)]
[Autoselect]
[Use Protocol]
@@ -526,16 +524,11 @@ [found stale popup %s]
[One of your popup actions is set to DISMISS EVENT.\nNote that this options may have unwanted side effects as it REMOVES the event from the unread queue.\nThis may lead to events not showing up as "new". If you don't want this behaviour, please review the Event Notifications settings page.]
[Incoming file]
-[%s: %s (%s)]
[No description given]
[Incoming file (invalid format]
[Unknown event]
-[%s %d\n]
[New messages: ]
-[%Y.%m.%d %H:%M]
-[\n\n%s\n]
[Unknown module or contact]
-[%s: %s (%s) [%d]]
[(undef)]
;file \plugins\TabSRMM\src\generic_msghandlers.cpp
[Rich Edit file]
@@ -548,13 +541,11 @@ [Last received: %s at %s]
[%s has entered text.]
[Autoscrolling is disabled, %d message(s) queued (press F12 to enable it)]
-[%s (%s)]
[Forward]
[UID: %s (SHIFT click -> copy to clipboard)\nClick for User's Details\nRight click for MetaContact control\nClick dropdown to add or remove user from your favorites.]
[No UID]
[UID: %s (SHIFT click -> copy to clipboard)\nClick for User's Details\nClick dropdown to change this contact's favorite status.]
;file \plugins\TabSRMM\src\globals.cpp
-[%n (%s)]
[TabSRMM runtime error]
[Instant messages]
[Incoming (Focused Window)]
@@ -615,10 +606,8 @@ [Copy To Clipboard]
[\\tab \\ul\\b Status message:\\ul0\\b0 \\par %s]
[\\par\\par\\tab \\ul\\b Extended status information:\\ul0\\b0 \\par ]
-[ / ]
[\\par\\par\\tab \\ul\\b Listening to:\\ul0\\b0 \\par %s]
[\\par\\par\\ul\\b Client:\\ul0\\b0 %s]
-[\r\n]
[\\line ]
[tabSRMM Information]
[Set panel visibility for this %s]
@@ -637,6 +626,8 @@ ;file \plugins\TabSRMM\src\mim.cpp
[%stabSRMM]
[%sLogs\\]
+[%s\\skins\\]
+[%s\\Saved Contact Pictures]
;file \plugins\TabSRMM\src\modplus.cpp
[Insert [img] tag / surround selected text with [img][/img]]
;file \plugins\TabSRMM\src\msgdialog.cpp
@@ -664,16 +655,13 @@ [Contact is offline and this protocol does not support sending files to offline users.]
;file \plugins\TabSRMM\src\msgdlgutils.cpp
[SHELLDLL_DefView]
-[%04u %02u %02u_%02u%02u]
[Error creating destination directory]
[Save contact picture]
[My Avatar_%s]
-[%s_%s]
[png]
[Image files]
[The file exists. Do you want to overwrite it?]
[Set Your Avatar...]
-[ | ]
[\\pard]
[\\cf]
[\\highlight]
@@ -686,13 +674,9 @@ [\\rdblquote]
[\\lquote]
[\\rquote]
-[\\b]
-[\\i]
[\\strike]
[\\ul]
[\\tab]
-[ !$%()#*"']
-[ !§$%&()#*]
[MIME\\Database\\Rfc1766]
[The 'paste and send' feature is disabled. You can enable it on the 'General' options page in the 'Sending Messages' section]
[Either the nudge plugin is not installed or the contact's protocol does not support sending a nudge event.]
@@ -740,8 +724,6 @@ [WMA]
[Use default codepage]
;file \plugins\TabSRMM\src\msgoptions.cpp
-[%s*.*]
-[.tsk]
[Name]
[None]
[<no skin>]
@@ -781,8 +763,6 @@ [The image service plugin (advaimg.dll) is not properly installed.\n\nTabSRMM is disabled.]
[TabSRMM fatal error]
[Warning: trying to create duplicate window]
-[%s (%s) ]
-[%s ]
[Image tag]
[Quote text]
[Save and close]
@@ -822,9 +802,7 @@ ;file \plugins\TabSRMM\src\sendlater.cpp
[A send later job completed successfully.\nThe original message: %s]
[A send later job failed to complete.\nThe original message: %s]
-[%Y.%m.%d - %H:%M]
[<All contacts>]
-[%s [%s]]
[Removed]
[Failed]
[Sent OK]
@@ -883,11 +861,7 @@ [%s on %s%s]
;file \plugins\TabSRMM\src\templates.cpp
[%I %S %N %?&D%\\&E%\\!, %\\T%\\!: %?n%?S %?T%?|%M]
-[%S %T%|%M]
[%I %S %&D, %&T, %N %M%! ]
-[%I%S %D, %T, %e%l%M]
-[%I %S %N %D%n%S %T%|%M]
-[%I%S %D, %T, %N %M%! ]
[Template Set Editor]
[This will reset the template set to the default built-in templates. Are you sure you want to do this?]
[Template set was successfully reset, please close and reopen all message windows. This template editor window will now close.]
@@ -895,6 +869,7 @@ ;file \plugins\TabSRMM\src\themeio.cpp
[TabSRMM Theme]
[Cookie]
+[%s%c*.tabsrmm%c%c]
[tabSRMM themes]
[tabsrmm]
;file \plugins\TabSRMM\src\themes.cpp
@@ -940,7 +915,6 @@ [TabTextUnread]
[TabTextHottrack]
[Glyph]
-[%d,%d,%d,%d]
[Image]
[Alpha]
[Fillcolor]
@@ -1115,11 +1089,7 @@ [Message Log]
;file \plugins\TabSRMM\src\utils.cpp
[\xAA]
-[%02d]
[*/_]
-[%%%]
-[%s...]
-[%06x]
[\\red%[^ \x5b\\]\\green%[^ \x5b\\]\\blue%[^ \x5b;];]
[\\colortbl]
[\\red]
@@ -1143,9 +1113,6 @@ [Text color]
[Background color]
;file \plugins\TabSRMM\src\chat\log.cpp
-[%%%c#%02X%02X%02X]
-[%%%c]
-[%s ]
[%s has joined]
[You have joined %s]
[%s has left]
@@ -1306,50 +1273,27 @@ [Incremental search highlight]
[Fields background]
[Userlist background]
-[%s - %s\n%s - %s\n%s - %s\n\n]
-[%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n\n]
-[%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s]
-[%nick%]
[nick of current contact (if defined)]
-[%proto%]
[protocol name of current contact (if defined). Account name is used when protocol supports multiaccounts]
-[%userid%]
[UserID of current contact (if defined). It is like UIN Number for ICQ, JID for Jabber, etc.]
-[%miranda_path%]
[path to root miranda folder]
-[%miranda_profile%]
[path to current miranda profile]
-[%miranda_profilename%]
[name of current miranda profile (filename, without extension)]
-[%miranda_userdata%]
[will return parsed string %miranda_profile%\\Profiles\\%miranda_profilename%]
-[%appdata%]
[same as environment variable %APPDATA% for currently logged-on Windows user]
-[%username%]
[username for currently logged-on Windows user]
-[%mydocuments%]
-[%desktop%]
-[%xxxxxxx%]
+["My Documents" folder for currently logged-on Windows user]
+["Desktop" folder for currently logged-on Windows user]
[any environment variable defined in current Windows session (like %systemroot%, %allusersprofile%, etc.)]
-[%d%]
[day of month, 1-31]
-[%dd%]
[day of month, 01-31]
-[%m%]
[month number, 1-12]
-[%mm%]
[month number, 01-12]
-[%mon%]
[abbreviated month name]
-[%month%]
[full month name]
-[%yy%]
[year without century, 01-99]
-[%yyyy%]
[year with century, 1901-9999]
-[%wday%]
[abbreviated weekday name]
-[%weekday%]
[full weekday name]
[Variables]
[All Files]
@@ -1358,7 +1302,6 @@ [No markers]
[Show as icons]
[Show as text symbols]
-[%n:]
[AQGglo]
[Message is highlighted]
[User has performed an action]
@@ -1373,7 +1316,6 @@ [Server: %s]
[Chat Rooms]
;file \plugins\TabSRMM\src\chat\tools.cpp
-[ - %s]
[%s wants your attention in %s]
[%s speaks in %s]
[%s has joined %s]
@@ -1383,7 +1325,7 @@ [Information in %s]
[%s enables '%s' status for %s in %s]
[%s disables '%s' status for %s in %s]
-[%s %s]
+[%s%s says:%s %s]
[%s has left (%s)]
[%s has disconnected (%s)]
[%s kicked %s (%s)]
@@ -1391,15 +1333,11 @@ [The topic is '%s']
[The topic is '%s' (set by %s)]
[ab+]
-[%s: %s]
-[%s %c %s\r\n]
-[%s %s\r\n]
-[%Y%m%d-%H%M%S]
+[%s%sarchived\\]
[Look up '%s':]
[No word to look up]
[Highlight User...]
[Edit Highlight List...]
-[%a%d%m%Y]
[%#d]
[%#m]
[mon]
@@ -1408,7 +1346,6 @@ [wday]
[weekday]
;file \plugins\TabSRMM\src\chat\window.cpp
-[%s: %s\r\n%s: %s\r\n%s: %s]
[Nick name]
[Unique Id]
[Nick]
@@ -1425,8 +1362,6 @@ [minutes]
[minute]
[, %d %s idle]
-[%s:]
-[%s: ]
[The filter canoot be enabled, because there are no event types selected either global or for this chat room]
[Event filter error]
;file \plugins\TabSRMM\src\include\contactcache.h
@@ -1443,4 +1378,3 @@ [cyan]
[black]
[white]
-[\\*]
diff --git a/langpacks/english/Plugins/Tipper.txt b/langpacks/english/Plugins/Tipper.txt index 982789ee68..a2761678d0 100644 --- a/langpacks/english/Plugins/Tipper.txt +++ b/langpacks/english/Plugins/Tipper.txt @@ -96,7 +96,6 @@ [Append protocol name]
;file \plugins\TipperYM\src\mir_smileys.cpp
[Tipper smileys]
-[...]
;file \plugins\TipperYM\src\options.cpp
[sys:status_msg]
[Last message: (%sys:last_msg_reltime% ago)]
@@ -168,10 +167,7 @@ [Copy avatar]
[<No Label>: ]
[<No Value>]
-[\r\n]
-[(%d/%d)]
[Fav. contacts]
-[%s (%s)]
[Other]
[Miranda uptime:]
;file \plugins\TipperYM\src\popwin.h
@@ -186,7 +182,6 @@ [Email:]
[%raw:/e-mail%]
[Gender:]
-[%gender%]
[Homepage]
[Homepage:]
[%raw:/Homepage%]
@@ -197,10 +192,8 @@ [Idle:]
[%idle% (%idle_diff% ago)]
[IP:]
-[%ip%]
[IP internal]
[IP internal:]
-[%ip_internal%]
[Last message]
[%raw:/ListeningTo%]
[Name]
@@ -212,50 +205,63 @@ [Number of sended messages]
[Number of msg [OUT]:]
[%sys:msg_count_out%]
-[%Status%]
[Contact time]
[Time:]
[%sys:time%]
[XStatus title]
[XStatus title:]
-[%xsname%]
[XStatus text]
[XStatus text:]
[%raw:/XStatusMsg%]
+[[jabber.dll] Activity title]
[Activity title:]
[%raw:AdvStatus/?dbsetting(%subject%,Protocol,p)/activity/title%]
+[[jabber.dll] Activity text]
[Activity text:]
[%raw:AdvStatus/?dbsetting(%subject%,Protocol,p)/activity/text%]
+[[menuex.dll] Logon time]
[Logon time:]
-[%logon_date% @ %logon_time% (%logon_ago%)]
+[[menuex.dll] Logoff time]
[Logoff time:]
-[%logoff_date% @ %logoff_time% (%logoff_ago%)]
+[[seenplugin.dll] Last seen time]
[Last seen time:]
-[%lastseen_date% @ %lastseen_time%]
+[[seenplugin.dll] Last seen status]
[Last seen status:]
[%lastseen_status% (%lastseen_ago% ago)]
+[[weather.dll] Condition]
[Condition:]
[%raw:Current/Condition%]
+[[weather.dll] Humidity]
[Humidity:]
[%raw:Current/Humidity%]
+[[weather.dll] Max/Min temperature]
[Max/Min:]
[%raw:Current/High%/%raw:Current/Low%]
+[[weather.dll] Moon]
[Moon:]
[%raw:Current/Moon%]
+[[weather.dll] Pressure]
[Pressure:]
[%raw:Current/Pressure% (%raw:Current/Pressure Tendency%)]
+[[weather.dll] Sunrise]
[Sunrise:]
[%raw:Current/Sunrise%]
+[[weather.dll] Sunset]
[Sunset:]
[%raw:Current/Sunset%]
+[[weather.dll] Temperature]
[Temperature:]
[%raw:Current/Temperature%]
+[[weather.dll] Update time]
[Update time:]
[%raw:Current/Update%]
+[[weather.dll] UV Index]
[UV Index:]
[%raw:Current/UV% - %raw:Current/UVI%]
+[[weather.dll] Visibility]
[Visibility:]
[%raw:Current/Visibility%]
+[[weather.dll] Wind]
[Wind:]
[%raw:Current/Wind Direction% (%raw:Current/Wind Direction DEG%)/%raw:Current/Wind Speed%]
[gender]
@@ -277,7 +283,6 @@ [logoff_time]
[logoff_ago]
;file \plugins\TipperYM\src\skin_parser.cpp
-[*.*]
[author]
[preview]
[image]
@@ -308,6 +313,12 @@ [opacity]
[enable-coloring]
[false]
+[[about]]
+[[other]]
+[[background]]
+[[sidebar]]
+[[fonts]]
+[[appearance]]
;file \plugins\TipperYM\src\subst.cpp
[uid]
[proto]
@@ -322,9 +333,6 @@ [last_msg_time]
[last_msg_date]
[last_msg_reltime]
-[%dd %dh %dm]
-[%dh %dm]
-[%dm]
[msg_count_all]
[msg_count_out]
[msg_count_in]
@@ -339,19 +347,32 @@ [Values]
[Tray title]
;file \plugins\TipperYM\src\translations.cpp
+[[No translation]]
[Yes]
[Female]
[Male]
-[%u.%u.%u.%u]
-[%dy %dd %dh %dm]
-[%dd]
+[WORD to status description]
+[DWORD timestamp to time]
+[DWORD timestamp to time difference]
+[BYTE to Yes/No]
+[BYTE to Male/Female (ICQ)]
+[WORD to country name]
+[DWORD to ip address]
[<prefix>Day|Month|Year to date]
[<prefix>Day|Month|Year to age]
[<prefix>Hours|Minutes|Seconds to time]
[<prefix>Day|Month|Year|Hours|Minutes|Seconds to time difference]
[<prefix>Day|Month to days to next birthday]
+[DWORD timestamp to time (no seconds)]
[<prefix>Hours|Minutes to time]
+[DWORD timestamp to date (short)]
+[DWORD timestamp to date (long)]
[xStatus: empty xStatus name to default name]
+[DWORD seconds to time difference]
+[BYTE timezone to time]
+[WORD to name of a day (0..6, 0 is Sunday)]
+[WORD to name of a month (1..12, 1 is January)]
+[BYTE to language (ICQ)]
;file \plugins\TipperYM\src\translations.h
[Afrikaans]
[Albanian]
diff --git a/langpacks/english/Plugins/Tlen.txt b/langpacks/english/Plugins/Tlen.txt index cece615e0c..39a9f3a8e4 100644 --- a/langpacks/english/Plugins/Tlen.txt +++ b/langpacks/english/Plugins/Tlen.txt @@ -198,5 +198,4 @@ [...Error...]
[...Denied...]
[DISPLAY]
-[...???...]
[Default]
diff --git a/langpacks/english/Plugins/TooltipNotify.txt b/langpacks/english/Plugins/TooltipNotify.txt index 5a420492a1..2994a16980 100644 --- a/langpacks/english/Plugins/TooltipNotify.txt +++ b/langpacks/english/Plugins/TooltipNotify.txt @@ -46,7 +46,6 @@ [Tooltip Notify: Other]
[Tooltip Notify: Typing]
[PopUps]
-[%d%%]
[** New contacts **]
[** Unknown contacts **]
[Away]
@@ -57,5 +56,3 @@ [Invisible]
[Not Idle]
[Unknown]
-[%.0s%.0s%s]
-[ %s %s]
diff --git a/langpacks/english/Plugins/TopToolBar.txt b/langpacks/english/Plugins/TopToolBar.txt index f43e071e14..beae6111dc 100644 --- a/langpacks/english/Plugins/TopToolBar.txt +++ b/langpacks/english/Plugins/TopToolBar.txt @@ -26,6 +26,7 @@ ;file \plugins\TopToolBar\src\toolbar.cpp
[Default]
[Execute Path]
+[Frames service has not been found, so plugin will be disabled.\nTo run it you need to install and / or enable contact list plugin that supports it:\n- Modern contact list\n- MultiWindow (MW)\n- Nicer+\nYou can get them at http://miranda-ng.org]
[TopToolBar]
;file \plugins\TopToolBar\src\toolbarwnd.cpp
[Toolbar]
diff --git a/langpacks/english/Plugins/TrafficCounter.txt b/langpacks/english/Plugins/TrafficCounter.txt index db73ee7d65..732099d4e4 100644 --- a/langpacks/english/Plugins/TrafficCounter.txt +++ b/langpacks/english/Plugins/TrafficCounter.txt @@ -27,10 +27,6 @@ [Counters format string:]
[Tooltip format string:]
[Display traffic for current]
-;file \plugins\TrafficCounter\src\misc.c
-[%c%d]
-[%d.%d]
-[%02d]
;file \plugins\TrafficCounter\src\statistics.c
[ListBox]
[Bytes]
@@ -47,10 +43,9 @@ [Online]
[Now traffic statistics for selected accounts will be cleared.\nContinue?]
[Traffic counter]
-[%s %02d:00 - %02d:59]
-[%s - %s]
[m:ss]
[h:mm:ss]
+[d hh:mm:ss]
[%miranda_userdata%\\statistics]
[Couldn't read statistics file]
[Traffic Counter]
@@ -70,6 +65,7 @@ [General/]
[Draw frame as skin element]
[Show tooltip in traffic window]
+["Toggle traffic counter" in main menu]
[Visible accounts/]
[Summary traffic for visible accounts]
[Overall traffic]
diff --git a/langpacks/english/Plugins/TranslitSwitcher.txt b/langpacks/english/Plugins/TranslitSwitcher.txt index a3b7e6cae5..d4d865f8b0 100644 --- a/langpacks/english/Plugins/TranslitSwitcher.txt +++ b/langpacks/english/Plugins/TranslitSwitcher.txt @@ -9,12 +9,8 @@ ;file \plugins\TranslitSwitcher\src\Layoutproc.cpp
[sch]
[Sch]
-[THppRichEdit.UnicodeClass]
-[THistoryGrid.UnicodeClass]
-[TExtHistoryGrid.UnicodeClass]
[Internet Explorer_Server]
[TranslitSwitcher]
-[%s %s]
;file \plugins\TranslitSwitcher\src\TranslitSwitcher.cpp
[Switch Layout and Send]
[Translit and Send]
diff --git a/langpacks/english/Plugins/Twitter.txt b/langpacks/english/Plugins/Twitter.txt index 97f805ddfa..733251b7e0 100644 --- a/langpacks/english/Plugins/Twitter.txt +++ b/langpacks/english/Plugins/Twitter.txt @@ -93,10 +93,7 @@ ;file \protocols\Twitter\src\contacts.cpp
[***** Error adding friend: %s]
[***** Error searching for contacts: %s]
-;file \protocols\Twitter\src\Debug.c
-[\r\n]
;file \protocols\Twitter\src\proto.cpp
-[%miranda_avatarcache%]
[Send Tweet...]
[Network]
[Basic]
diff --git a/langpacks/english/Plugins/UInfoEx.txt b/langpacks/english/Plugins/UInfoEx.txt index 91ae6c339e..50c81ea5c0 100644 --- a/langpacks/english/Plugins/UInfoEx.txt +++ b/langpacks/english/Plugins/UInfoEx.txt @@ -194,15 +194,12 @@ [Reset to defaults]
;file \plugins\UserInfoEx\src\classPsTreeItem.cpp
[Button]
-[%s %d\\%s]
-[%s %d]
[Creating unique name for a page failed with %d and error code %d]
[Creating the label for a page failed with %d and error code %d]
[The dialog template type is no longer supported]
;file \plugins\UserInfoEx\src\ctrl_annivedit.cpp
[Add a new anniversary]
[Delete an existing anniversary]
-['%s']
[Unspecified]
;file \plugins\UserInfoEx\src\ctrl_contact.cpp
[Edit E-Mail]
@@ -217,7 +214,6 @@ [CRITICAL: Unable to edit current entry!\nThis should not happen!]
[Do you really want to delete the current selected item?\n\t%s\n\t%s]
[Other]
-[%s %d\0]
[ SMS\0]
[ SMS]
;file \plugins\UserInfoEx\src\ctrl_contact.h
@@ -244,7 +240,6 @@ [Yes]
[Abord]
[Ignore]
-[%s - %s]
[Error]
;file \plugins\UserInfoEx\src\dlg_propsheet.cpp
[Protocol '%s' is offline]
@@ -293,7 +288,6 @@ [Ex-/Import Group]
[&Export Group]
[&Import Group]
-[%s %s]
[Ex-/Import]
;file \plugins\UserInfoEx\src\psp_about.cpp
[My Notes:]
@@ -303,7 +297,6 @@ [No valid date selected for editing!]
[Do you really want to delete the %s?]
;file \plugins\UserInfoEx\src\psp_contact.cpp
-[%s (%s)]
[Address]
[Home]
[Open in Browser]
@@ -328,8 +321,6 @@ [Advanced]
[Details Dialog]
[PopUps]
-;file \plugins\UserInfoEx\src\psp_origin.cpp
-[ - ]
;file \plugins\UserInfoEx\src\psp_profile.cpp
[Past]
[Affiliation]
@@ -527,6 +518,7 @@ [User has no valid homepage]
[View Homepage]
;file \plugins\UserInfoEx\src\svc_refreshci.cpp
+[[b]%s (%S)...[/b]\n%d Contacts remaning]
[Abort Refreshing Contact Details]
[Do you want to cancel the current refresh procedure?]
[Miranda must be online for refreshing contact information!]
@@ -540,8 +532,6 @@ [%d. %s today\0]
[%d. %s tomorrow\0]
[%d. %s in %d days\0]
-[\n...\0]
-[\n- \0]
[%s has birthday today.]
[%s has birthday tomorrow.]
[%s has birthday in %d days.]
diff --git a/langpacks/english/Plugins/Variables.txt b/langpacks/english/Plugins/Variables.txt index 98a2f4e4e6..c598db72f9 100644 --- a/langpacks/english/Plugins/Variables.txt +++ b/langpacks/english/Plugins/Variables.txt @@ -23,18 +23,12 @@ [The Variables plugin translates various tokens into a certain value. An example is: I'm running Miranda %mirandaversion%. The substring %mirandaversion% will be translated into the correct version number. The following list shows all available tokens.]
[Notes]
[Variables...]
-;file \plugins\Variables\src\contact.cpp
-[<%s:%s>]
;file \plugins\Variables\src\help.cpp
-[%c%s%c]
-[%c%s%s]
[Token]
[unknown]
[Tokens]
[Input]
[Cancel]
-[%subject%]
-[%extratext%]
[Help]
[Variables Help]
[Open String Formatting Help]
@@ -46,18 +40,15 @@ [Winamp v1.x]
[ - Winamp]
[Stopped]
+[[Stopped]]
+[[Paused]]
[Paused]
[Playing]
-;file \plugins\Variables\src\parse_metacontacts.cpp
;file \plugins\Variables\src\parse_miranda.cpp
-[%%%s%%]
[appdata]
[username]
[mydocuments]
[desktop]
-;file \plugins\Variables\src\parse_str.cpp
-[\r\n]
-[(...)]
;file \plugins\Variables\src\parse_system.cpp
[\\Processor(_Total)\\% Processor Time]
[\\Process(%s)\\%% Processor Time]
diff --git a/langpacks/english/Plugins/VersionInfo.txt b/langpacks/english/Plugins/VersionInfo.txt index 1cdfb952b6..61449b1dd3 100644 --- a/langpacks/english/Plugins/VersionInfo.txt +++ b/langpacks/english/Plugins/VersionInfo.txt @@ -37,10 +37,8 @@ [Upload]
[&Save to file]
;file \plugins\VersionInfo\src\CPlugin.cpp
-[%d.%d.%d.%d]
[ v.]
[unicode]
-[\r\n]
;file \plugins\VersionInfo\src\CVersionInfo.cpp
[dd' 'MMM' 'yyyy]
[HH':'mm':'ss]
@@ -49,7 +47,6 @@ [alpha]
[Yes]
[ (UTC) on ]
-[%d.%d.%d %s]
[Hardware\\Description\\System\\CentralProcessor\\0]
[Identifier]
[RegQueryValueEx()]
@@ -77,11 +74,9 @@ [ at FileOpen>]
[(UI | Locale (User/System)) : ]
[Control Panel\\Desktop\\ResourceLocale]
-[%lx]
[Error at RegQueryValueEx()]
[Error at RegOpenKeyEx()]
[Missing functions in kernel32.dll (GetUserDefaultUILanguage, GetSystemDefaultUILanguage)]
-[ | ]
[N/A]
[<unknown>]
[ v. ]
@@ -104,7 +99,6 @@ [dd' 'MMMM' 'yyyy]
[Report generated at: ]
[ on ]
-[\r\n\r\n]
[CPU: ]
[ [DEP enabled]]
[ [%d CPUs]]
@@ -131,19 +125,16 @@ [Unicode core: ]
[\r\nEnd of report.\r\n]
[If you are going to use this report to submit a bug, remember to check the website for questions or help the developers may need.\r\nIf you don't check your bug report and give feedback, it will not be fixed!]
-[ (%u)]
[Active Plugins]
[<font size="-2" color="black">]
[Inactive Plugins]
[Unloadable Plugins]
-[%miranda_path%]
[Information successfully written to file: "%s".]
[Error during the creation of file "%s". Disk may be full or write protected.]
[VersionInfo]
[The clipboard is not available, retry.]
[Information successfully copied into clipboard.]
;file \plugins\VersionInfo\src\dlgHandlers.cpp
-[%s | %s]
[Customize using folders plugin]
[Are you sure you want to enable this option ?\nPlease only enable this option if you really know what you're doing and what the option is for or if someone asked you to do it.]
[Show plugin UUIDs ?]
@@ -153,6 +144,7 @@ ;file \plugins\VersionInfo\src\main.cpp
;file \plugins\VersionInfo\src\utils.cpp
[Ok, something went wrong in the "%s" setting. Report back the following values:\nFacility: %X\nError code: %X\nLine number: %d]
+[%s\\Plugins\\%s]
[Shell]
[sys:]
[boot]
diff --git a/langpacks/english/Plugins/Weather.txt b/langpacks/english/Plugins/Weather.txt index 5f33abf180..f45909c28c 100644 --- a/langpacks/english/Plugins/Weather.txt +++ b/langpacks/english/Plugins/Weather.txt @@ -164,13 +164,11 @@ [HTTP Error: Bad gateway (502)]
[HTTP Error: Service unavailable (503)]
[HTTP Error: Gateway timeout (504)]
-[%n [%t, %c]]
[%c\nTemperature: %t\nFeel-Like: %f\nPressure: %p\nWind: %i %w\nHumidity: %m\nDew Point: %e\nVisibility: %v\n\nSun Rise: %r\nSun Set: %y\n\n5 Days Forecast:\n%[Forecast Day 1]\n%[Forecast Day 2]\n%[Forecast Day 3]\n%[Forecast Day 4]\n%[Forecast Day 5]]
[Feel-Like: %f\nPressure: %p\nWind: %i %w\nHumidity: %m\nDew Point: %e\nVisibility: %v\n\nSun Rise: %r\nSun Set: %y\n\n5 Days Forecast:\n%[Forecast Day 1]\n%[Forecast Day 2]\n%[Forecast Day 3]\n%[Forecast Day 4]\n%[Forecast Day 5]]
[Weather Condition for %n as of %u]
[%c, %t (feel-like %f) Wind: %i %w Humidity: %m]
[%n at %u: %c, %t (feel-like %f) Wind: %i %w Humidity: %m]
-[%n (%u)]
[%c, %t\nToday: High %h, Low %l]
[Temperature: %[Temperature]]
;file \plugins\Weather\src\weather_addstn.cpp
@@ -179,7 +177,6 @@ [Weather Protocol]
[Please try again after weather update is completed.]
[<Enter station name here>]
-[%s/%s]
[<Enter station ID here>]
[NAME]
;file \plugins\Weather\src\weather_contacts.cpp
@@ -193,22 +190,16 @@ [View webpage]
[Reset to default]
[Text Files]
-[ (*.txt)]
[All Files]
-[ (*.*)]
-[*.*]
;file \plugins\Weather\src\weather_conv.cpp
-[%i.%i]
[KPA]
[HPA]
[TORR]
-[%i.%i %s]
-[%i %s]
+["\r\nvoid GetSpeed(TCHAR *tempchar, TCHAR *unit, TCHAR *str) \r\n{\r\n // unit can be km/h, mph, m/s, knots\r\n double tempunit;\r\n TCHAR tstr[20];\r\n\r\n str[0] = 0;\r\n\r\n // convert the string into an integer (always positive)\r\n // if the result is 0, then the string is not a number, return _T(""\r\n tempunit = _ttof(tempchar);\r\n if (tempunit == 0 && tempchar[0] != '0]
[KM/H]
[M/S]
[MPH]
[KNOTS]
-[%s %s]
[MILES]
[Lightning]
[Fog]
@@ -247,8 +238,6 @@ [drizzle]
[rain]
[%20"\r\n// dis = original string\r\n// return value = the modified string with space -> _T("%20"\r\nchar *GetSearchStr(char *dis) \r\n{\r\n char *pstr = dis;\r\n size_t len = strlen(dis);\r\n while (*pstr != 0)\r\n {\r\n if (*pstr == ' ]
-[%20]
-[\r\n]
[<unknown time>]
[<Error>]
[HTTP Error %i]
@@ -289,9 +278,7 @@ [File Name]
[The corresponding INI file for "%s" is not found.]
[Weather INI information for "%s":]
-[\n\n]
[Name:]
-[\t\t]
[Internal Name:]
[Author:]
[Version:]
@@ -302,7 +289,6 @@ [bytes]
[Description:]
[Here is a list of custom variables that are currently available]
-[%c[%s]]
;file \plugins\Weather\src\weather_ini.cpp
[ID Search - Station Name]
[No update data file is found. Please check your Plugins\\Weather directory.]
@@ -330,7 +316,6 @@ ;file \plugins\Weather\src\weather_popup.cpp
[This is the name of the city]
[Here is a short weather description]
-[ \n]
[%c\tcurrent condition\n%d\tcurrent date\n%e\tdewpoint\n%f\tfeel-like temperature\n%h\ttoday's high\n%i\twind direction\n%l\ttoday's low\n%m\thumidity\n%n\tstation name\n%p\tpressure\n%r\tsunrise time\n%s\tstation ID\n%t\ttemperature\n%u\tupdate time\n%v\tvisibility\n%w\twind speed\n%y\tsun set]
[%[..]\tcustom variables]
;file \plugins\Weather\src\weather_svcs.cpp
@@ -352,7 +337,6 @@ [Weather Notification]
[Display in a frame]
;file \plugins\Weather\src\weather_update.cpp
-[************************************************************************]
[<-- Start update for station -->]
[Unable to retrieve weather information for %s]
[Error! Update cannot continue... Start to free memory]
@@ -363,16 +347,12 @@ [Document Not Found]
[Condition]
[Cond]
-[ & ]
[Alert]
;file \plugins\Weather\src\weather_userinfo.cpp
[Current condition for %n]
-[%c %t]
-[%i %w]
[Last update on: %u]
[Variable]
[Information]
[Retrieving new data, please wait...]
[More Info]
[No information available.\r\nPlease update weather condition first.]
-[%c, %t]
diff --git a/langpacks/english/Plugins/WhenWasIt.txt b/langpacks/english/Plugins/WhenWasIt.txt index 6b56f997e9..72918b04b3 100644 --- a/langpacks/english/Plugins/WhenWasIt.txt +++ b/langpacks/english/Plugins/WhenWasIt.txt @@ -56,7 +56,6 @@ [All contacts except ignored ones]
[All contacts except hidden and ignored ones]
[Set popup delay when notifying of upcoming birthdays.\nFormat: default delay [ | delay for birthdays occuring today]]
-[%d|%d]
[Please select the module where you want the date of birth to be saved.\r\n"UserInfo" is the default location.\r\nUse "Protocol module" to make the data visible in User Details.\n"mBirthday module" uses the same module as mBirthday plugin.]
[Set birthday for %s:]
[mBirthday]
@@ -65,7 +64,6 @@ [UserInfo]
[mICQBirthday]
[N/A]
-[%04d-%02d-%02d]
[Birthday list (%d)]
[Protocol]
[Contact]
@@ -94,30 +92,24 @@ [Birthday - %s]
[She]
[He/She]
+[%s\n%s will be %d years old.]
+[%s\n%s just turned %d.]
;file \plugins\WhenWasIt\src\services.cpp
[Starting to refresh user details]
[Done refreshing user details]
[Could not create worker thread. Error#%d - threadID %d]
[Error]
-[%s (*]
-[)%c*]
[Birthdays files]
[Please select a file to import birthdays from ...]
[Importing birthdays from file: %s]
[Done importing birthdays]
-[%c%s (*.*)%c*.*%c]
[All Files]
[Please select a file to export birthdays to ...]
[Exporting birthdays to file: %s]
[Done exporting birthdays]
[Could not open file to import birthdays]
-[ : ]
-[ : %02d/%02d/%04d]
[Warning]
[Could not open file to export birthdays]
-[%c%s]
[Please do not edit this file by hand. Use the export function of WhenWasIt plugin.\n]
[Warning! Please do not mix Unicode and Ansi exported birthday files. You should use the same version (Ansi/Unicode) of WhenWasIt that was used to export the info.\n]
[This file was exported with a Unicode version of WhenWasIt. Please only use a Unicode version of the plugin to import the birthdays.\n]
-;file \plugins\WhenWasIt\src\utils.cpp
-[%ld]
diff --git a/langpacks/english/Plugins/Xfire.txt b/langpacks/english/Plugins/Xfire.txt index 6b6d49a382..a3e379b3ba 100644 --- a/langpacks/english/Plugins/Xfire.txt +++ b/langpacks/english/Plugins/Xfire.txt @@ -156,6 +156,7 @@ [Unable to connect to XFire.]
[No Loginname is set!]
[No Password is set!]
+[Last game: %s playtime: %.2d:%.2d:%.2d]
[%s is playing %s.]
[%s is playing %s on server %d.%d.%d.%d:%d.]
[Playing]
diff --git a/langpacks/english/Plugins/YAMN.txt b/langpacks/english/Plugins/YAMN.txt index 0ca88bd6cf..ed4f6536fa 100644 --- a/langpacks/english/Plugins/YAMN.txt +++ b/langpacks/english/Plugins/YAMN.txt @@ -114,7 +114,6 @@ [(null)]
[debug- WriteAccount...]
;file \plugins\YAMN\src\main.cpp
-[%miranda_userdata%]
[Check mail]
[Launch application]
[Connect Fail]
@@ -133,8 +132,6 @@ [Header]
[Copy Selected]
[Copy All]
-[%s:\t%s\r\n]
-[\t%s\r\n]
[Do you really want to delete %d selected mails?]
[Delete confirmation]
;file \plugins\YAMN\src\mails\mime.cpp
@@ -194,7 +191,6 @@ [No account selected]
[Time left to next check [s]: %d]
[New Account]
-[%s (*.exe;*.bat;*.cmd;*.com)%c*.exe;*.bat;*.cmd;*.com%c%s (*.*)%c*.*%c]
[Executables]
[All Files]
[Select executable used for notification]
diff --git a/langpacks/english/Plugins/Yahoo.txt b/langpacks/english/Plugins/Yahoo.txt index 453c2aac70..dfdb0dc757 100644 --- a/langpacks/english/Plugins/Yahoo.txt +++ b/langpacks/english/Plugins/Yahoo.txt @@ -46,13 +46,9 @@ ;file \protocols\Yahoo\src\avatar.cpp
[Yahoo Error]
[Avatar upload failed!?!]
-[%%miranda_avatarcache%%\\]
-[%miranda_avatarcache%]
-[\\%lX]
[ avatar]
-[.swf]
-[.png]
;file \protocols\Yahoo\src\chat.cpp
+[[miranda] Got conference invite to room: %s with msg: %s]
[%s denied invitation with message: %s]
[Others]
[&Invite user...]
@@ -116,13 +112,14 @@ [Create Conference]
[&Refresh]
[&Show Profile]
+;file \protocols\Yahoo\src\webcam.cpp
+[[miranda] Got webcam invite. (not currently supported)]
;file \protocols\Yahoo\src\yahoo.cpp
[Calendar Reminder]
[%s has rejected your request and sent the following message:]
[Invalid Contact]
[The id you tried to add is invalid.]
[Unknown Error??.]
-[%s: %s]
[New Mail]
[You Have %i unread msgs]
[New Mail (%i msgs)]
diff --git a/langpacks/english/Plugins/historypp.txt b/langpacks/english/Plugins/historypp.txt index af50f54af8..824d138421 100644 --- a/langpacks/english/Plugins/historypp.txt +++ b/langpacks/english/Plugins/historypp.txt @@ -81,6 +81,7 @@ [Continued from the top]
[Continued from the bottom]
[Search: %s (F3 to find next)]
+["%s" not found]
[You have entered the wrong password]
[%0.1n h]
[%d min]
|