[kde-doc-english] [ring-kde] /: Various fixes
Yuri Chornoivan
yurchor at ukr.net
Wed Apr 1 11:05:23 UTC 2015
Git commit 088740cd86f9c822ade0459496c1070afbb8f217 by Yuri Chornoivan.
Committed on 01/04/2015 at 11:05.
Pushed by yurchor into branch 'master'.
Various fixes
M +1 -1 doc/index.docbook
M +1 -1 doc/man-ring-kde.1.docbook
M +1 -1 src/conf/dlgaccountsbase.ui
M +1 -4 src/conf/dlgdht.ui
M +1 -4 src/conf/dlgfallbackperson.ui
M +0 -3 src/widgets/ui/share.ui
M +0 -3 src/widgets/ui/welcome.ui
http://commits.kde.org/ring-kde/088740cd86f9c822ade0459496c1070afbb8f217
diff --git a/doc/index.docbook b/doc/index.docbook
index 8821620..4baee10 100644
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@ -1,5 +1,5 @@
<?xml version="1.0" ?>
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
<!ENTITY ring-kde "Ring KDE Client">
<!ENTITY kappname "&ring-kde;">
<!ENTITY ringrelease "1.1.0">
diff --git a/doc/man-ring-kde.1.docbook b/doc/man-ring-kde.1.docbook
index 8808444..f045d16 100644
--- a/doc/man-ring-kde.1.docbook
+++ b/doc/man-ring-kde.1.docbook
@@ -1,5 +1,5 @@
<?xml version="1.0" ?>
-<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
<!ENTITY % English "INCLUDE">
]>
diff --git a/src/conf/dlgaccountsbase.ui b/src/conf/dlgaccountsbase.ui
index 9e50523..60614ce 100644
--- a/src/conf/dlgaccountsbase.ui
+++ b/src/conf/dlgaccountsbase.ui
@@ -1547,7 +1547,7 @@
<item row="0" column="5">
<widget class="QToolButton" name="m_pViewCa">
<property name="toolTip">
- <string>View the cerificate authority</string>
+ <string>View the certificate authority</string>
</property>
<property name="text">
<string>View</string>
diff --git a/src/conf/dlgdht.ui b/src/conf/dlgdht.ui
index 2eb3f32..df47e23 100644
--- a/src/conf/dlgdht.ui
+++ b/src/conf/dlgdht.ui
@@ -10,9 +10,6 @@
<height>665</height>
</rect>
</property>
- <property name="windowTitle">
- <string>Form</string>
- </property>
<layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="0">
<widget class="QLabel" name="label_2">
@@ -225,7 +222,7 @@
</sizepolicy>
</property>
<property name="text">
- <string>For your firends to be able to call you, send them your hash:</string>
+ <string>For your friends to be able to call you, send them your hash:</string>
</property>
</widget>
</item>
diff --git a/src/conf/dlgfallbackperson.ui b/src/conf/dlgfallbackperson.ui
index 0e05628..dfb644b 100644
--- a/src/conf/dlgfallbackperson.ui
+++ b/src/conf/dlgfallbackperson.ui
@@ -10,14 +10,11 @@
<height>300</height>
</rect>
</property>
- <property name="windowTitle">
- <string>Form</string>
- </property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="label">
<property name="text">
- <string><html><head/><body><p>Akonadi 2, the version compatible with the KDE frameworks 5 is not released yet. Therefore, at thsi point, Ring-KDE cannot be integrated with KAddressBook.</p><p>However, it is possible to integrate the <span style=" font-weight:600;">KDE4</span> version KAddressbook with Ring-KDE. To do this:</p><p>(1) Open <span style=" font-weight:600;">KAddressBook </span>and File->New->Add Address Book</p><p>(2) Select "vCard directory"</p><p>(3) Select the "/home/<span style=" font-style:italic;">your_user_name</span>/.local/share/ring-kde/vCard" folder</p><p>(4) Press OK</p><p>It will now be possible to access and edit your contacts from KAddressBook</p></body></html></string>
+ <string><html><head/><body><p>Akonadi 2, the version compatible with the KDE frameworks 5 is not released yet. Therefore, at this point, Ring-KDE cannot be integrated with KAddressBook.</p><p>However, it is possible to integrate the <span style=" font-weight:600;">KDE4</span> version KAddressbook with Ring-KDE. To do this:</p><p>(1) Open <span style=" font-weight:600;">KAddressBook </span>and File->New->Add Address Book</p><p>(2) Select "vCard directory"</p><p>(3) Select the "/home/<span style=" font-style:italic;">your_user_name</span>/.local/share/ring-kde/vCard" folder</p><p>(4) Press OK</p><p>It will now be possible to access and edit your contacts from KAddressBook</p></body></html></string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
diff --git a/src/widgets/ui/share.ui b/src/widgets/ui/share.ui
index aead93f..266d1d5 100644
--- a/src/widgets/ui/share.ui
+++ b/src/widgets/ui/share.ui
@@ -10,9 +10,6 @@
<height>460</height>
</rect>
</property>
- <property name="windowTitle">
- <string>Form</string>
- </property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0" colspan="3">
<widget class="QLabel" name="label">
diff --git a/src/widgets/ui/welcome.ui b/src/widgets/ui/welcome.ui
index 1cdaaaa..7d78e45 100644
--- a/src/widgets/ui/welcome.ui
+++ b/src/widgets/ui/welcome.ui
@@ -10,9 +10,6 @@
<height>460</height>
</rect>
</property>
- <property name="windowTitle">
- <string>Form</string>
- </property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="label_2">
More information about the kde-doc-english
mailing list