Both abbreviations i.e. and e.g. are preceded by a comma. Both are followed by a comma in American English

git-svn-id: http://svn.miranda-ng.org/main/trunk@7489 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

3 files changed, 3 insertions, 3 deletions

diff --git a/plugins/Folders/src/dlg_handlers.cpp b/plugins/Folders/src/dlg_handlers.cpp
index 7d9ff357f8..19c1e40226 100644
--- a/plugins/Folders/src/dlg_handlers.cpp
+++ b/plugins/Folders/src/dlg_handlers.cpp
@@ -136,7 +136,7 @@ static INT_PTR CALLBACK DlgProcVariables(HWND hWnd, UINT msg, WPARAM wParam, LPA
 			TranslateT("(e.g., default if your your profile is default.dat)."),

 			TranslateT("Environment variables"),

 			TranslateT("The plugin can also expand environment variables; the variables are specified like in any other"),

-			TranslateT("program that can use environment variables, i.e. %<env variable>%."),

+			TranslateT("program that can use environment variables, i.e., %<env variable>%."),

 			TranslateT("Note: Environment variables are expanded before any Miranda variables. So if you have, for"),

 			TranslateT("example, %profile_path% defined as a system variable then it will be expanded to that value"),

 			TranslateT("instead of expanding to Miranda\'s profile path."),

diff --git a/plugins/Non-IM Contact/src/dialog.cpp b/plugins/Non-IM Contact/src/dialog.cpp
index 99ad2e6122..eea83fd93c 100644
--- a/plugins/Non-IM Contact/src/dialog.cpp
+++ b/plugins/Non-IM Contact/src/dialog.cpp
@@ -10,7 +10,7 @@ start() and end() explained\r\n.........................\r\n\
 MUST start with line() followed by a number or a string inside \" marks, OR csv(separatorX) variable. The number specifies which character in the line to start/end copying. The string specifies a string in the line to start/end copying.\r\n\r\n\

 csv(seperatorX) explained...\r\nSeperator is either \"tab\" or \"space\" or any SINGLE character. X is the Xth seperator to pass before copying, (or to stop before).\r\n\r\n\

 Lastly the line(...) variable...\r\n\

-Inside the brackets must be either a number (to specify the line number), or a string inside \" marks (to use the line with that string), or lastline(X). The X in lastline is the Xth line above the last line i.e. lastline(1) will use the 2nd last line of the file. If searching for a line with \"some words\" you may put a + or - X after the closing ) i.e. line(\"some words\")+3 to go 3 lines after the line with \"some words\".\r\n\r\n\

+Inside the brackets must be either a number (to specify the line number), or a string inside \" marks (to use the line with that string), or lastline(X). The X in lastline is the Xth line above the last line, i.e., lastline(1) will use the 2nd last line of the file. If searching for a line with \"some words\" you may put a + or - X after the closing ), i.e., line(\"some words\")+3 to go 3 lines after the line with \"some words\".\r\n\r\n\

 Some Examples...\r\n\

 filename(0)    <- will display the filename of the 0th file\r\nfile(0)wholeline(line(0)))    <- will display the whole first line of the 0th file\r\nfile(0)wholeline(line(\"hello\")-1)))    <- the wholeline above the first occurrence of \"hello\" in the file\r\nfile(0)start(line(lastline(1))csv(tab2))end(line(lastline())csv(tab4)))    <- starts at the 2nd last line of the file, from the 2nd tab variable, until the 4th tab variable in the last line (in the 0th file)\r\nfile(0)start(line(\"hello\")+1\"zzzz\")end(line(6)17))    <- starts from the first occurrence of zzzz in the line after the first occurrence of hello, until the 17th character in the 6th line (starting from line 0) of the 0th file.\r\n")

 

diff --git a/protocols/IcqOscarJ/res/resources.rc b/protocols/IcqOscarJ/res/resources.rc
index cf7351b5d9..84c49ac52a 100644
--- a/protocols/IcqOscarJ/res/resources.rc
+++ b/protocols/IcqOscarJ/res/resources.rc
@@ -147,7 +147,7 @@ BEGIN
     GROUPBOX        "Peer-to-peer Messaging",IDC_STATIC,4,95,302,41

     CONTROL         "Enable peer-to-peer message connections",IDC_DCENABLE,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,107,288,10

-    CONTROL         "Passive mode, i.e. do not initiate new connections",IDC_DCPASSIVE,

+    CONTROL         "Passive mode (i.e., do not initiate new connections)",IDC_DCPASSIVE,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,119,288,10

     GROUPBOX        "Extra Features",IDC_STATIC,4,137,302,93

     CONTROL         "Enable Custom status support for xtraz",IDC_XSTATUSENABLE,