[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [sflphone-kde] /: More typo fixes.
From: Yuri Chornoivan <yurchor () ukr ! net>
Date: 2012-07-31 21:12:20
Message-ID: 20120731211220.81983A6094 () git ! kde ! org
[Download RAW message or body]
Git commit 5108bb76f3630b3c24e6f73b1677ba140ba7b7eb by Yuri Chornoivan.
Committed on 31/07/2012 at 20:50.
Pushed by yurchor into branch 'master'.
More typo fixes.
M +2 -2 doc/basic-use.docbook
M +3 -3 doc/common-use.docbook
M +2 -2 doc/credits.docbook
M +5 -5 doc/getting-started.docbook
M +1 -1 doc/man-sflphone-client-kde.1.docbook
M +1 -1 src/sflphoneview.cpp
M +1 -1 src/widgets/contactitemwidget.cpp
http://commits.kde.org/sflphone-kde/5108bb76f3630b3c24e6f73b1677ba140ba7b7eb
diff --git a/doc/basic-use.docbook b/doc/basic-use.docbook
index 3de63ac..098214e 100755
--- a/doc/basic-use.docbook
+++ b/doc/basic-use.docbook
@@ -19,7 +19,7 @@ The ¤t-w; : it is the one you are by default, it shows the \
current, dialin The &history-w; : it shows the past calls and enables you to call \
someone you called earlier or from whom you missed a call. The &address-w; : it \
enables you to look in the address book of KDE and to call somebody if his number is \
available.
-To switch between those windows, click on the history and address book buttons. If \
none of these buttons is triggerred, you are currently in the ¤t-w;, if the \
history button is triggerred, you are in the &history-w;, and if the address book \
button is triggerred, you are in the &address-w;. +To switch between those windows, \
click on the history and address book buttons. If none of these buttons is \
triggerred, you are currently in the ¤t-w;, if the history button is \
triggerred, you are in the &history-w;, and if the address book button is \
trigOCgerred, you are in the &address-w;.
</para>
@@ -106,7 +106,7 @@ To switch between those windows, click on the history and address \
book buttons. <sect1 id="basic-use-config">
<title>Configuration panel</title>
-<para>The configuration panel is built in accordance with KDE specifications. It is \
divided by options type. The panel at left shows the different option pages you can \
reach. Click on one of them to acceed to the corresponding page. The changes you make \
are not applied until you click OK or Apply. Clicking Cancel will cancel and forget \
every change you made since the last Apply or OK command. Be careful not to forget \
some changes you made in some other pages if you wanted to Cancel it. </para> \
+<para>The configuration panel is built in accordance with KDE specifications. It is \
divided by options type. The panel at left shows the different option pages you can \
reach. Click on one of them to access to the corresponding page. The changes you make \
are not applied until you click OK or Apply. Clicking Cancel will cancel and forget \
every change you made since the last Apply or OK command. Be careful not to forget \
some changes you made in some other pages if you wanted to Cancel it. </para>
<para>There is also a specific Apply button just for the account list which is \
useful to manage these accounts and valid your changes to see if the accounts are \
well registered. </para>
diff --git a/doc/common-use.docbook b/doc/common-use.docbook
index 4e1011e..30309ce 100755
--- a/doc/common-use.docbook
+++ b/doc/common-use.docbook
@@ -45,7 +45,7 @@
<sect2 id="common-use-current-record">
<title>Recording a call</title>
-<para> If you want to record the current call, click on the record button, the \
button will become triggered and the light may come on. Since &sflphone; only records \
calls when they are current (ie : not on hold), the light will be on if the selected \
call is current and can be recorded, and off if it's not. But if the button is \
triggered, &sflphone; will record as soon as it's communicating. +<para> If you want \
to record the current call, click on the record button, the button will become \
triggerred and the light may come on. Since &sflphone; only records calls when they \
are current (ie : not on hold), the light will be on if the selected call is current \
and can be recorded, and off if it's not. But if the button is triggerred, &sflphone; \
will record as soon as it's communicating. </para>
</sect2>
@@ -71,7 +71,7 @@
<sect2 id="common-use-address-kde">
<title>Configuring KDE Address Book</title>
-<para> As it is fully designed for KDE, &sflphone-client-kde; looks for your \
contacts in KDE Address Book. So you first have to configure it. In the K Menu of \
your KDE, go to Applications,then Bureautique (??), then choose Address Book. You are \
now in the main window of the KDE address book. You can add contacts and handle them \
from here. Type F1 to see this application's help page if you have some problems with \
it. +<para> As it is fully designed for KDE, &sflphone-client-kde; looks for your \
contacts in KDE Address Book. So you first have to configure it. In the K Menu of \
your KDE, go to Applications, then Office, then choose Address Book. You are now in \
the main window of the KDE address book. You can add contacts and handle them from \
here. Type F1 to see this application's help page if you have some problems with it. \
</para>
<para> &sflphone-client-kde; looks into the standard address book, that means it \
will look into the contacts displayed in the contact list on the left of the window. \
The selected address books in the bottom left of the window will be searched. If you \
add some contacts, you may have to restart &sflphone-client-kde; before it can see \
them. @@ -84,7 +84,7 @@
<sect2 id="common-use-address-config">
<title>Configuring &sflphone-client-kde;</title>
-<para> You can now go to the Configuration Dialog to choose how &sflphone; will \
handle your searches in the address book. This step is optionnal though, because the \
default settings enable you to use the feature without more setup. +<para> You can \
now go to the Configuration Dialog to choose how &sflphone; will handle your searches \
in the address book. This step is optional though, because the default settings \
enable you to use the feature without more setup. </para>
<para> The maximum results setting enables you to choose how many phone numbers can \
be displayed when you look for a contact. KDE address book can contain lots of \
contacts, especially if connected to LDAP directories, and you don't want to see \
thousands of contacts displayed as soon as you type a letter to \
search for.</para>
diff --git a/doc/credits.docbook b/doc/credits.docbook
index 188f7ce..ccd2532 100755
--- a/doc/credits.docbook
+++ b/doc/credits.docbook
@@ -18,7 +18,7 @@
<itemizedlist>
<title>Program:</title>
<listitem>
- <para>The initial application were witten by Jérémy Quentin \
<email>jeremy.quentin@savoirfairelinux.com</email>. + <para>The initial \
application were written by Jérémy Quentin \
<email>jeremy.quentin@savoirfairelinux.com</email>. </para>
</listitem>
</itemizedlist>
@@ -26,7 +26,7 @@
<itemizedlist>
<title>Documentation:</title>
<listitem>
- <para>The initial contents of this manual were witten by Jérémy Quentin \
<email>jeremy.quentin@savoirfairelinux.com</email>. + <para>The initial contents \
of this manual were written by Jérémy Quentin \
<email>jeremy.quentin@savoirfairelinux.com</email>. </para>
</listitem>
</itemizedlist>
diff --git a/doc/getting-started.docbook b/doc/getting-started.docbook
index fefcd99..c1f775f 100755
--- a/doc/getting-started.docbook
+++ b/doc/getting-started.docbook
@@ -66,7 +66,7 @@ If you already have a SIP or IAX account created with &sflphone; or \
by any other <sect1 id="gettingstarted-wizard-create">
<title>Creating a new account</title>
-<para>If you choose to create an account on sflphone.org, the wizard will need very \
few informations to create the account, create it automatically and add the \
informations of the new account in &sflphone;. It creates a SIP account, so you will \
then be able to use this new account from any other system, with any software \
handling SIP accounts, using the informations of the new account that are displayed \
at the end of the process or reachable from the main window.</para> +<para>If you \
choose to create an account on sflphone.org, the wizard will need very few \
information to create the account, create it automatically and add the information of \
the new account in &sflphone;. It creates a SIP account, so you will then be able to \
use this new account from any other system, with any software handling SIP accounts, \
using the information of the new account that are displayed at the end of the process \
or reachable from the main window.</para>
<sect2 id="gettingstarted-wizard-create-email">
<title>Email address</title>
@@ -92,7 +92,7 @@ If you already have a SIP or IAX account created with &sflphone; or \
by any other <sect1 id="gettingstarted-wizard-register">
<title>Register an existing account</title>
-<para> If you have already created a SIP or IAX account with &sflphone; from another \
computer or with another software, or if you want to use an existing account, you can \
register it with this wizard to be able to use it with this instance of &sflphone;. \
The wizard will ask you for the basic informations of this account in order to find \
it back. These informations are described in this section.</para> +<para> If you have \
already created a SIP or IAX account with &sflphone; from another computer or with \
another software, or if you want to use an existing account, you can register it with \
this wizard to be able to use it with this instance of &sflphone;. The wizard will \
ask you for the basic information of this account in order to find it back. These \
information are described in this section.</para>
@@ -110,7 +110,7 @@ If you already have a SIP or IAX account created with &sflphone; \
or by any other </mediaobject>
</screenshot>
-<para> &sflphone; handles two protocols for calls, SIP and IAX2. The wizard will now \
ask you which of those is your account. If you already have an account created, just \
choose the right type. If you want to create one without &sflphone; and you wonder \
which type to choose, you can refer to <ulink \
url="http://www.voip-info.org/wiki/view/IAX+versus+SIP">this document</ulink> to know \
which one feets your needs best. </para> +<para> &sflphone; handles two protocols for \
calls, SIP and IAX2. The wizard will now ask you which of those is your account. If \
you already have an account created, just choose the right type. If you want to \
create one without &sflphone; and you wonder which type to choose, you can refer to \
<ulink url="http://www.voip-info.org/wiki/view/IAX+versus+SIP">this document</ulink> \
to know which one fits your needs best. </para>
</sect2>
@@ -128,7 +128,7 @@ If you already have a SIP or IAX account created with &sflphone; \
or by any other </mediaobject>
</screenshot>
-<para> The wizard needs a few informations to find your account. The alias is for \
convenience only, you can choose anyone. It will be applied only on &sflphone; on \
this system, not in the account. Server is the one that hosts your account. User is \
the username of the account. Unlike the alias, it has to be the username chosen while \
creating the account. Password is also the one chosen for the account. Mailbox number \
will be used by the mailbox button to keep you from having to type that number too \
often. Usually it is 888.</para> +<para> The wizard needs a few information to find \
your account. The alias is for convenience only, you can choose anyone. It will be \
applied only on &sflphone; on this system, not in the account. Server is the one that \
hosts your account. User is the username of the account. Unlike the alias, it has to \
be the username chosen while creating the account. Password is also the one chosen \
for the account. Mailbox number will be used by the mailbox button to keep you from \
having to type that number too often. Usually it is 888.</para>
</sect2>
@@ -167,7 +167,7 @@ If you already have a SIP or IAX account created with &sflphone; \
or by any other </mediaobject>
</screenshot>
-<para> The conclusion page resumes the informations you have sent during the wizard \
process. It has not done anything yet so you can still give up clicking \
<guibutton>Cancel</guibutton> button. If you click on <guibutton>Finish</guibutton>, \
it will send all the information and create the account if you chose to create it or \
register it if you were registering an existing account. As it has not sent the \
informations at this step, it cannot know if the registration will succeed. To check \
this, once you are in the main window, go to the account settings page to see the \
state of your accounts. </para> +<para> The conclusion page resumes the information \
you have sent during the wizard process. It has not done anything yet so you can \
still give up clicking <guibutton>Cancel</guibutton> button. If you click on \
<guibutton>Finish</guibutton>, it will send all the information and create the \
account if you chose to create it or register it if you were registering an existing \
account. As it has not sent the information at this step, it cannot know if the \
registration will succeed. To check this, once you are in the main window, go to the \
account settings page to see the state of your accounts. </para>
</sect1>
diff --git a/doc/man-sflphone-client-kde.1.docbook \
b/doc/man-sflphone-client-kde.1.docbook index ff0fa5c..32ebefc 100755
--- a/doc/man-sflphone-client-kde.1.docbook
+++ b/doc/man-sflphone-client-kde.1.docbook
@@ -52,7 +52,7 @@ sflphone-client-kde is a KDE client for SFLphone; it communicates \
with the core <title>See Also</title>
<para>sflphoned(1)</para>
<para>More detailed user documentation is available from <ulink
-url="help:/sflphone-client-kde">help:/kate</ulink>
+url="help:/sflphone-client-kde">help:/sflphone-client-kde</ulink>
(either enter this <acronym>URL</acronym> into Konqueror, or run \
<userinput><command>khelpcenter</command> \
<parameter>help:/sflphone-client-kde</parameter></userinput>).</para> <para>There is \
also further information available at <ulink url="http://sflphone.org/">the SFLPhone \
website</ulink>.</para>
diff --git a/src/sflphoneview.cpp b/src/sflphoneview.cpp
index 17f79f6..d4ffc36 100755
--- a/src/sflphoneview.cpp
+++ b/src/sflphoneview.cpp
@@ -349,7 +349,7 @@ bool SFLPhoneView::selectCallPhoneNumber(Call** call2,Contact* \
contact)
map[number->getType()+" ("+number->getNumber()+')'] = number->getNumber();
list << number->getType()+" ("+number->getNumber()+')';
}
- QString result = QInputDialog::getItem (this, i18n("Select phone number"), \
i18n("This contact have many phone number, please select the one you wish to call"), \
list, 0, false, &ok); + QString result = QInputDialog::getItem (this, \
i18n("Select phone number"), i18n("This contact has many phone numbers, please select \
the one you wish to call"), list, 0, false, &ok); if (ok) {
(*call2) = SFLPhone::model()->addDialingCall(contact->getFormattedName(), \
AccountList::getCurrentAccount()); if (*call2)
diff --git a/src/widgets/contactitemwidget.cpp b/src/widgets/contactitemwidget.cpp
index 373a9a9..326274d 100644
--- a/src/widgets/contactitemwidget.cpp
+++ b/src/widgets/contactitemwidget.cpp
@@ -325,7 +325,7 @@ QString ContactItemWidget::showNumberSelector(bool& ok)
map[number->getType()+" ("+number->getNumber()+')'] = number->getNumber();
list << number->getType()+" ("+number->getNumber()+')';
}
- QString result = QInputDialog::getItem (this, i18n("Select phone number"), \
i18n("This contact have many phone number, please select the one you wish to call"), \
list, 0, false, &ok); + QString result = QInputDialog::getItem (this, \
i18n("Select phone number"), i18n("This contact has many phone numbers, please select \
the one you wish to call"), list, 0, false, &ok);
if (!ok) {
kDebug() << "Operation cancelled";
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic