3 files changed, 184 insertions, 193 deletions
diff --git a/protocols/YAMN/docs/language.pop3.txt b/protocols/YAMN/docs/language.pop3.txt
deleted file mode 100644
index 03fb78ec79..0000000000
--- a/protocols/YAMN/docs/language.pop3.txt
+++ /dev/null
@@ -1,118 +0,0 @@
-;
-;	YAMN-POP3 0.2.4.7 translation file
-;
-;--------------------------------
-;	NEW in 0.2.4.7
-;--------------------------------
-
-;--------------------------------
-;	CHANGED in 0.2.4.7
-;--------------------------------
-
-;--------------------------------
-;	OLD in 0.2.4.7
-;--------------------------------
-;
-;	Main
-;
-[Found new version of account book, not compatible with this version of YAMN.]
-[Error reading account file. Account file corrupted.]
-[Memory allocation error while data reading]
-[Reading file error. File already in use?]
-[Error while copying data to disk occured. File in use?]
-[YAMN (internal POP3) read error]
-[POP3 plugin- write file error]
-[Error %d-%d-%d-%d:]
-[Memory allocation error.]
-[Account is about to be stopped.]
-[Cannot connect to POP3 server.]
-[Cannot allocate memory for received data.]
-[Cannot login to POP3 server.]
-[Bad user or password.]
-[Server does not support APOP authorization.]
-[Error while executing POP3 command.]
-[Cannot connect to server with NetLib.]
-[Cannot send data.]
-[Cannot receive data.]
-[Cannot allocate memory for received data.]
-[OpenSSL not loaded.]
-[Windows socket 2.0 init failed.]
-[DNS lookup error.]
-[Error while creating base socket.]
-[Error connecting to server with socket.]
-[Error while creating SSL structure.]
-[Error connecting socket with SSL.]
-[Server rejected connection with SSL.]
-[Cannot write SSL data.]
-[Cannot read SSL data.]
-[Cannot allocate memory for received data.]
-
-;
-;	Options
-;
-[Please wait while account is in use.]
-[Please wait while no account is in use.]
-[Time left to next check [s]: %d]
-[Select executable used for notification]
-[Input error]
-[This is not a valid number value]
-[At least one mail notification event must be checked]
-[Please select application to run]
-[Delete]
-[Check this account]
-[Server:]
-[Port:]
-[User:]
-[Password:]
-[APOP auth]
-[Check interval [min]:]
-[Sound notification]
-[Message notification]
-[Tray icon notification]
-[Application execution:]
-[Persistant message]
-[Sound notification if failed]
-[Message notification if failed]
-[Tray icon notification if failed]
-[Default codepage:]
-[Check while:]
-;[Offline]
-;[Online]
-;[Away]
-;[N/A]
-;[Occupied]
-;[DND]
-;[Free for chat]
-;[Invisible]
-;[On the phone]
-;[Out to lunch]
-[Startup check]
-[Default]
-[Reset counter]
-[Account Test]
-[Account Test (failed)]
-[Account Test]
-[You have N new mails]
-[Connection failed message]
-[Popup notification]
-[Popup if no mail]
-[Single popup]
-[Multi popup]
-[Popup notification if failed]
-[Check from menu]
-[New mail notifications]
-[No new mail notifications]
-[Connection failure notifications]
-[Connecting to server]
-[Reading new mails (%d%% done)]
-[Disconnected]
-[Entering POP3 account]
-[Searching for new mail]
-[Deleting requested mails]
-[Deleting spam]
-[Delete account confirmation]
-[Do you really want to delete this account?]
-
-;--------------------------------
-;	REMOVED in 0.2.4.7
-;--------------------------------
-\ No newline at end of file
diff --git a/protocols/YAMN/docs/language.txt b/protocols/YAMN/docs/language.txt
deleted file mode 100644
index 72d1fcda8b..0000000000
--- a/protocols/YAMN/docs/language.txt
+++ /dev/null
@@ -1,75 +0,0 @@
-;
-;	YAMN 0.2.4.7 translation file
-;
-;--------------------------------
-;	NEW in 0.2.4.7
-;--------------------------------
-
-;--------------------------------
-;	CHANGED in 0.2.4.7
-;--------------------------------
-
-;--------------------------------
-;	OLD in 0.2.4.7
-;--------------------------------
-;
-;	Main
-;
-[YAMN: new mail]
-[YAMN: connect failed]
-[No new mail, %d spam(s)]
-[No new mail]
-[YAMN uninstalling]
-[Do you also want to remove native YAMN plugins settings?]
-
-;
-;	Menu
-;
-[Check &mail (YAMN)]
-[Check mail]			;for TopToolBar plugin
-
-;
-;	Options
-;
-[Hotkey for mail check:]
-[TopToolBar button "Check mail"]
-[Installed plugins]
-[Version:]
-[Description:]
-[Copyright:]
-[Contact:]
-[WWW:]
-
-;
-;	Mail browser
-;
-[%s - %d new mails, %d total]
-[ - new mail(s)]
-[From]
-[Subject]
-[Size]
-[Run application]
-[Delete selected]
-[Delete confirmation]
-[Do you really want to delete %d selected mails?]
-
-;
-;	Bad connection dialog
-;
-[ - connection error]
-[Cannot allocate memory for received data]
-[Bad user name or error while logging]
-[Bad user or password or error while logging]
-[Cannot get number of messages]
-[Cannot resolve message signatures]
-[Cannot get sizes of messages]
-[Cannot find server]
-[Cannot connect to server]
-[System error occured]
-[Cannot send data]
-[Cannot receive data]
-[Unknown error]
-
-;--------------------------------
-;	REMOVED in 0.2.4.7
-;--------------------------------
-\ No newline at end of file
diff --git a/protocols/YAMN/yamn-translation.txt b/protocols/YAMN/yamn-translation.txt
new file mode 100644
index 0000000000..7acbad549f
--- /dev/null
+++ b/protocols/YAMN/yamn-translation.txt
@@ -0,0 +1,184 @@
+; Common strings that belong to many files
+;[Cancel]
+;[Check mail]
+;[Default]
+;[New Mail]
+;[No new mail message]
+;[Offline]
+;[YAMN]
+
+; ../../protocols/YAMN/browser/badconnect.cpp
+;[ - connection error]
+;[Unknown error]
+
+; ../../protocols/YAMN/browser/mailbrowser.cpp
+;[%d new mail message(s), %d total]
+;[%s : %d new mail message(s), %d total]
+;[- new mail message(s)]
+;[Copy All]
+;[Copy Selected]
+;[Delete confirmation]
+;[Do you really want to delete %d selected mails?]
+;[Header]
+;[No new mail message, %d spam(s)]
+;[Value]
+
+; ../../protocols/YAMN/mails/mime.cpp
+;[Part]
+
+; ../../protocols/YAMN/main.cpp
+;[Connect Fail]
+;[Launch Application]
+;[Neutral]
+;[TopToolBar Down]
+;[TopToolBar UP]
+
+; ../../protocols/YAMN/proto/netlib.cpp
+;[%s connection]
+
+; ../../protocols/YAMN/proto/pop3/pop3comm.cpp
+;[Account is about to be stopped.]
+;[Bad user or password.]
+;[Cannot allocate memory for received data.]
+;[Cannot connect to POP3 server.]
+;[Cannot connect to server with NetLib.]
+;[Cannot login to POP3 server.]
+;[Cannot read SSL data.]
+;[Cannot receive data.]
+;[Cannot send data.]
+;[Cannot write SSL data.]
+;[Connecting to server]
+;[DNS lookup error.]
+;[Deleting requested mails]
+;[Deleting spam]
+;[Disconnected]
+;[Entering POP3 account]
+;[Error %d-%d-%d-%d:]
+;[Error connecting socket with SSL.]
+;[Error connecting to server with socket.]
+;[Error reading account file. Account file corrupted.]
+;[Error while copying data to disk occured. File in use?]
+;[Error while creating SSL structure.]
+;[Error while creating base socket.]
+;[Error while executing POP3 command.]
+;[Found new version of account book, not compatible with this version of YAMN.]
+;[Mail notifier and browser for Miranda IM. Included POP3 protocol.]
+;[Memory allocation error while data reading]
+;[Memory allocation error.]
+;[OpenSSL not loaded.]
+;[POP3 plugin- write file error]
+;[POP3 protocol (internal)]
+;[Reading body %s]
+;[Reading file error. File already in use?]
+;[Reading new mail messages (%d%% done)]
+;[Searching for new mail message]
+;[Server does not support APOP authorization.]
+;[Server rejected connection with SSL.]
+;[Windows socket 2.0 init failed.]
+;[YAMN (internal POP3) read error]
+
+; ../../protocols/YAMN/proto/pop3/pop3opt.cpp
+;[Account Test]
+;[Account Test (failed)]
+;[Accounts]
+;[All Files]
+;[Cannot allocate memory space for new account]
+;[Connection failed message]
+;[Delete account confirmation]
+;[Do you really want to delete this account?]
+;[Executables]
+;[General]
+;[Input error]
+;[Memory error]
+;[Network]
+;[New Account]
+;[No account selected]
+;[Please select application to run]
+;[Please wait while no account is in use.]
+;[Plugins]
+;[PopUps]
+;[Select executable used for notification]
+;[This is not a valid number value]
+;[Time left to next check [s]: %d]
+;[You have N new mail messages]
+
+; ../../protocols/YAMN/resources/YAMN.rc
+;[..s Popup duration]
+;[APOP]
+;[Account]
+;[Auto retrieve body]
+;[Away]
+;[Background colour]
+;[Check from menu]
+;[Check interval [min]:]
+;[Check this account]
+;[Check while ...]
+;[Choose modes]
+;[Codepage:]
+;[Connection failure notifications]
+;[Contact:]
+;[Copyright:]
+;[DND]
+;[Date/Time Representation]
+;[Description:]
+;[Disable Events]
+;[Disable STLS]
+;[Don't show seconds]
+;[Don't show today's date]
+;[Enable Close on Delete Button]
+;[Enable YAMN Main Menu]
+;[Errors]
+;[Execute Application]
+;[Free for chat]
+;[Installed plugins]
+;[Invisible]
+;[Keyboard Flash]
+;[List4]
+;[List5]
+;[Mail Notifications]
+;[MailBrowser Options]
+;[Message]
+;[Message notification if failed]
+;[Multi popup]
+;[N/A]
+;[Name:]
+;[No new mail notifications]
+;[Notifications]
+;[OK]
+;[Occupied]
+;[On the phone]
+;[Online]
+;[Only check when ...]
+;[Options]
+;[Out to lunch]
+;[Password:]
+;[Persistant message]
+;[Popup]
+;[Popup if no mail]
+;[Popup notification if failed]
+;[Port:]
+;[Preview]
+;[Replace nick name]
+;[Reset counter]
+;[SSL]
+;[Server:]
+;[Show YAMN as a Protocol  (Require Restart)]
+;[Show long localised date]
+;[Single popup]
+;[Sound]
+;[Sound notification if failed]
+;[Startup check]
+;[Status:]
+;[Text colour]
+;[TopToolBar button \"Check mail\"]
+;[Tray Icon]
+;[Tray icon notification if failed]
+;[Use contact notification for this account]
+;[Use custom colour]
+;[User Name:]
+;[Version:]
+;[WWW:]
+;[YAMN General Options]
+
+; ../../protocols/YAMN/services.cpp
+;[Nick]