aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--docs/mcc-help/nb.po16
-rw-r--r--docs/mcc-help/nb/XFdrake.xml2
-rw-r--r--docs/mcc-help/nb/drakwizard_proftpd.xml2
-rw-r--r--docs/mcc-help/nb/drakwizard_squid.xml2
-rw-r--r--docs/mcc-help/nb/drakwizard_sshd.xml2
-rw-r--r--docs/mcc-help/nb/logdrake.xml6
-rw-r--r--docs/stylesheets/WebHelp-DrakX.xsl14
-rw-r--r--docs/stylesheets/WebHelp-MCC.xsl14
-rw-r--r--docs/stylesheets/po/doc_xsl.pot2
9 files changed, 44 insertions, 16 deletions
diff --git a/docs/mcc-help/nb.po b/docs/mcc-help/nb.po
index a8943827..275a3f9e 100644
--- a/docs/mcc-help/nb.po
+++ b/docs/mcc-help/nb.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
"POT-Creation-Date: 2018-02-10 09:47+0200\n"
-"PO-Revision-Date: 2018-02-13 17:55+0000\n"
+"PO-Revision-Date: 2018-02-14 23:41+0000\n"
"Last-Translator: Karl Morten Ramberg <karl.m.ramberg@gmail.com>\n"
"Language-Team: Norwegian Bokmål (http://www.transifex.com/MageiaLinux/mageia/"
"language/nb/)\n"
@@ -6347,7 +6347,7 @@ msgstr ""
#. type: Content of: <section><section><procedure><step><title>
#: en/drakwizard_proftpd.xml:60
msgid "Server Options"
-msgstr "Tjenervalg"
+msgstr "Servervalg"
#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
#: en/drakwizard_proftpd.xml:63
@@ -6411,7 +6411,7 @@ msgstr ""
#. type: Content of: <section><section><title>
#: en/drakwizard_squid.xml:29
msgid "What is a proxy server?"
-msgstr "Hva er en mellomtjener?"
+msgstr "Hva er en proxyserver?"
#. type: Content of: <section><section><para>
#: en/drakwizard_squid.xml:31
@@ -6645,7 +6645,7 @@ msgstr "Starter om <code>squid.</code>"
#. type: Content of: <section><info><title>
#: en/drakwizard_sshd.xml:3
msgid "OpenSSH daemon configuration"
-msgstr "OpenSSH-tjeneroppsett"
+msgstr "OpenSSH-serveroppsett"
#. type: Content of: <section><info><subtitle>
#: en/drakwizard_sshd.xml:3
@@ -7296,7 +7296,7 @@ msgstr "Webmin-tjeneste"
#. type: Content of: <section><section><itemizedlist><listitem><para>
#: en/logdrake.xml:63
msgid "Postfix Mail Server"
-msgstr "E-posttjeneren Postfix"
+msgstr "E-postserveren Postfix"
#. type: Content of: <section><section><itemizedlist><listitem><para>
#: en/logdrake.xml:67
@@ -7306,7 +7306,7 @@ msgstr "FTP-tjener"
#. type: Content of: <section><section><itemizedlist><listitem><para>
#: en/logdrake.xml:71
msgid "Apache World Wide Web Server"
-msgstr "Vevtjeneren Apache"
+msgstr "Webserveren Apache"
#. type: Content of: <section><section><itemizedlist><listitem><para>
#: en/logdrake.xml:75
@@ -7316,7 +7316,7 @@ msgstr "SSH-tjener"
#. type: Content of: <section><section><itemizedlist><listitem><para>
#: en/logdrake.xml:79
msgid "Samba Server"
-msgstr "Samba-tjener"
+msgstr "Samba-server"
#. type: Content of: <section><section><itemizedlist><listitem><para>
#: en/logdrake.xml:83
@@ -11039,7 +11039,7 @@ msgstr ""
#. type: Content of: <section><info><title>
#: en/XFdrake.xml:3
msgid "Set up the graphical server"
-msgstr "Sett opp den grafiske tjeneren"
+msgstr "Sett opp den grafiske serveren"
#. type: Content of: <section><info><subtitle>
#: en/XFdrake.xml:5
diff --git a/docs/mcc-help/nb/XFdrake.xml b/docs/mcc-help/nb/XFdrake.xml
index 4d90a6ec..78752208 100644
--- a/docs/mcc-help/nb/XFdrake.xml
+++ b/docs/mcc-help/nb/XFdrake.xml
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="XFdrake" version="5.0" xml:lang="nb">
<info>
- <title xml:id="XFdrake-ti1">Sett opp den grafiske tjeneren</title>
+ <title xml:id="XFdrake-ti1">Sett opp den grafiske serveren</title>
<subtitle>XFdrake</subtitle>
</info>
diff --git a/docs/mcc-help/nb/drakwizard_proftpd.xml b/docs/mcc-help/nb/drakwizard_proftpd.xml
index ceef85d2..d8437e66 100644
--- a/docs/mcc-help/nb/drakwizard_proftpd.xml
+++ b/docs/mcc-help/nb/drakwizard_proftpd.xml
@@ -63,7 +63,7 @@ sende klager til og om å tillate root login tilgang.
</para>
</step>
<step>
- <title>Tjenervalg</title>
+ <title>Servervalg</title>
<mediaobject>
<imageobject>
<imagedata xml:id="drakwizard_proftpd-im5" revision="1" align="center" format="PNG" fileref="drakwizard-ftp-step4.png"/>
diff --git a/docs/mcc-help/nb/drakwizard_squid.xml b/docs/mcc-help/nb/drakwizard_squid.xml
index c6493ea6..e490ec61 100644
--- a/docs/mcc-help/nb/drakwizard_squid.xml
+++ b/docs/mcc-help/nb/drakwizard_squid.xml
@@ -27,7 +27,7 @@ opp en proxy server. Det er en delkomponent til drakwizard som må væfre
installeret før du kan få tilgang til den. </para>
<section>
- <title>Hva er en mellomtjener?</title>
+ <title>Hva er en proxyserver?</title>
<para>En proxy-server er en server (et datasystem eller et program) som fungerer
som formidler for forespørsler fra klienter som søker ressurser fra andre
diff --git a/docs/mcc-help/nb/drakwizard_sshd.xml b/docs/mcc-help/nb/drakwizard_sshd.xml
index 0d4b1d3e..73118f06 100644
--- a/docs/mcc-help/nb/drakwizard_sshd.xml
+++ b/docs/mcc-help/nb/drakwizard_sshd.xml
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="drakwizard_sshd" version="5.0" xml:lang="nb">
<info>
- <title xml:id="drakwizard_sshd-ti1">OpenSSH-tjeneroppsett</title><subtitle>drakwizard sshd</subtitle>
+ <title xml:id="drakwizard_sshd-ti1">OpenSSH-serveroppsett</title><subtitle>drakwizard sshd</subtitle>
</info>
<mediaobject>
diff --git a/docs/mcc-help/nb/logdrake.xml b/docs/mcc-help/nb/logdrake.xml
index e14132d9..938ca6c2 100644
--- a/docs/mcc-help/nb/logdrake.xml
+++ b/docs/mcc-help/nb/logdrake.xml
@@ -63,7 +63,7 @@ tjenester, og du kan velge hvilke du vil se på. (Se skjermbilde ovenfor).</para
</listitem>
<listitem>
- <para>E-posttjeneren Postfix</para>
+ <para>E-postserveren Postfix</para>
</listitem>
<listitem>
@@ -71,7 +71,7 @@ tjenester, og du kan velge hvilke du vil se på. (Se skjermbilde ovenfor).</para
</listitem>
<listitem>
- <para>Vevtjeneren Apache</para>
+ <para>Webserveren Apache</para>
</listitem>
<listitem>
@@ -79,7 +79,7 @@ tjenester, og du kan velge hvilke du vil se på. (Se skjermbilde ovenfor).</para
</listitem>
<listitem>
- <para>Samba-tjener</para>
+ <para>Samba-server</para>
</listitem>
<listitem>
diff --git a/docs/stylesheets/WebHelp-DrakX.xsl b/docs/stylesheets/WebHelp-DrakX.xsl
index bf5f695b..5720a159 100644
--- a/docs/stylesheets/WebHelp-DrakX.xsl
+++ b/docs/stylesheets/WebHelp-DrakX.xsl
@@ -377,6 +377,20 @@ are in the xml:id's -->
<l:gentext key="HighlightButton" text="Toggle search result highlighting"/>
<l:gentext key="Your_search_returned_no_results" text="Your search returned no results."/>
</l:l10n>
+ <l:l10n language="nb">
+ <l:gentext key="Search" text="Søk"/>
+ <l:gentext key="Enter_a_term_and_click" text="Skriv inn et søkeord og klikk"/>
+ <l:gentext key="Go" text="Kjør"/>
+ <l:gentext key="to_perform_a_search" text="for å gjøre et søk"/>
+ <l:gentext key="txt_filesfound" text="Vis resultater"/>
+ <l:gentext key="txt_enter_at_least_1_char" text="Du må skrive inn minst ett tegn"/>
+ <l:gentext key="txt_browser_not_supported" text="JavaScript er ikke aktivert i nettleseren. Vennligst aktiver JavaScript for å kunne bruke alle funksjonene på denne siden."/>
+ <l:gentext key="txt_please_wait" text="Vennligst vent. Søk pågår....."/>
+ <l:gentext key="txt_results_for" text="Resultater for:"/>
+ <l:gentext key="TableofContents" text="Innhold"/>
+ <l:gentext key="HighlightButton" text="Bytt utheving av søkeresultat"/>
+ <l:gentext key="Your_search_returned_no_results" text="Ditt søk ga ingen resultater"/>
+ </l:l10n>
<l:l10n language="nl">
<l:gentext key="Search" text="Zoeken"/>
<l:gentext key="Enter_a_term_and_click" text="Voer een zoekterm in en klik op "/>
diff --git a/docs/stylesheets/WebHelp-MCC.xsl b/docs/stylesheets/WebHelp-MCC.xsl
index 59a7a8bd..c6178e30 100644
--- a/docs/stylesheets/WebHelp-MCC.xsl
+++ b/docs/stylesheets/WebHelp-MCC.xsl
@@ -374,6 +374,20 @@ are in the xml:id's -->
<l:gentext key="HighlightButton" text="Toggle search result highlighting"/>
<l:gentext key="Your_search_returned_no_results" text="Your search returned no results."/>
</l:l10n>
+ <l:l10n language="nb">
+ <l:gentext key="Search" text="Søk"/>
+ <l:gentext key="Enter_a_term_and_click" text="Skriv inn et søkeord og klikk"/>
+ <l:gentext key="Go" text="Kjør"/>
+ <l:gentext key="to_perform_a_search" text="for å gjøre et søk"/>
+ <l:gentext key="txt_filesfound" text="Vis resultater"/>
+ <l:gentext key="txt_enter_at_least_1_char" text="Du må skrive inn minst ett tegn"/>
+ <l:gentext key="txt_browser_not_supported" text="JavaScript er ikke aktivert i nettleseren. Vennligst aktiver JavaScript for å kunne bruke alle funksjonene på denne siden."/>
+ <l:gentext key="txt_please_wait" text="Vennligst vent. Søk pågår....."/>
+ <l:gentext key="txt_results_for" text="Resultater for:"/>
+ <l:gentext key="TableofContents" text="Innhold"/>
+ <l:gentext key="HighlightButton" text="Bytt utheving av søkeresultat"/>
+ <l:gentext key="Your_search_returned_no_results" text="Ditt søk ga ingen resultater"/>
+ </l:l10n>
<l:l10n language="nl">
<l:gentext key="Search" text="Zoeken"/>
<l:gentext key="Enter_a_term_and_click" text="Voer een zoekterm in en klik op "/>
diff --git a/docs/stylesheets/po/doc_xsl.pot b/docs/stylesheets/po/doc_xsl.pot
index e5903fcb..5fe5550b 100644
--- a/docs/stylesheets/po/doc_xsl.pot
+++ b/docs/stylesheets/po/doc_xsl.pot
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia XSL files translation\n"
"Report-Msgid-Bugs-To: i18n-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2018-01-07 18:51+0200\n"
+"POT-Creation-Date: 2018-02-15 17:03+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
generated by cgit v1.2.1 (git 2.21.0) at 2024-06-29 09:28:41 +0000