1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
|
Description: Fix spelling error in messages and variable names
Fixes lintian warning spelling-error-in-binary
Author: Axel Beckert <abe@debian.org>
--- a/src/e_cvslog.cpp
+++ b/src/e_cvslog.cpp
@@ -41,7 +41,7 @@ ECvsLog::ECvsLog (int createFlags,EModel
InsertLine (1,60, "CVS: -------------------------------------------------------");
InsertLine (2,59, "CVS: Enter log. Lines beginning with 'CVS:' will be removed");
InsertLine (3,4, "CVS:");
- InsertLine (4,18, "CVS: Commiting in ");
+ InsertLine (4,18, "CVS: Committing in ");
InsText (4,18,strlen (Directory),Directory);
if (OnFiles[0]) {
p=5;
@@ -91,7 +91,7 @@ ECvsLog::ECvsLog (int createFlags,EModel
delete position;delete len;delete status;
} else {
InsertLine (5,4, "CVS:");
- InsertLine (6,30, "CVS: Commiting whole directory");
+ InsertLine (6,30, "CVS: Committing whole directory");
p=7;
}
InsertLine (p,4, "CVS:");
--- a/src/e_svnlog.cpp
+++ b/src/e_svnlog.cpp
@@ -44,7 +44,7 @@ ESvnLog::ESvnLog(int createFlags,EModel
InsertLine(1,60, "SVN: -------------------------------------------------------");
InsertLine(2,59, "SVN: Enter log. Lines beginning with 'SVN:' will be removed");
InsertLine(3,4, "SVN:");
- InsertLine(4,18, "SVN: Commiting in ");
+ InsertLine(4,18, "SVN: Committing in ");
InsText(4,18,strlen(Directory),Directory);
if (OnFiles[0]) {
p=5;
@@ -95,7 +95,7 @@ ESvnLog::ESvnLog(int createFlags,EModel
delete position;delete len;delete status;
} else {
InsertLine(5,4, "SVN:");
- InsertLine(6,30, "SVN: Commiting whole directory");
+ InsertLine(6,30, "SVN: Committing whole directory");
p=7;
}
InsertLine(p,4, "SVN:");
--- a/src/o_cvs.cpp
+++ b/src/o_cvs.cpp
@@ -35,7 +35,7 @@ ECvs::ECvs(int createFlags, EModel **ARo
char* AOnFiles) :
ECvsBase(createFlags, ARoot, "CVS"),
LogFile(0),
- Commiting(0)
+ Committing(0)
{
CvsView=this;
RunPipe (ADir, ACommand, AOnFiles);
@@ -97,7 +97,7 @@ void ECvs::ParseLine(char* line, int len
int ECvs::RunPipe(const char *ADir, const char *ACommand, const char *AOnFiles)
{
- Commiting=0;
+ Committing=0;
if (!SameDir (Directory,ADir)) FreeLines ();
return ECvsBase::RunPipe (ADir,ACommand,AOnFiles);
}
@@ -105,11 +105,11 @@ int ECvs::RunPipe(const char *ADir, cons
void ECvs::ClosePipe()
{
ECvsBase::ClosePipe ();
- if (Commiting&&!ReturnCode) {
+ if (Committing&&!ReturnCode) {
// Successful commit - reload files
// Is it safe to do this ? Currently not done, manual reload is needed
}
- Commiting=0;
+ Committing=0;
}
int ECvs::RunCommit(const char *ADir, const char *ACommand, const char *AOnFiles)
@@ -157,9 +157,9 @@ int ECvs::DoneCommit(int commit)
sprintf (ACommand,"%s -F %s",Command,LogFile);
int ret=RunPipe (ADirectory,ACommand,AOnFiles);
free (ACommand);free (ADirectory);free (AOnFiles);
- // We set Commiting after RunPipe since it sets it to 0
+ // We set Committing after RunPipe since it sets it to 0
// This is OK since FTE is not multi-threaded
- Commiting=1;
+ Committing=1;
if (ActiveView->Model==CvsLogView) {
// CvsLogView is currently active, move CvsView just after it
--- a/src/o_cvs.h
+++ b/src/o_cvs.h
@@ -18,7 +18,7 @@
class ECvs:public ECvsBase {
public:
char *LogFile;
- int Commiting;
+ int Committing;
ECvs (int createFlags,EModel **ARoot,char *Dir,char *ACommand,char *AOnFiles);
ECvs (int createFlags,EModel **ARoot);
--- a/src/o_svn.cpp
+++ b/src/o_svn.cpp
@@ -33,7 +33,7 @@ ESvn *SvnView=0;
ESvn::ESvn (int createFlags, EModel **ARoot, char *ADir, char *ACommand, char *AOnFiles) :
ESvnBase (createFlags, ARoot, "SVN"),
LogFile(0),
- Commiting(0)
+ Committing(0)
{
SvnView=this;
RunPipe (ADir,ACommand,AOnFiles);
@@ -93,18 +93,18 @@ void ESvn::ParseLine (char *line,int len
}
int ESvn::RunPipe (const char *ADir, const char *ACommand, const char *AOnFiles) {
- Commiting=0;
+ Committing=0;
if (!SameDir (Directory,ADir)) FreeLines ();
return ESvnBase::RunPipe (ADir,ACommand,AOnFiles);
}
void ESvn::ClosePipe () {
ESvnBase::ClosePipe ();
- if (Commiting&&!ReturnCode) {
+ if (Committing&&!ReturnCode) {
// Successful commit - reload files
// Is it safe to do this ? Currently not done, manual reload is needed
}
- Commiting=0;
+ Committing=0;
}
int ESvn::RunCommit (const char *ADir, const char *ACommand, const char *AOnFiles) {
@@ -150,9 +150,9 @@ int ESvn::DoneCommit (int commit) {
sprintf (ACommand,"%s -F %s",Command,LogFile);
int ret=RunPipe (ADirectory,ACommand,AOnFiles);
free (ACommand);free (ADirectory);free (AOnFiles);
- // We set Commiting after RunPipe since it sets it to 0
+ // We set Committing after RunPipe since it sets it to 0
// This is OK since FTE is not multi-threaded
- Commiting=1;
+ Committing=1;
if (ActiveView->Model==SvnLogView) {
// SvnLogView is currently active, move SvnView just after it
--- a/src/o_svn.h
+++ b/src/o_svn.h
@@ -16,7 +16,7 @@
class ESvn:public ESvnBase {
public:
char *LogFile;
- int Commiting;
+ int Committing;
ESvn (int createFlags,EModel **ARoot,char *Dir,char *ACommand,char *AOnFiles);
ESvn (int createFlags,EModel **ARoot);
--- a/src/i_complete.cpp
+++ b/src/i_complete.cpp
@@ -17,7 +17,7 @@
#include <stdlib.h>
#define STRCOMPLETE "Complete Word: ["
-#define STRNOCOMPLETE "No word for completition..."
+#define STRNOCOMPLETE "No word for completion..."
#define LOCALE_SORT
|
