summaryrefslogtreecommitdiff
path: root/po/fi
diff options
context:
space:
mode:
authorTapio Lehtonen <tale@debian.org>2006-09-09 06:56:42 +0000
committerTapio Lehtonen <tale@debian.org>2006-09-09 06:56:42 +0000
commitf0e677f9df5959da9ce4fc18afcd11cb82c6b23f (patch)
treebb32017664d8acfeebed44bc9452647eee63cf8f /po/fi
parent4f8e5fbdc56345ed943c81fc1079cf154e652770 (diff)
downloadinstallation-guide-f0e677f9df5959da9ce4fc18afcd11cb82c6b23f.zip
Fixed build errors
Diffstat (limited to 'po/fi')
-rw-r--r--po/fi/hardware.po7
-rw-r--r--po/fi/random-bits.po4
2 files changed, 8 insertions, 3 deletions
diff --git a/po/fi/hardware.po b/po/fi/hardware.po
index 674d8f74b..e235860cc 100644
--- a/po/fi/hardware.po
+++ b/po/fi/hardware.po
@@ -6,7 +6,7 @@ msgstr ""
"Project-Id-Version: Debian Installation Guide hardware\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
"POT-Creation-Date: 2006-09-08 22:58+0000\n"
-"PO-Revision-Date: 2006-09-08 10:41+0300\n"
+"PO-Revision-Date: 2006-09-09 09:50+0300\n"
"Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
"MIME-Version: 1.0\n"
@@ -2142,10 +2142,15 @@ msgstr ""
"emolevy, jossa on neliytiminen SB1A 1480 -prosessori.\n"
"</para></listitem> </itemizedlist> \n"
"Kaikki tiedot tuetuista mips/mipsel-koneista löytyvät osoitteesta \n"
+<<<<<<< .mine
+"<ulink url=\"&url-linux-mips;\">Linux-MIPS homepage</ulink>. Seuraavassa kerrotaan vain Debianin asentimen tukemista järjestelmistä. Etsittäessä\n"
+"tukea muille laitemalleille kannattaa käyttää <ulink url=\"&url-list-subscribe;\">sähköpostituslistaa debian-&arch-listname;</ulink>."
+=======
"<ulink url=\\\"&url-linux-mips;\\\">Linux-MIPS homepage</ulink>. Seuraavassa "
"kerrotaan vain Debianin asentimen tukemista järjestelmistä. Etsittäessä\n"
"tukea muille laitemalleille kannattaa käyttää <ulink url=\"&url-list-"
"subscribe;\">sähköpostituslistaa debian-&arch-listname;</ulink>."
+>>>>>>> .r40549
#. Tag: title
#: hardware.xml:1058
diff --git a/po/fi/random-bits.po b/po/fi/random-bits.po
index e27b0f140..64fecc43a 100644
--- a/po/fi/random-bits.po
+++ b/po/fi/random-bits.po
@@ -6,7 +6,7 @@ msgstr ""
"Project-Id-Version: Debian Installation Guide random-bits\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
"POT-Creation-Date: 2006-08-09 13:37+0000\n"
-"PO-Revision-Date: 2006-09-08 10:45+0300\n"
+"PO-Revision-Date: 2006-09-09 09:52+0300\n"
"Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
"MIME-Version: 1.0\n"
@@ -743,7 +743,7 @@ msgstr "Jos &releasename; &debian; -romppu on liitettynä hakemistoon <filename>
#: random-bits.xml:440
#, no-c-format
msgid "Substitute one of the following for <replaceable>ARCH</replaceable> in the <command>debootstrap</command> command: <userinput>alpha</userinput>, <userinput>arm</userinput>, <userinput>hppa</userinput>, <userinput>i386</userinput>, <userinput>ia64</userinput>, <userinput>m68k</userinput>, <userinput>mips</userinput>, <userinput>mipsel</userinput>, <userinput>powerpc</userinput>, <userinput>s390</userinput>, or <userinput>sparc</userinput>."
-msgstr "Korvaa komennossa command>debootstrap</command> <replaceable>ARCH</replaceable> jollakin seuraavista: <userinput>alpha</userinput>, <userinput>arm</userinput>, <userinput>hppa</userinput>, <userinput>i386</userinput>, <userinput>ia64</userinput>, <userinput>m68k</userinput>, <userinput>mips</userinput>, <userinput>mipsel</userinput>, <userinput>powerpc</userinput>, <userinput>s390</userinput>, tai <userinput>sparc</userinput>."
+msgstr "Korvaa komennossa <command>debootstrap</command> <replaceable>ARCH</replaceable> jollakin seuraavista: <userinput>alpha</userinput>, <userinput>arm</userinput>, <userinput>hppa</userinput>, <userinput>i386</userinput>, <userinput>ia64</userinput>, <userinput>m68k</userinput>, <userinput>mips</userinput>, <userinput>mipsel</userinput>, <userinput>powerpc</userinput>, <userinput>s390</userinput>, tai <userinput>sparc</userinput>."
#. Tag: screen
#: random-bits.xml:457