aboutsummaryrefslogtreecommitdiffstats
path: root/norwegian/CD
diff options
context:
space:
mode:
authorKÃ¥re Thor Olsen <kaare>2003-06-20 22:50:18 +0000
committerKÃ¥re Thor Olsen <kaare>2003-06-20 22:50:18 +0000
commitf0d3509bc8212b8b685ac6367761b898b0583e3c (patch)
treeb554c686cf5cc1f642d9328a225f68713602238e /norwegian/CD
parent02f3e72d98be9fecee571bb08b800e16995cb458 (diff)
Synced with 1.12, 1.15, 1.16, 1.17 and 1.18, translation-check updated to 1.12 since I didn't try to translate the new paragraph from 1.13+1.14
CVS version numbers norwegian/CD/vendors/index.wml: 1.7 -> 1.8
Diffstat (limited to 'norwegian/CD')
-rw-r--r--norwegian/CD/vendors/index.wml19
1 files changed, 17 insertions, 2 deletions
diff --git a/norwegian/CD/vendors/index.wml b/norwegian/CD/vendors/index.wml
index 5285a7becf4..3f4ea69a8d5 100644
--- a/norwegian/CD/vendors/index.wml
+++ b/norwegian/CD/vendors/index.wml
@@ -1,16 +1,22 @@
-#use wml::debian::cdimage title="Leverandører av Debian-CDer" BARETITLE=true GEN_TIME="yes"
+#use wml::debian::template title="Leverandører av Debian-CDer" BARETITLE=true GEN_TIME="yes"
#use wml::debian::countries
-#use wml::debian::translation-check translation="1.11"
+#use wml::debian::translation-check translation="1.12"
+# !!!!!!!!!!!!!!
+# manglende lande tilføjet, template skiftet, nyt afsnit (cvs 1.13+1.14)
+# indsat som kommentarer (ikke oversat); søg efter "kaare/debian-www".
+# !!!!!!!!!!!!!!
<!--Oversatt til norsk av Tor Slettnes (tor@slett.net)-->
<p>
<a href="#ar"><ARc></a>&nbsp;&nbsp;<!-- Argentina -->
+ <a href="#am"><AMc></a>&nbsp;&nbsp;<!-- Armenia -->
<a href="#au"><AUc></a>&nbsp;&nbsp;<!-- Australia -->
<a href="#be"><BEc></a>&nbsp;&nbsp;<!-- Belgia -->
<a href="#br"><BRc></a>&nbsp;&nbsp;<!-- Brasil -->
<a href="#ca"><CAc></a>&nbsp;&nbsp;<!-- Canada -->
# <a href="#cl"><CLc></a>&nbsp;&nbsp;<!-- Chile -->
<a href="#co"><COc></a>&nbsp;&nbsp;<!-- Colombia -->
+ <a href="#cr"><CRc></a>&nbsp;&nbsp;<!-- Costa Rica -->
<a href="#dk"><DKc></a>&nbsp;&nbsp;<!-- Danmark -->
<a href="#fi"><FIc></a>&nbsp;&nbsp;<!-- Finland -->
<a href="#us"><USc></a>&nbsp;&nbsp;<!-- Forente Stater -->
@@ -23,12 +29,15 @@
<a href="#jp"><JPc></a>&nbsp;&nbsp;<!-- Japan -->
<a href="#lv"><LVc></a>&nbsp;&nbsp;<!-- Latvia -->
<a href="#mx"><MXc></a>&nbsp;&nbsp;<!-- Mexico -->
+ <a href="#my"><MYc></a>&nbsp;&nbsp;<!-- Malaysia -->
<a href="#nl"><NLc></a>&nbsp;&nbsp;<!-- Nederland -->
<a href="#nz"><NZc></a>&nbsp;&nbsp;<!-- New Zealand -->
<a href="#no"><NOc></a>&nbsp;&nbsp;<!-- Norge -->
+ <a href="#pe"><PEc></a>&nbsp;&nbsp;<!-- Peru -->
<a href="#pl"><PLc></a>&nbsp;&nbsp;<!-- Polen -->
<a href="#pt"><PTc></a>&nbsp;&nbsp;<!-- Portugal -->
<a href="#ru"><RUc></a>&nbsp;&nbsp;<!-- Russland -->
+ <a href="#lk"><LKc></a>&nbsp;&nbsp;<!-- Sri Lanka -->
<a href="#sg"><SGc></a>&nbsp;&nbsp;<!-- Singapore -->
<a href="#es"><ESc></a>&nbsp;&nbsp;<!-- Spania -->
<a href="#uk"><UKc></a>&nbsp;&nbsp;<!-- Storbritania -->
@@ -38,6 +47,7 @@
<a href="#tw"><TWc></a>&nbsp;&nbsp;<!-- Taiwan -->
<a href="#cz"><CZc></a>&nbsp;&nbsp;<!-- Tsjekkia -->
<a href="#de"><DEc></a>&nbsp;&nbsp;<!-- Tyskland -->
+ <a href="#ua"><UAc></a>&nbsp;&nbsp;<!-- Ukraina -->
<a href="#hu"><HUc></a>&nbsp;&nbsp;<!-- Ungarn -->
<a href="#ve"><VEc></a>&nbsp;&nbsp;<!-- Venezuela -->
<a href="#at"><ATc></a>&nbsp;&nbsp;<!-- Østerrike -->
@@ -119,6 +129,11 @@
markert som «videreforhandler». Merk at dette skulle ikke ha noen
effekt på kvaliteten av diskene.</p>
+# kaare/debian-www: følgende tekst skal indsættes og oversættes
+# <p>If you are having trouble with a vendor (e.g. you paid for CDs but
+# never received them), you can inform us by sending mail to
+# <email "cdvendors@debian.org">.</p>
+
<p>
Dersom du ønsker å kjøpe en datamaskin som allerede har Debian
installert, gå til siden for

© 2014-2024 Faster IT GmbH | imprint | privacy policy