From 429c94a0999733ca166d0eb26e784e8fbcdb5f5c Mon Sep 17 00:00:00 2001 From: Dart Raiden Date: Wed, 30 Oct 2013 23:34:46 +0000 Subject: git-svn-id: http://svn.miranda-ng.org/main/trunk@6708 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/AimOscar/src/server.cpp | 2 +- protocols/IRCG/src/services.cpp | 2 +- protocols/JabberG/res/jabber.rc | 2 +- protocols/JabberG/src/jabber_privacy.cpp | 4 ++-- protocols/JabberG/src/jabber_proto.cpp | 2 +- protocols/Yahoo/src/proto.cpp | 2 +- protocols/Yahoo/src/services.cpp | 2 +- protocols/Yahoo/src/yahoo.cpp | 4 ++-- 8 files changed, 10 insertions(+), 10 deletions(-) (limited to 'protocols') diff --git a/protocols/AimOscar/src/server.cpp b/protocols/AimOscar/src/server.cpp index a81b8e2ed6..2e62f8c9c1 100644 --- a/protocols/AimOscar/src/server.cpp +++ b/protocols/AimOscar/src/server.cpp @@ -1644,7 +1644,7 @@ void CAimProto::snac_list_modification_ack(SNAC &snac)//family 0x0013 break; case 0x000a: - ShowPopup(LPGEN("Error adding buddy(invalid id?, already in list?)"), ERROR_POPUP); + ShowPopup(LPGEN("Error adding buddy(invalid ID or already in list?)"), ERROR_POPUP); break; case 0x000c: diff --git a/protocols/IRCG/src/services.cpp b/protocols/IRCG/src/services.cpp index 4631eda7ff..c411819a1d 100644 --- a/protocols/IRCG/src/services.cpp +++ b/protocols/IRCG/src/services.cpp @@ -657,7 +657,7 @@ int __cdecl CIrcProto::GCEventHook(WPARAM wParam,LPARAM lParam) break; case 11: // nickserv set language PostIrcMessage( _T("/nickserv SET LANGUAGE %%question=\"%s\",\"%s\""), - TranslateT("Please enter desired languageID (numeric value, depends on server)"), TranslateT("Change language of NickServ messages")); + TranslateT("Please enter desired language ID (numeric value, depends on server)"), TranslateT("Change language of NickServ messages")); break; case 12: // nickserv set homepage PostIrcMessage( _T("/nickserv SET URL %%question=\"%s\",\"%s\""), diff --git a/protocols/JabberG/res/jabber.rc b/protocols/JabberG/res/jabber.rc index 121fe6b2ca..e0b4597292 100644 --- a/protocols/JabberG/res/jabber.rc +++ b/protocols/JabberG/res/jabber.rc @@ -667,7 +667,7 @@ EXSTYLE WS_EX_CONTROLPARENT CAPTION "Member Information" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "Member Information\n",IDC_HEADERBAR, + CONTROL "Member Information\n",IDC_HEADERBAR, "MHeaderbarCtrl",0x0,0,0,183,25 ICON IDI_JABBER,IDC_ICO_STATUS,5,38,16,17,SS_CENTERIMAGE | SS_REALSIZEIMAGE EDITTEXT IDC_TXT_NICK,26,38,152,8,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER diff --git a/protocols/JabberG/src/jabber_privacy.cpp b/protocols/JabberG/src/jabber_privacy.cpp index 2c0c260c86..e26ba930a4 100644 --- a/protocols/JabberG/src/jabber_privacy.cpp +++ b/protocols/JabberG/src/jabber_privacy.cpp @@ -987,7 +987,7 @@ void CJabberDlgPrivacyLists::ShowAdvancedList(CPrivacyList *pList) TCHAR szTypeValue[ 512 ]; switch (pRule->GetType()) { case Jid: - mir_sntprintf(szTypeValue, SIZEOF(szTypeValue), _T("If jabber id is '%s' then"), pRule->GetValue()); + mir_sntprintf(szTypeValue, SIZEOF(szTypeValue), _T("If Jabber ID is '%s' then"), pRule->GetValue()); break; case Group: mir_sntprintf(szTypeValue, SIZEOF(szTypeValue), _T("If group is '%s' then"), pRule->GetValue()); @@ -1149,7 +1149,7 @@ void CJabberDlgPrivacyLists::DrawRulesList(LPDRAWITEMSTRUCT lpdis) switch (pRule->GetType()) { case Jid: { - DrawNextRulePart(lpdis->hDC, clLine2, TranslateT("If jabber id is '"), &rc); + DrawNextRulePart(lpdis->hDC, clLine2, TranslateT("If Jabber ID is '"), &rc); DrawNextRulePart(lpdis->hDC, clLine1, pRule->GetValue(), &rc); DrawNextRulePart(lpdis->hDC, clLine2, TranslateT("'"), &rc); diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp index af4857d102..44561e2faa 100644 --- a/protocols/JabberG/src/jabber_proto.cpp +++ b/protocols/JabberG/src/jabber_proto.cpp @@ -1053,7 +1053,7 @@ int __cdecl CJabberProto::SendMsg(HANDLE hContact, int flags, const char* pszSrc { TCHAR szClientJid[JABBER_MAX_JID_LEN]; if ( !m_bJabberOnline || !GetClientJID(hContact, szClientJid, SIZEOF(szClientJid))) { - TFakeAckParams *param = new TFakeAckParams(hContact, Translate("Protocol is offline or no jid")); + TFakeAckParams *param = new TFakeAckParams(hContact, Translate("Protocol is offline or no JID")); ForkThread(&CJabberProto::SendMessageAckThread, param); return 1; } diff --git a/protocols/Yahoo/src/proto.cpp b/protocols/Yahoo/src/proto.cpp index 37e234cd89..9c7be6525d 100644 --- a/protocols/Yahoo/src/proto.cpp +++ b/protocols/Yahoo/src/proto.cpp @@ -451,7 +451,7 @@ int __cdecl CYahooProto::SetStatus( int iNewStatus ) } if (err) { - lstrcpynA(errmsg, Translate("Please enter your yahoo id in Options/Network/Yahoo"), 80); + lstrcpynA(errmsg, Translate("Please enter your Yahoo ID in Options/Network/Yahoo"), 80); } else { if (!getString(YAHOO_PASSWORD, &dbv)) { CallService(MS_DB_CRYPT_DECODESTRING, lstrlenA(dbv.pszVal) + 1, (LPARAM) dbv.pszVal); diff --git a/protocols/Yahoo/src/services.cpp b/protocols/Yahoo/src/services.cpp index 0df9cbbf41..4730a59211 100644 --- a/protocols/Yahoo/src/services.cpp +++ b/protocols/Yahoo/src/services.cpp @@ -282,7 +282,7 @@ INT_PTR __cdecl CYahooProto::OnShowMyProfileCommand( WPARAM wParam, LPARAM lPara DBVARIANT dbv; if ( getString( YAHOO_LOGINID, &dbv) != 0) { - ShowError( TranslateT("Yahoo Error"), TranslateT("Please enter your yahoo id in Options/Network/Yahoo")); + ShowError( TranslateT("Yahoo Error"), TranslateT("Please enter your Yahoo ID in Options/Network/Yahoo")); return 0; } diff --git a/protocols/Yahoo/src/yahoo.cpp b/protocols/Yahoo/src/yahoo.cpp index 60f5815421..6b4b9f4dc4 100644 --- a/protocols/Yahoo/src/yahoo.cpp +++ b/protocols/Yahoo/src/yahoo.cpp @@ -754,7 +754,7 @@ void CYahooProto::ext_buddy_added(char *myid, char *who, char *group, int status case 1: /* invalid ID? */ case 3: /* invalid ID */ if (hContact != NULL) { - ShowPopup( TranslateT("Invalid Contact"), TranslateT("The id you tried to add is invalid."), NULL); + ShowPopup( TranslateT("Invalid Contact"), TranslateT("The ID you tried to add is invalid."), NULL); /* Make it TEMP first, we don't want to send any extra packets for FALSE ids */ db_set_b( hContact, "CList", "NotOnList", 1 ); CallService(MS_DB_CONTACT_DELETE, (WPARAM) hContact, 0); @@ -764,7 +764,7 @@ void CYahooProto::ext_buddy_added(char *myid, char *who, char *group, int status default: /* ??? */ if (hContact != NULL) { - ShowPopup( TranslateT("Invalid Contact"), TranslateT("Unknown Error??."), NULL); + ShowPopup( TranslateT("Invalid Contact"), TranslateT("Unknown Error."), NULL); /* Make it TEMP first, we don't want to send any extra packets for FALSE ids */ db_set_b( hContact, "CList", "NotOnList", 1 ); CallService(MS_DB_CONTACT_DELETE, (WPARAM) hContact, 0); -- cgit v1.2.3