[kde-doc-english] [kde-runtime/KDE/4.12] doc/kcontrol: proofreading/updating/bump version of runtime kcm docs in Common Appearance and Behavior category
Burkhard Lück
lueck at hube-lueck.de
Tue Dec 24 10:20:13 UTC 2013
Git commit c1f8c60502540ea21d61fce7035a497e0033dc19 by Burkhard Lück.
Committed on 05/12/2013 at 15:47.
Pushed by lueck into branch 'KDE/4.12'.
proofreading/updating/bump version of runtime kcm docs in Common Appearance and Behavior category
(cherry picked from commit b0628b42ef60db28142e252c6b430a4968a293c5)
backport to 4.12.1
M +4 -4 doc/kcontrol/attica/index.docbook
M +2 -2 doc/kcontrol/emoticons/index.docbook
M +8 -7 doc/kcontrol/filetypes/index.docbook
M +2 -2 doc/kcontrol/icons/index.docbook
M +2 -2 doc/kcontrol/kcmnotify/index.docbook
M +49 -7 doc/kcontrol/language/index.docbook
A +- -- doc/kcontrol/language/oxygen-22x22-document-revert.png
M +2 -2 doc/kcontrol/spellchecking/index.docbook
http://commits.kde.org/kde-runtime/c1f8c60502540ea21d61fce7035a497e0033dc19
diff --git a/doc/kcontrol/attica/index.docbook b/doc/kcontrol/attica/index.docbook
index 4e620f5..1f5d36c 100644
--- a/doc/kcontrol/attica/index.docbook
+++ b/doc/kcontrol/attica/index.docbook
@@ -17,8 +17,8 @@
<!-- TRANS:ROLES_OF_TRANSLATORS -->
</authorgroup>
-<date>2010-09-26</date>
-<releaseinfo>&kde; 4.5</releaseinfo>
+<date>2013-11-05</date>
+<releaseinfo>&kde; 4.12</releaseinfo>
<keywordset>
<keyword>KDE</keyword>
@@ -37,8 +37,8 @@ You can use the web site or this settings dialog to register and manage your acc
<para>The benefit is that you can do more things in <quote>Get Hot New Stuff</quote>:
vote for items, become a fan of them and upload new content. A configured
-account also allows you to use the social Plasma widgets (<guilabel>Community</guilabel>,
-<guilabel>Social News</guilabel> &etc;) to their full extent.
+account also allows you to use the social Plasma widgets (<quote>Community</quote>,
+<quote>Social News</quote> &etc;) to their full extent.
</para>
<para>Using the &systemsettings; module:</para>
diff --git a/doc/kcontrol/emoticons/index.docbook b/doc/kcontrol/emoticons/index.docbook
index ab45813..c5283b1 100644
--- a/doc/kcontrol/emoticons/index.docbook
+++ b/doc/kcontrol/emoticons/index.docbook
@@ -12,8 +12,8 @@
<!-- TRANS:ROLES_OF_TRANSLATORS -->
</authorgroup>
-<date>2011-11-28</date>
-<releaseinfo>&kde; 4.8</releaseinfo>
+<date>2013-12-05</date>
+<releaseinfo>&kde; 4.12</releaseinfo>
<keywordset>
<keyword>KDE</keyword>
diff --git a/doc/kcontrol/filetypes/index.docbook b/doc/kcontrol/filetypes/index.docbook
index a344eee..36a3129 100644
--- a/doc/kcontrol/filetypes/index.docbook
+++ b/doc/kcontrol/filetypes/index.docbook
@@ -1,6 +1,7 @@
<?xml version="1.0" ?>
<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
"dtd/kdex.dtd" [
+<!ENTITY calligrawords "<application>Calligra Words</application>">
<!ENTITY % addindex "IGNORE">
<!ENTITY % English "INCLUDE" > <!-- change language only here -->
]>
@@ -14,8 +15,8 @@
<!-- TRANS:ROLES_OF_TRANSLATORS -->
</authorgroup>
-<date>2011-11-28</date>
-<releaseinfo>&kde; 4.8</releaseinfo>
+<date>2013-12-05</date>
+<releaseinfo>&kde; 4.12</releaseinfo>
<keywordset>
<keyword>KDE</keyword>
@@ -32,12 +33,12 @@
<para>One of the most convenient aspects of &kde;, is its ability to
automatically match a data file with its application. As an example,
-when you click on your favorite &kword; document in the filemanager, &kde;
-automatically starts &kword;, and automatically loads that file into
-&kword; so you can begin working on it.</para>
+when you click on your favorite &calligrawords; document in the filemanager, &kde;
+automatically starts &calligrawords;, and automatically loads that file into
+&calligrawords; so you can begin working on it.</para>
-<para>In the example above, the &kword; Data file is
-<emphasis>associated</emphasis> with &kword; (the application). These
+<para>In the example above, the &calligrawords; Data file is
+<emphasis>associated</emphasis> with &calligrawords; (the application). These
file associations are crucial to the functioning of &kde;.</para>
<para>When &kde; is installed, it automatically creates hundreds of file
diff --git a/doc/kcontrol/icons/index.docbook b/doc/kcontrol/icons/index.docbook
index d680372..eaec490 100644
--- a/doc/kcontrol/icons/index.docbook
+++ b/doc/kcontrol/icons/index.docbook
@@ -15,8 +15,8 @@
<!-- TRANS:ROLES_OF_TRANSLATORS -->
</authorgroup>
-<date>2011-11-28</date>
-<releaseinfo>&kde; 4.8</releaseinfo>
+<date>2013-12-05</date>
+<releaseinfo>&kde; 4.12</releaseinfo>
<keywordset>
<keyword>KDE</keyword>
diff --git a/doc/kcontrol/kcmnotify/index.docbook b/doc/kcontrol/kcmnotify/index.docbook
index 361120a..a172604 100644
--- a/doc/kcontrol/kcmnotify/index.docbook
+++ b/doc/kcontrol/kcmnotify/index.docbook
@@ -14,8 +14,8 @@
<!-- TRANS:ROLES_OF_TRANSLATORS -->
</authorgroup>
-<date>2011-11-28</date>
-<releaseinfo>&kde; 4.8</releaseinfo>
+<date>2013-12-05</date>
+<releaseinfo>&kde; 4.12</releaseinfo>
<keywordset>
<keyword>KDE</keyword>
diff --git a/doc/kcontrol/language/index.docbook b/doc/kcontrol/language/index.docbook
index 39c85c6..cf15342 100644
--- a/doc/kcontrol/language/index.docbook
+++ b/doc/kcontrol/language/index.docbook
@@ -14,8 +14,8 @@
<!-- TRANS:ROLES_OF_TRANSLATORS -->
</authorgroup>
- <date>2011-11-28</date>
- <releaseinfo>4.8</releaseinfo>
+ <date>2013-12-05</date>
+ <releaseinfo>4.12</releaseinfo>
<keywordset>
<keyword>KDE</keyword>
@@ -52,7 +52,9 @@ changes before you apply them.
</para>
<para>
-Each setting option in the various tabs has an individual Default button which
+Each setting option in the various tabs has an individual <inlinemediaobject>
+<imageobject><imagedata fileref="oxygen-22x22-document-revert.png" format="PNG"/>
+</imageobject></inlinemediaobject> default button which
is activated whenever that setting is different to your country default value.
Clicking on the button will restore only that setting to your Country default.
</para>
@@ -85,7 +87,7 @@ only.
<sect2 id="locale-languages">
-<title>Language</title>
+<title>Languages</title>
<para>
In this tab you can set your preferred languages for the &kde; Workspace and
@@ -97,9 +99,9 @@ The &kde; Workspace and Applications are written in American English and are
translated into many different languages by teams of volunteers. These
translations need to be installed first before you can choose to use them. The
list of <guilabel>Available Languages</guilabel> shows what KDE translations
-are available on your system. If the language you want to use is not shown in
-this list then you will need to install it using the usual method for your
-system. Your system may have enabled the
+are installed and available on your system. If the language you want to use is
+not shown in this list then you will need to install it using the usual method
+for your system. Your system may have enabled the
<guilabel>Install more languages</guilabel> button to make this easy for you.
</para>
@@ -123,6 +125,13 @@ on the Remove arrow button. You can change the order of preference in the
clicking on the Up or Down arrow button.
</para>
+<para>Only languages listed in <guilabel>Preferred Languages</guilabel> and
+<guilabel>Available Languages</guilabel> will be offered as options
+for <guilabel>Primary language</guilabel> and <guilabel>Fallback language</guilabel>
+in the <guilabel>Switch Application Language</guilabel> dialog of the
+<guimenu>Help</guimenu> menu.
+</para>
+
<note>
<para>
Language and Country/Region are independent settings. Changing a language does
@@ -354,6 +363,39 @@ different epochs (start dates). For example, the Hebrew calendar is into its
5750 to 5850.
</para>
+<para>The <guilabel>Week number system</guilabel> option determines how the
+week number will be calculated. There are four options available:</para>
+<variablelist>
+<varlistentry>
+<term><guilabel>ISO Week</guilabel></term>
+<listitem><para>Use the ISO standard Week Number. This will always use Monday
+as the first day of the ISO week. This is the most commonly used system.
+</para></listitem>
+</varlistentry>
+<varlistentry>
+<term><guilabel>Full First Week</guilabel></term>
+<listitem><para>The first week of the year starts on the first occurrence
+of the <emphasis>First day of the week</emphasis>, and lasts for seven days.
+Any days before Week 1 are considered part of the last week of the previous year.
+This system is most commonly used in the USA.
+</para></listitem>
+</varlistentry>
+<varlistentry>
+<term><guilabel>Partial First Week</guilabel></term>
+<listitem><para>The first week
+starts on the first day of the year. The second week of the year starts on
+the first occurrence of the <emphasis>First day of the week</emphasis>, and
+lasts for seven days. The first week may not contain seven days.
+</para></listitem>
+</varlistentry>
+<varlistentry>
+<term><guilabel>Simple Week</guilabel></term>
+<listitem><para>The first week starts on the first day of the year and lasts
+seven days, with all new weeks starting on the same weekday as the first day
+of the year.</para></listitem>
+</varlistentry>
+</variablelist>
+
<para>
In the <guilabel>First day of week</guilabel> drop-down box you can choose
which weekday is considered the first day of the week. This value is often
diff --git a/doc/kcontrol/language/oxygen-22x22-document-revert.png b/doc/kcontrol/language/oxygen-22x22-document-revert.png
new file mode 100644
index 0000000..75ff210
Binary files /dev/null and b/doc/kcontrol/language/oxygen-22x22-document-revert.png differ
diff --git a/doc/kcontrol/spellchecking/index.docbook b/doc/kcontrol/spellchecking/index.docbook
index d5be4b9..5952634 100644
--- a/doc/kcontrol/spellchecking/index.docbook
+++ b/doc/kcontrol/spellchecking/index.docbook
@@ -16,8 +16,8 @@
<!-- TRANS:ROLES_OF_TRANSLATORS -->
</authorgroup>
-<date>2010-09-02</date>
-<releaseinfo>&kde; 4.5</releaseinfo>
+<date>2013-12-05</date>
+<releaseinfo>&kde; 4.12</releaseinfo>
<keywordset>
<keyword>KDE</keyword>
More information about the kde-doc-english
mailing list