Update po translations

CVS version numbers

finnish/po/cdimage.fi.po: 1.2 -> 1.3 
finnish/po/countries.fi.po: 1.33 -> 1.34 
finnish/po/langs.fi.po: 1.18 -> 1.19 
finnish/po/newsevents.fi.po: 1.3 -> 1.4 
finnish/po/organization.fi.po: 1.29 -> 1.30 
finnish/po/others.fi.po: 1.26 -> 1.27 
finnish/po/templates.fi.po: 1.44 -> 1.45 
finnish/po/wnpp.fi.po: 1.2 -> 1.3

8 files changed, 296 insertions, 223 deletions

diff --git a/finnish/po/cdimage.fi.po b/finnish/po/cdimage.fi.po
index 51d63892ecc..23e5ec33eb9 100644
--- a/finnish/po/cdimage.fi.po
+++ b/finnish/po/cdimage.fi.po
@@ -1,98 +1,111 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-webwml\n"
-"PO-Revision-Date: 2008-06-28 23:05+0300\n"
+"PO-Revision-Date: 2011-06-11 08:16+0300\n"
 "Last-Translator: Tommi Vainikainen <thv+debian@iki.fi>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../english/template/debian/cdimage.wml:8
+#. Translators: string printed by gpg --fingerprint in your language
+#: ../../english/CD/CD-keys.data:4 ../../english/CD/CD-keys.data:9
+#: ../../english/CD/CD-keys.data:14 ../../english/CD/CD-keys.data:19
+#: ../../english/CD/CD-keys.data:24 ../../english/CD/CD-keys.data:28
+msgid "Key fingerprint"
+msgstr "Avaimen sormenjälki"
+
+#. note: only change the sep(arator) if it's not good for your charset
+#: ../../english/template/debian/cdimage.wml:10
 msgid "&middot;"
 msgstr "&middot;"
 
-#: ../../english/template/debian/cdimage.wml:11
+#: ../../english/template/debian/cdimage.wml:13
 msgid "<void id=\"dc_faq\" />FAQ"
 msgstr "<void id=\"dc_faq\" />VUKK"
 
-#: ../../english/template/debian/cdimage.wml:14
+#: ../../english/template/debian/cdimage.wml:16
 msgid "Download with Jigdo"
 msgstr "Lataa jigdolla"
 
-#: ../../english/template/debian/cdimage.wml:17
+#: ../../english/template/debian/cdimage.wml:19
 msgid "Download via HTTP/FTP"
 msgstr "Lataa http/ftp:llä"
 
-#: ../../english/template/debian/cdimage.wml:20
+#: ../../english/template/debian/cdimage.wml:22
 msgid "Buy CDs or DVDs"
 msgstr "Osta CD:t/DVD:t"
 
-#: ../../english/template/debian/cdimage.wml:23
+#: ../../english/template/debian/cdimage.wml:25
 msgid "Network Install"
 msgstr "Verkkoasennus"
 
-#: ../../english/template/debian/cdimage.wml:26
+#: ../../english/template/debian/cdimage.wml:28
 msgid "<void id=\"dc_download\" />Download"
 msgstr "<void id=\"dc_download\" />Lataa verkosta"
 
-#: ../../english/template/debian/cdimage.wml:29
+#: ../../english/template/debian/cdimage.wml:31
 msgid "<void id=\"dc_misc\" />Misc"
 msgstr "<void id=\"dc_misc\" />Sekalaista"
 
-#: ../../english/template/debian/cdimage.wml:32
+#: ../../english/template/debian/cdimage.wml:34
 msgid "<void id=\"dc_artwork\" />Artwork"
 msgstr "<void id=\"dc_artwork\" />Kansikuvia"
 
-#: ../../english/template/debian/cdimage.wml:35
+#: ../../english/template/debian/cdimage.wml:37
 msgid "<void id=\"dc_mirroring\" />Mirroring"
 msgstr "<void id=\"dc_mirroring\" />Peilaukset"
 
-#: ../../english/template/debian/cdimage.wml:38
+#: ../../english/template/debian/cdimage.wml:40
 msgid "<void id=\"dc_rsyncmirrors\" />Rsync Mirrors"
 msgstr "<void id=\"dc_rsyncmirrors\" />Rsync-peilit"
 
-#: ../../english/template/debian/cdimage.wml:41
+#: ../../english/template/debian/cdimage.wml:43
+msgid "<void id=\"dc_verify\" />Verify"
+msgstr "<void id=\"dc_verify\" />Varmista"
+
+#: ../../english/template/debian/cdimage.wml:46
 msgid "<void id=\"dc_torrent\" />Download with Torrent"
 msgstr "<void id=\"dc_torrent\" />Lataa torrentilla"
 
-#: ../../english/template/debian/cdimage.wml:44
+#: ../../english/template/debian/cdimage.wml:49
 msgid "<void id=\"dc_relinfo\" />Image Release Info"
 msgstr "<void id=\"dc_relinfo\" />Vedosten julkaisutiedotteet"
 
-#: ../../english/template/debian/cdimage.wml:47
+#: ../../english/template/debian/cdimage.wml:52
 msgid "Debian CD team"
 msgstr "Debian-CD-ryhmä"
 
-#: ../../english/template/debian/cdimage.wml:50
+#: ../../english/template/debian/cdimage.wml:55
 msgid "debian_on_cd"
 msgstr "debian cd:llä"
 
-#: ../../english/template/debian/cdimage.wml:53
+#: ../../english/template/debian/cdimage.wml:58
 msgid "<void id=\"faq-bottom\" />faq"
 msgstr "<void id=\"faq-bottom\" />vukk"
 
-#: ../../english/template/debian/cdimage.wml:56
+#: ../../english/template/debian/cdimage.wml:61
 msgid "jigdo"
 msgstr "jigdo"
 
-#: ../../english/template/debian/cdimage.wml:59
+#: ../../english/template/debian/cdimage.wml:64
 msgid "http_ftp"
 msgstr "http/ftp"
 
-#: ../../english/template/debian/cdimage.wml:62
+#: ../../english/template/debian/cdimage.wml:67
 msgid "buy"
 msgstr "osta"
 
-#: ../../english/template/debian/cdimage.wml:65
+#: ../../english/template/debian/cdimage.wml:70
 msgid "net_install"
 msgstr "verkkoasennus"
 
-#: ../../english/template/debian/cdimage.wml:68
+#: ../../english/template/debian/cdimage.wml:73
 msgid "<void id=\"misc-bottom\" />misc"
 msgstr "<void id=\"misc-bottom\" />sekalaista"
 
-#: ../../english/template/debian/cdimage.wml:71
+#: ../../english/template/debian/cdimage.wml:76
 msgid ""
 "English-language <a href=\"/MailingLists/disclaimer\">public mailing list</"
 "a> for CDs/DVDs:"
diff --git a/finnish/po/countries.fi.po b/finnish/po/countries.fi.po
index e6572aa1648..de7a1fde9fa 100644
--- a/finnish/po/countries.fi.po
+++ b/finnish/po/countries.fi.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Debian webwml organization\n"
-"PO-Revision-Date: 2011-01-28 23:54+0200\n"
+"PO-Revision-Date: 2011-06-11 08:32+0300\n"
 "Last-Translator: Tommi Vainikainen <tvainika@debian.org>\n"
 "Language-Team: Finnish\n"
 "Language: Finnish\n"
@@ -262,150 +262,154 @@ msgid "Madagascar"
 msgstr "Madagaskar"
 
 #: ../../english/template/debian/countries.wml:215
+msgid "Macedonia, Republic of"
+msgstr "Makedonian tasavalta"
+
+#: ../../english/template/debian/countries.wml:218
 msgid "Mongolia"
 msgstr "Mongolia"
 
-#: ../../english/template/debian/countries.wml:218
+#: ../../english/template/debian/countries.wml:221
 msgid "Malta"
 msgstr "Malta"
 
-#: ../../english/template/debian/countries.wml:221
+#: ../../english/template/debian/countries.wml:224
 msgid "Mexico"
 msgstr "Meksiko"
 
-#: ../../english/template/debian/countries.wml:224
+#: ../../english/template/debian/countries.wml:227
 msgid "Malaysia"
 msgstr "Malesia"
 
-#: ../../english/template/debian/countries.wml:227
+#: ../../english/template/debian/countries.wml:230
 msgid "New Caledonia"
 msgstr "Uusi-Kaledonia"
 
-#: ../../english/template/debian/countries.wml:230
+#: ../../english/template/debian/countries.wml:233
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: ../../english/template/debian/countries.wml:233
+#: ../../english/template/debian/countries.wml:236
 msgid "Netherlands"
 msgstr "Alankomaat"
 
-#: ../../english/template/debian/countries.wml:236
+#: ../../english/template/debian/countries.wml:239
 msgid "Norway"
 msgstr "Norja"
 
-#: ../../english/template/debian/countries.wml:239
+#: ../../english/template/debian/countries.wml:242
 msgid "New Zealand"
 msgstr "Uusi-Seelanti"
 
-#: ../../english/template/debian/countries.wml:242
+#: ../../english/template/debian/countries.wml:245
 msgid "Panama"
 msgstr "Panama"
 
-#: ../../english/template/debian/countries.wml:245
+#: ../../english/template/debian/countries.wml:248
 msgid "Peru"
 msgstr "Peru"
 
-#: ../../english/template/debian/countries.wml:248
+#: ../../english/template/debian/countries.wml:251
 msgid "French Polynesia"
 msgstr "Ranskan Polynesia"
 
-#: ../../english/template/debian/countries.wml:251
+#: ../../english/template/debian/countries.wml:254
 msgid "Philippines"
 msgstr "Filippiinit"
 
-#: ../../english/template/debian/countries.wml:254
+#: ../../english/template/debian/countries.wml:257
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: ../../english/template/debian/countries.wml:257
+#: ../../english/template/debian/countries.wml:260
 msgid "Poland"
 msgstr "Puola"
 
-#: ../../english/template/debian/countries.wml:260
+#: ../../english/template/debian/countries.wml:263
 msgid "Portugal"
 msgstr "Portugali"
 
-#: ../../english/template/debian/countries.wml:263
+#: ../../english/template/debian/countries.wml:266
 msgid "Romania"
 msgstr "Romania"
 
-#: ../../english/template/debian/countries.wml:266
+#: ../../english/template/debian/countries.wml:269
 msgid "Serbia"
 msgstr "Serbia"
 
-#: ../../english/template/debian/countries.wml:269
+#: ../../english/template/debian/countries.wml:272
 msgid "Russia"
 msgstr "Venäjä"
 
-#: ../../english/template/debian/countries.wml:272
+#: ../../english/template/debian/countries.wml:275
 msgid "Saudi Arabia"
 msgstr "Saudi-Arabia"
 
-#: ../../english/template/debian/countries.wml:275
+#: ../../english/template/debian/countries.wml:278
 msgid "Sweden"
 msgstr "Ruotsi"
 
-#: ../../english/template/debian/countries.wml:278
+#: ../../english/template/debian/countries.wml:281
 msgid "Singapore"
 msgstr "Singapore"
 
-#: ../../english/template/debian/countries.wml:281
+#: ../../english/template/debian/countries.wml:284
 msgid "Slovenia"
 msgstr "Slovenia"
 
-#: ../../english/template/debian/countries.wml:284
+#: ../../english/template/debian/countries.wml:287
 msgid "Slovakia"
 msgstr "Slovakia"
 
-#: ../../english/template/debian/countries.wml:287
+#: ../../english/template/debian/countries.wml:290
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: ../../english/template/debian/countries.wml:290
+#: ../../english/template/debian/countries.wml:293
 msgid "Thailand"
 msgstr "Thaimaa"
 
-#: ../../english/template/debian/countries.wml:293
+#: ../../english/template/debian/countries.wml:296
 msgid "Tunisia"
 msgstr "Tunisia"
 
-#: ../../english/template/debian/countries.wml:296
+#: ../../english/template/debian/countries.wml:299
 msgid "Turkey"
 msgstr "Turkki"
 
-#: ../../english/template/debian/countries.wml:299
+#: ../../english/template/debian/countries.wml:302
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../../english/template/debian/countries.wml:302
+#: ../../english/template/debian/countries.wml:305
 msgid "Ukraine"
 msgstr "Ukraina"
 
-#: ../../english/template/debian/countries.wml:305
+#: ../../english/template/debian/countries.wml:308
 msgid "United Kingdom"
 msgstr "Iso-Britannia"
 
-#: ../../english/template/debian/countries.wml:308
+#: ../../english/template/debian/countries.wml:311
 msgid "United States"
 msgstr "Yhdysvallat"
 
-#: ../../english/template/debian/countries.wml:311
+#: ../../english/template/debian/countries.wml:314
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: ../../english/template/debian/countries.wml:314
+#: ../../english/template/debian/countries.wml:317
 msgid "Uzbekistan"
 msgstr "Uzbekistan"
 
-#: ../../english/template/debian/countries.wml:317
+#: ../../english/template/debian/countries.wml:320
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: ../../english/template/debian/countries.wml:320
+#: ../../english/template/debian/countries.wml:323
 msgid "Vietnam"
 msgstr "Vietnam"
 
-#: ../../english/template/debian/countries.wml:323
+#: ../../english/template/debian/countries.wml:326
 msgid "South Africa"
 msgstr "Etelä-Afrikka"
 
diff --git a/finnish/po/langs.fi.po b/finnish/po/langs.fi.po
index 1087ed1db63..47d320d2b0a 100644
--- a/finnish/po/langs.fi.po
+++ b/finnish/po/langs.fi.po
@@ -1,9 +1,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Debian webwml organization\n"
-"PO-Revision-Date: 2006-08-12 18:05+0200\n"
+"PO-Revision-Date: 2011-06-11 08:35+0300\n"
 "Last-Translator: unknown\n"
 "Language-Team: unknown\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -160,196 +161,200 @@ msgstr "sloveeni"
 msgid "Bulgarian"
 msgstr "bulgaria"
 
+#: ../../english/template/debian/language_names.wml:45
+msgid "Tamil"
+msgstr "tamili"
+
 #. for now, the following are only needed if you intend to translate intl/l10n
-#: ../../english/template/debian/language_names.wml:46
+#: ../../english/template/debian/language_names.wml:47
 msgid "Afrikaans"
 msgstr "afrikaans"
 
-#: ../../english/template/debian/language_names.wml:47
+#: ../../english/template/debian/language_names.wml:48
 msgid "Albanian"
 msgstr "albania"
 
-#: ../../english/template/debian/language_names.wml:48
+#: ../../english/template/debian/language_names.wml:49
+msgid "Asturian"
+msgstr "asturia"
+
+#: ../../english/template/debian/language_names.wml:50
 msgid "Amharic"
 msgstr "amhara"
 
-#: ../../english/template/debian/language_names.wml:49
+#: ../../english/template/debian/language_names.wml:51
 msgid "Azerbaijani"
 msgstr "azeri"
 
-#: ../../english/template/debian/language_names.wml:50
+#: ../../english/template/debian/language_names.wml:52
 msgid "Basque"
 msgstr "baski"
 
-#: ../../english/template/debian/language_names.wml:51
+#: ../../english/template/debian/language_names.wml:53
 msgid "Belarusian"
 msgstr "valkoven&auml;j&auml;"
 
-#: ../../english/template/debian/language_names.wml:52
+#: ../../english/template/debian/language_names.wml:54
 msgid "Bengali"
 msgstr "bengali"
 
-#: ../../english/template/debian/language_names.wml:53
+#: ../../english/template/debian/language_names.wml:55
 msgid "Bosnian"
 msgstr "bosnia"
 
-#: ../../english/template/debian/language_names.wml:54
+#: ../../english/template/debian/language_names.wml:56
 msgid "Breton"
 msgstr "bretoni"
 
-#: ../../english/template/debian/language_names.wml:55
+#: ../../english/template/debian/language_names.wml:57
 msgid "Cornish"
 msgstr "korni"
 
-#: ../../english/template/debian/language_names.wml:56
+#: ../../english/template/debian/language_names.wml:58
 msgid "Estonian"
 msgstr "viro"
 
-#: ../../english/template/debian/language_names.wml:57
+#: ../../english/template/debian/language_names.wml:59
 msgid "Faeroese"
 msgstr "fääri"
 
-#: ../../english/template/debian/language_names.wml:58
+#: ../../english/template/debian/language_names.wml:60
 msgid "Gaelic (Scots)"
 msgstr "gaeli (skotti)"
 
-#: ../../english/template/debian/language_names.wml:59
+#: ../../english/template/debian/language_names.wml:61
 msgid "Galician"
 msgstr "galicia"
 
-#: ../../english/template/debian/language_names.wml:60
+#: ../../english/template/debian/language_names.wml:62
 msgid "Georgian"
 msgstr "gruusia"
 
-#: ../../english/template/debian/language_names.wml:61
+#: ../../english/template/debian/language_names.wml:63
 msgid "Hebrew"
 msgstr "heprea"
 
-#: ../../english/template/debian/language_names.wml:62
+#: ../../english/template/debian/language_names.wml:64
 msgid "Hindi"
 msgstr "hindi"
 
-#: ../../english/template/debian/language_names.wml:63
+#: ../../english/template/debian/language_names.wml:65
 msgid "Icelandic"
 msgstr "islanti"
 
-#: ../../english/template/debian/language_names.wml:64
+#: ../../english/template/debian/language_names.wml:66
 msgid "Interlingua"
 msgstr "interlingua"
 
-#: ../../english/template/debian/language_names.wml:65
+#: ../../english/template/debian/language_names.wml:67
 msgid "Irish"
 msgstr "iiri"
 
-#: ../../english/template/debian/language_names.wml:66
+#: ../../english/template/debian/language_names.wml:68
 msgid "Kalaallisut"
 msgstr "grönlanti"
 
-#: ../../english/template/debian/language_names.wml:67
+#: ../../english/template/debian/language_names.wml:69
 msgid "Kannada"
 msgstr "kannada"
 
-#: ../../english/template/debian/language_names.wml:68
+#: ../../english/template/debian/language_names.wml:70
 msgid "Kurdish"
 msgstr "kurdi"
 
-#: ../../english/template/debian/language_names.wml:69
+#: ../../english/template/debian/language_names.wml:71
 msgid "Latvian"
 msgstr "latvia"
 
-#: ../../english/template/debian/language_names.wml:70
+#: ../../english/template/debian/language_names.wml:72
 msgid "Macedonian"
 msgstr "makedonia"
 
-#: ../../english/template/debian/language_names.wml:71
+#: ../../english/template/debian/language_names.wml:73
 msgid "Malay"
 msgstr "malaiji"
 
-#: ../../english/template/debian/language_names.wml:72
+#: ../../english/template/debian/language_names.wml:74
 msgid "Malayalam"
 msgstr "malajalam"
 
-#: ../../english/template/debian/language_names.wml:73
+#: ../../english/template/debian/language_names.wml:75
 msgid "Maltese"
 msgstr "malta"
 
-#: ../../english/template/debian/language_names.wml:74
+#: ../../english/template/debian/language_names.wml:76
 msgid "Manx"
 msgstr "manx"
 
-#: ../../english/template/debian/language_names.wml:75
+#: ../../english/template/debian/language_names.wml:77
 msgid "Maori"
 msgstr "maori"
 
-#: ../../english/template/debian/language_names.wml:76
+#: ../../english/template/debian/language_names.wml:78
 msgid "Mongolian"
 msgstr "mongoli"
 
-#: ../../english/template/debian/language_names.wml:78
+#: ../../english/template/debian/language_names.wml:80
 msgid "Norwegian Bokm&aring;l"
 msgstr "kirjanorja"
 
-#: ../../english/template/debian/language_names.wml:80
+#: ../../english/template/debian/language_names.wml:82
 msgid "Norwegian Nynorsk"
 msgstr "uusnorja"
 
-#: ../../english/template/debian/language_names.wml:81
+#: ../../english/template/debian/language_names.wml:83
 msgid "Occitan (post 1500)"
 msgstr "oksitaani (jälkeen vuoden 1500)"
 
-#: ../../english/template/debian/language_names.wml:82
+#: ../../english/template/debian/language_names.wml:84
 msgid "Persian"
 msgstr "persia"
 
-#: ../../english/template/debian/language_names.wml:83
+#: ../../english/template/debian/language_names.wml:85
 msgid "Serbian"
 msgstr "serbia"
 
-#: ../../english/template/debian/language_names.wml:84
+#: ../../english/template/debian/language_names.wml:86
 msgid "Slovenian"
 msgstr "sloveeni"
 
-#: ../../english/template/debian/language_names.wml:85
+#: ../../english/template/debian/language_names.wml:87
 msgid "Tajik"
 msgstr "tad&#382;ikki"
 
-#: ../../english/template/debian/language_names.wml:86
-msgid "Tamil"
-msgstr "tamili"
-
-#: ../../english/template/debian/language_names.wml:87
+#: ../../english/template/debian/language_names.wml:88
 msgid "Thai"
 msgstr "thai"
 
-#: ../../english/template/debian/language_names.wml:88
+#: ../../english/template/debian/language_names.wml:89
 msgid "Tonga"
 msgstr "tonga"
 
-#: ../../english/template/debian/language_names.wml:89
+#: ../../english/template/debian/language_names.wml:90
 msgid "Twi"
 msgstr "twi"
 
-#: ../../english/template/debian/language_names.wml:90
+#: ../../english/template/debian/language_names.wml:91
 msgid "Ukrainian"
 msgstr "ukraina"
 
-#: ../../english/template/debian/language_names.wml:91
+#: ../../english/template/debian/language_names.wml:92
 msgid "Vietnamese"
 msgstr "vietnam"
 
-#: ../../english/template/debian/language_names.wml:92
+#: ../../english/template/debian/language_names.wml:93
 msgid "Welsh"
 msgstr "wales"
 
-#: ../../english/template/debian/language_names.wml:93
+#: ../../english/template/debian/language_names.wml:94
 msgid "Xhosa"
 msgstr "xhosa"
 
-#: ../../english/template/debian/language_names.wml:94
+#: ../../english/template/debian/language_names.wml:95
 msgid "Yiddish"
 msgstr "jiddi&#353;"
 
-#: ../../english/template/debian/language_names.wml:95
+#: ../../english/template/debian/language_names.wml:96
 msgid "Zulu"
 msgstr "zulu"
 
diff --git a/finnish/po/newsevents.fi.po b/finnish/po/newsevents.fi.po
index 7b26a05aa5a..743557629ba 100644
--- a/finnish/po/newsevents.fi.po
+++ b/finnish/po/newsevents.fi.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-webwml\n"
-"PO-Revision-Date: 2011-01-28 23:56+0200\n"
+"PO-Revision-Date: 2011-06-11 08:36+0300\n"
 "Last-Translator: Tommi Vainikainen <tvainika@debian.org>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
 "Language: fi\n"
@@ -9,10 +9,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: ../../english/News/news.rdf.in:16
+msgid "Debian News"
+msgstr "Debian-uutiset"
+
+#: ../../english/News/news.rdf.in:19
+msgid "Debian Latest News"
+msgstr "Debianin tuoreimmat uutiset"
+
 #: ../../english/News/press/press.tags:11
 msgid "p<get-var page />"
 msgstr "s. <get-var page />"
 
+#: ../../english/News/weekly/dwn-to-rdf.pl:142
+msgid "The newsletter for the Debian community"
+msgstr "Uutiskirje Debian-yhteisölle"
+
 #: ../../english/events/speakers/speakers.defs:11
 msgid "Name:"
 msgstr "Nimi:"
diff --git a/finnish/po/organization.fi.po b/finnish/po/organization.fi.po
index 798a30c31bd..cc6e8e845ae 100644
--- a/finnish/po/organization.fi.po
+++ b/finnish/po/organization.fi.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Debian webwml organization\n"
-"PO-Revision-Date: 2010-05-22 12:44+0300\n"
+"PO-Revision-Date: 2011-06-11 09:11+0300\n"
 "Last-Translator: unknown\n"
 "Language-Team: unknown\n"
 "Language: \n"
@@ -53,17 +53,17 @@ msgid "Officers"
 msgstr "Virkailijat"
 
 #: ../../english/intro/organization.data:46
-#: ../../english/intro/organization.data:74
+#: ../../english/intro/organization.data:73
 msgid "Distribution"
 msgstr "Jakelu"
 
 #: ../../english/intro/organization.data:47
-#: ../../english/intro/organization.data:229
+#: ../../english/intro/organization.data:224
 msgid "Publicity"
 msgstr "Julkisuus"
 
 #: ../../english/intro/organization.data:48
-#: ../../english/intro/organization.data:251
+#: ../../english/intro/organization.data:246
 msgid "Support and Infrastructure"
 msgstr "Tuki ja infrastruktuuri"
 
@@ -76,23 +76,23 @@ msgstr "Debianin puhtaat sekoitukset"
 msgid "Leader"
 msgstr "Päällikkö"
 
-#: ../../english/intro/organization.data:60
+#: ../../english/intro/organization.data:59
 msgid "Technical Committee"
 msgstr "Tekninen komitea"
 
-#: ../../english/intro/organization.data:68
+#: ../../english/intro/organization.data:67
 msgid "Secretary"
 msgstr "sihteeri"
 
-#: ../../english/intro/organization.data:77
+#: ../../english/intro/organization.data:76
 msgid "Development Projects"
 msgstr "Kehitysprojektit"
 
-#: ../../english/intro/organization.data:78
+#: ../../english/intro/organization.data:77
 msgid "FTP Archives"
 msgstr "FTP-arkistot"
 
-#: ../../english/intro/organization.data:80
+#: ../../english/intro/organization.data:79
 msgid "FTP Master"
 msgstr "FTP-hallinto"
 
@@ -100,179 +100,167 @@ msgstr "FTP-hallinto"
 msgid "FTP Assistants"
 msgstr "FTP-avustajat"
 
-#: ../../english/intro/organization.data:91
+#: ../../english/intro/organization.data:89
 msgid "Individual Packages"
 msgstr "Yksittäiset paketit"
 
-#: ../../english/intro/organization.data:92
+#: ../../english/intro/organization.data:90
 msgid "Release Management"
 msgstr "Versiohallinto"
 
-#: ../../english/intro/organization.data:94
+#: ../../english/intro/organization.data:92
 msgid "Release Team"
 msgstr "Julkaisuryhmä"
 
-#: ../../english/intro/organization.data:106
+#: ../../english/intro/organization.data:105
 msgid "Volatile Team"
 msgstr "Volatile-ryhmä"
 
-#: ../../english/intro/organization.data:112
+#: ../../english/intro/organization.data:111
 msgid "Quality Assurance"
 msgstr "Laadunvalvonta"
 
-#: ../../english/intro/organization.data:113
+#: ../../english/intro/organization.data:112
 msgid "Installation System Team"
 msgstr "Käynnistyslevykkeet"
 
-#: ../../english/intro/organization.data:114
+#: ../../english/intro/organization.data:113
 msgid "Release Notes"
 msgstr "Julkistusmuistio"
 
-#: ../../english/intro/organization.data:116
+#: ../../english/intro/organization.data:115
 msgid "CD Images"
 msgstr "CD-raakakopiot"
 
-#: ../../english/intro/organization.data:118
+#: ../../english/intro/organization.data:117
 msgid "Production"
 msgstr "Tuotanto"
 
 #: ../../english/intro/organization.data:125
-msgid "Vendors"
-msgstr "Jälleenmyyjät"
-
-#: ../../english/intro/organization.data:127
 msgid "Testing"
 msgstr "Testaus"
 
-#: ../../english/intro/organization.data:129
+#: ../../english/intro/organization.data:127
 msgid "Autobuilding infrastructure"
 msgstr "Automattikääntäjien infrastruktuuri"
 
-#: ../../english/intro/organization.data:131
+#: ../../english/intro/organization.data:129
 msgid "Wanna-build team"
 msgstr "Wanna-build-ryhmä"
 
-#: ../../english/intro/organization.data:136
+#: ../../english/intro/organization.data:134
 msgid "Buildd administration"
 msgstr "Buildd-ylläpito"
 
-#: ../../english/intro/organization.data:155
+#: ../../english/intro/organization.data:153
 msgid "Documentation"
 msgstr "Dokumentointi"
 
-#: ../../english/intro/organization.data:160
+#: ../../english/intro/organization.data:158
 msgid "Work-Needing and Prospective Packages list"
 msgstr "WNPP-luettelo"
 
-#: ../../english/intro/organization.data:164
+#: ../../english/intro/organization.data:161
 msgid "Live System Team"
 msgstr "Live System -ryhmä"
 
-#: ../../english/intro/organization.data:165
+#: ../../english/intro/organization.data:162
 msgid "Ports"
 msgstr "Siirrokset"
 
-#: ../../english/intro/organization.data:218
+#: ../../english/intro/organization.data:164
+msgid "Alpha (Not active: was not released with squeeze)"
+msgstr "Alpha (Ei aktiivinen: ei julkaistu squeezen kanssa)"
+
+#: ../../english/intro/organization.data:214
 msgid "Special Configurations"
 msgstr "Erityisvaatimusprojektit"
 
-#: ../../english/intro/organization.data:221
+#: ../../english/intro/organization.data:217
 msgid "Laptops"
 msgstr "Kannettavat"
 
-#: ../../english/intro/organization.data:222
+#: ../../english/intro/organization.data:218
 msgid "Firewalls"
 msgstr "Palomuurit"
 
-#: ../../english/intro/organization.data:223
-msgid "Handhelds"
-msgstr "Kämmenlaitteet"
-
-#: ../../english/intro/organization.data:224
+#: ../../english/intro/organization.data:219
 msgid "Embedded systems"
 msgstr "Sulautetut järjestelmät"
 
-#: ../../english/intro/organization.data:232
+#: ../../english/intro/organization.data:227
 msgid "Press Contact"
 msgstr "Lehdistösihteeri"
 
-#: ../../english/intro/organization.data:236
+#: ../../english/intro/organization.data:232
 msgid "Partner Program"
 msgstr "Kumppaniohjelma"
 
-#: ../../english/intro/organization.data:241
+#: ../../english/intro/organization.data:237
 msgid "Events"
 msgstr "Tapahtumat"
 
-#: ../../english/intro/organization.data:246
-msgid "Marketing Team"
-msgstr "Markkinointiryhmä"
-
-#: ../../english/intro/organization.data:254
+#: ../../english/intro/organization.data:249
 msgid "User support"
 msgstr "Käyttäjätuki"
 
-#: ../../english/intro/organization.data:321
+#: ../../english/intro/organization.data:316
 msgid "Bug Tracking System"
 msgstr "Vianhallintajärjestelmä"
 
-#: ../../english/intro/organization.data:328
+#: ../../english/intro/organization.data:323
 msgid "Mailing Lists Administration and Mailing List Archives"
 msgstr "Postituslistojen hallinto ja arkistointi"
 
-#: ../../english/intro/organization.data:336
+#: ../../english/intro/organization.data:331
 msgid "New Maintainers Front Desk"
 msgstr "Uusien ylläpitäjien vastaanotto"
 
-#: ../../english/intro/organization.data:342
+#: ../../english/intro/organization.data:336
 msgid "Debian Account Managers"
 msgstr "Debian-käyttäjätunnuksien hallinta"
 
-#: ../../english/intro/organization.data:345
+#: ../../english/intro/organization.data:340
 msgid "Keyring Maintainers (PGP and GPG)"
 msgstr "Avainrenkaan ylläpitäjät (PGP ja GPG)"
 
-#: ../../english/intro/organization.data:348
-msgid "Debian Maintainer Keyring Team"
-msgstr "Debian-ylläpitäjien avainrengastiimi"
-
-#: ../../english/intro/organization.data:356
+#: ../../english/intro/organization.data:343
 msgid "Security Team"
 msgstr "Tietoturvatiimi"
 
-#: ../../english/intro/organization.data:370
+#: ../../english/intro/organization.data:359
 msgid "Testing Security Team"
 msgstr "Testattavan tietoturvatiimi"
 
-#: ../../english/intro/organization.data:379
+#: ../../english/intro/organization.data:368
 msgid "Security Audit Project"
 msgstr "Tietoturvatarkistus-projekti"
 
-#: ../../english/intro/organization.data:384
+#: ../../english/intro/organization.data:373
 msgid "Web Pages"
 msgstr "WWW-sivusto"
 
-#: ../../english/intro/organization.data:391
+#: ../../english/intro/organization.data:380
 msgid "Consultants Page"
 msgstr "Konsulttisivut"
 
-#: ../../english/intro/organization.data:395
+#: ../../english/intro/organization.data:384
 msgid "CD Vendors Page"
 msgstr "CD-jälleenmyyjien sivut"
 
-#: ../../english/intro/organization.data:398
+#: ../../english/intro/organization.data:387
 msgid "Planet Debian"
 msgstr "Planet-Debian"
 
-#: ../../english/intro/organization.data:402
+#: ../../english/intro/organization.data:391
 msgid "Policy"
 msgstr "Linja"
 
-#: ../../english/intro/organization.data:408
+#: ../../english/intro/organization.data:397
 msgid "System Administration"
 msgstr "Järjestelmäylläpito"
 
-#: ../../english/intro/organization.data:409
+#: ../../english/intro/organization.data:398
 msgid ""
 "This is the address to use when encountering problems on one of Debian's "
 "machines, including password problems or you need a package installed."
@@ -281,7 +269,7 @@ msgstr ""
 "kanssa tulee ongelmia esimerkiksi salasanojen kanssa, tai jos sinun pitää "
 "saada asennettua ohjelmapaketti."
 
-#: ../../english/intro/organization.data:414
+#: ../../english/intro/organization.data:403
 msgid ""
 "If you have hardware problems with Debian machines, please see <a href="
 "\"http://db.debian.org/machines.cgi\">Debian Machines</a> page, it should "
@@ -291,62 +279,73 @@ msgstr ""
 "debian.org/machines.cgi\">Debianin koneet</a> -sivu, siellä pitäisi olla "
 "kunkin koneen ylläpitäjän yhteystiedot."
 
-#: ../../english/intro/organization.data:415
+#: ../../english/intro/organization.data:404
 msgid "LDAP Developer Directory Administrator"
 msgstr "LDAP-kehittäjähakemiston ylläpito"
 
-#: ../../english/intro/organization.data:416
+#: ../../english/intro/organization.data:405
 msgid "Mirrors"
 msgstr "Ohjelmistopeilaukset"
 
-#: ../../english/intro/organization.data:420
+#: ../../english/intro/organization.data:409
 msgid "DNS Maintainer"
 msgstr "Nimipalveluvastaavat"
 
-#: ../../english/intro/organization.data:421
+#: ../../english/intro/organization.data:410
 msgid "Package Tracking System"
 msgstr "Pakettiseurantajärjestelmä"
 
-#: ../../english/intro/organization.data:423
-msgid "Key Signing Coordination"
-msgstr "Avainten allekirjoituskoordinointi"
-
-#: ../../english/intro/organization.data:426
+#: ../../english/intro/organization.data:412
 msgid "Hardware Donations Coordination"
 msgstr "Laitteistolahjoitusten koordinointi"
 
-#: ../../english/intro/organization.data:433
+#: ../../english/intro/organization.data:418
 msgid "Auditor"
 msgstr "Tilintarkastaja"
 
-#: ../../english/intro/organization.data:435
+#: ../../english/intro/organization.data:421
 msgid "Alioth administrators"
 msgstr "Alioth-ylläpitäjät"
 
-#: ../../english/intro/organization.data:440
+#: ../../english/intro/organization.data:426
 msgid "Debian Women Project"
 msgstr "Debian Women -projekti"
 
-#: ../../english/intro/organization.data:454
+#: ../../english/intro/organization.data:440
 msgid "Debian for children from 1 to 99"
 msgstr "Debian lapsille (1-99 v)"
 
-#: ../../english/intro/organization.data:457
+#: ../../english/intro/organization.data:443
 msgid "Debian for medical practice and research"
 msgstr "Debian terveydenhuollossa"
 
-#: ../../english/intro/organization.data:460
+#: ../../english/intro/organization.data:446
 msgid "Debian for education"
 msgstr "Debian oppilaitoksille"
 
-#: ../../english/intro/organization.data:467
+#: ../../english/intro/organization.data:453
 msgid "Debian in legal offices"
 msgstr "Debian lakitoimistoille"
 
-#: ../../english/intro/organization.data:471
+#: ../../english/intro/organization.data:457
 msgid "Debian for people with disabilities"
 msgstr "Debian toimintarajoitteisille henkilöille"
 
+#~ msgid "Vendors"
+#~ msgstr "Jälleenmyyjät"
+
+#~ msgid "Handhelds"
+#~ msgstr "Kämmenlaitteet"
+
+#~ msgid "Marketing Team"
+#~ msgstr "Markkinointiryhmä"
+
+#~ msgid "Debian Maintainer Keyring Team"
+#~ msgstr "Debian-ylläpitäjien avainrengastiimi"
+
+#~ msgid "Key Signing Coordination"
+#~ msgstr "Avainten allekirjoituskoordinointi"
+
 #~ msgid ""
 #~ "The admins responsible for buildd's for a particular arch can be reached "
 #~ "at <genericemail arch@buildd.debian.org>, for example <genericemail "
diff --git a/finnish/po/others.fi.po b/finnish/po/others.fi.po
index f9ad961c4af..947edd0eb88 100644
--- a/finnish/po/others.fi.po
+++ b/finnish/po/others.fi.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-webwml\n"
-"PO-Revision-Date: 2011-01-28 23:55+0200\n"
+"PO-Revision-Date: 2011-06-11 09:12+0300\n"
 "Last-Translator: Tommi Vainikainen <tvainika@debian.org>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
 "Language: fi\n"
@@ -232,6 +232,14 @@ msgstr "korvarenkaita"
 msgid "suitcases"
 msgstr "matkalaukkuja"
 
+#: ../../english/misc/merchandise.def:51
+msgid "umbrellas"
+msgstr "sateenvarjoja"
+
+#: ../../english/misc/merchandise.def:55
+msgid "pillowcases"
+msgstr "tyynyliinoja"
+
 #: ../../english/y2k/l10n.data:6
 msgid "OK"
 msgstr "OK"
diff --git a/finnish/po/templates.fi.po b/finnish/po/templates.fi.po
index 18f108c55c7..71b68a47e62 100644
--- a/finnish/po/templates.fi.po
+++ b/finnish/po/templates.fi.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-webwml\n"
-"PO-Revision-Date: 2011-02-02 23:37+0200\n"
+"PO-Revision-Date: 2011-06-11 09:12+0300\n"
 "Last-Translator: Tommi Vainikainen <tvainika@debian.org>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
 "Language: fi\n"
@@ -9,6 +9,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: ../../english/template/debian/basic.wml:19
+#: ../../english/template/debian/navbar.wml:12
+msgid "Debian"
+msgstr "Debian"
+
 #: ../../english/template/debian/common_translation.wml:4
 msgid "Yes"
 msgstr "Kyllä"
@@ -162,20 +167,12 @@ msgstr "versiossa 2.1"
 msgid "in release 2.2"
 msgstr "versiossa 2.2"
 
-#: ../../english/template/debian/footer.wml:14
-msgid "Have you found a problem with the site layout?"
-msgstr "Oletko havainnut ongelman sivuston ulkoasussa?"
-
-#: ../../english/template/debian/footer.wml:18
-msgid "Report it!"
-msgstr "Ilmoita siitä!"
-
 #. TRANSLATORS: Please make clear in the translation of the following
 #. item that mail sent to the debian-www list *must* be in English. Also,
 #. you can add some information of your own translation mailing list
 #. (i.e. debian-l10n-XXXXXX@lists.debian.org) for reporting things in
 #. your language.
-#: ../../english/template/debian/footer.wml:98
+#: ../../english/template/debian/footer.wml:96
 msgid ""
 "To report a problem with the web site, e-mail <a href=\"mailto:debian-"
 "www@lists.debian.org\">debian-www@lists.debian.org</a>.  For other contact "
@@ -186,19 +183,19 @@ msgstr ""
 "debian.org</a>. Muut yhteystiedot löytyvät <a href=\"m4_HOME/contact"
 "\">kontaktisivulta</a>."
 
-#: ../../english/template/debian/footer.wml:101
+#: ../../english/template/debian/footer.wml:99
 msgid "Last Modified"
 msgstr "Viimeksi muutettu"
 
-#: ../../english/template/debian/footer.wml:104
+#: ../../english/template/debian/footer.wml:102
 msgid "Copyright"
 msgstr "Tekijänoikeudet"
 
-#: ../../english/template/debian/footer.wml:107
+#: ../../english/template/debian/footer.wml:105
 msgid "See <a href=\"m4_HOME/license\" rel=\"copyright\">license terms</a>"
 msgstr "Katso <a href=\"m4_HOME/license\" rel=\"copyright\">lisenssiehtoja</a>"
 
-#: ../../english/template/debian/footer.wml:110
+#: ../../english/template/debian/footer.wml:108
 msgid ""
 "Debian is a registered <a href=\"m4_HOME/trademark\">trademark</a> of "
 "Software in the Public Interest, Inc."
@@ -206,12 +203,12 @@ msgstr ""
 "Debian on Software in the Public Interest, Inc.'in rekisteröimä <a href="
 "\"m4_HOME/trademark\">tavaramerkki</a>."
 
-#: ../../english/template/debian/languages.wml:191
-#: ../../english/template/debian/languages.wml:220
+#: ../../english/template/debian/languages.wml:193
+#: ../../english/template/debian/languages.wml:229
 msgid "This page is also available in the following languages:"
 msgstr "Tämä sivu on olemassa myös seuraavilla kielillä:"
 
-#: ../../english/template/debian/languages.wml:244
+#: ../../english/template/debian/languages.wml:231
 msgid "How to set <a href=m4_HOME/intro/cn>the default document language</a>"
 msgstr "Oletuskielen <a href=m4_HOME/intro/cn>asettamisohjeet</a>"
 
@@ -392,8 +389,12 @@ msgid "Debian Developer's Packages Overview"
 msgstr "Debian-kehittäjien pakettikatsaus"
 
 #: ../../english/template/debian/mirrors.wml:8
-msgid "Select a server near you: &nbsp;"
-msgstr "Valitse läheinen palvelin: &nbsp;"
+msgid "Select a server near you"
+msgstr "Valitse läheinen palvelin"
+
+#: ../../english/template/debian/navbar.wml:11
+msgid "Debian Home"
+msgstr "Debian-koti"
 
 #: ../../english/template/debian/recent_list.wml:7
 msgid "No items for this year."
@@ -487,6 +488,12 @@ msgstr "URL"
 msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
 msgstr "Takaisin <a href=\"../\">Ketkä käyttävät Debiania?-sivulle</a>."
 
+#~ msgid "Have you found a problem with the site layout?"
+#~ msgstr "Oletko havainnut ongelman sivuston ulkoasussa?"
+
+#~ msgid "Report it!"
+#~ msgstr "Ilmoita siitä!"
+
 #~ msgid "More information"
 #~ msgstr "Lisätietoa"
 
diff --git a/finnish/po/wnpp.fi.po b/finnish/po/wnpp.fi.po
index 36f576143a6..dfe9842bea4 100644
--- a/finnish/po/wnpp.fi.po
+++ b/finnish/po/wnpp.fi.po
@@ -1,9 +1,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-webwml\n"
-"PO-Revision-Date: 2008-06-28 23:05+0300\n"
+"PO-Revision-Date: 2011-06-11 09:14+0300\n"
 "Last-Translator: Tommi Vainikainen <thv+debian@iki.fi>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -46,32 +47,56 @@ msgstr "adoptiossa eilisestä lähtien."
 msgid "%s days in adoption."
 msgstr "%s päivää adoptiossa."
 
+#: ../../english/template/debian/wnpp.wml:46
+msgid "%s days in adoption, last activity today."
+msgstr "%s päivää adoptiossa, viimeisin toiminta tänään."
+
+#: ../../english/template/debian/wnpp.wml:50
+msgid "%s days in adoption, last activity yesterday."
+msgstr "% päivää adoptiossa, viimeinen toiminta eilen."
+
+#: ../../english/template/debian/wnpp.wml:54
+msgid "%s days in adoption, last activity %s days ago."
+msgstr "%s päivää adoptiossa, viimeinen toiminta %s päivää sitten."
+
 #. timespans for being_packaged (ITPs)
-#: ../../english/template/debian/wnpp.wml:47
+#: ../../english/template/debian/wnpp.wml:60
 msgid "in preparation since today."
 msgstr "valmistelussa tästä päivästä lähtien."
 
-#: ../../english/template/debian/wnpp.wml:51
+#: ../../english/template/debian/wnpp.wml:64
 msgid "in preparation since yesterday."
 msgstr "valmistelussa eilisestä lähtien."
 
-#: ../../english/template/debian/wnpp.wml:55
+#: ../../english/template/debian/wnpp.wml:68
 msgid "%s days in preparation."
 msgstr "%s päivää valmistelussa."
 
+#: ../../english/template/debian/wnpp.wml:72
+msgid "%s days in preparation, last activity today."
+msgstr "%s päivää valmistelussa, viimeinen toiminta tänään."
+
+#: ../../english/template/debian/wnpp.wml:76
+msgid "%s days in preparation, last activity yesterday."
+msgstr "%s päivää valmistelussa, viimeinen toiminta eilen."
+
+#: ../../english/template/debian/wnpp.wml:80
+msgid "%s days in preparation, last activity %s days ago."
+msgstr "%s päivää valmistelussa, viimeinen toiminta %s päivää sitten."
+
 #. time spans for requested (RFPs) and help requested (RFHs)
-#: ../../english/template/debian/wnpp.wml:60
+#: ../../english/template/debian/wnpp.wml:85
 msgid "requested today."
 msgstr "pyydetty tänään."
 
-#: ../../english/template/debian/wnpp.wml:64
+#: ../../english/template/debian/wnpp.wml:89
 msgid "requested yesterday."
 msgstr "pyydetty eilen."
 
-#: ../../english/template/debian/wnpp.wml:68
+#: ../../english/template/debian/wnpp.wml:93
 msgid "requested %s days ago."
 msgstr "pyydetty %s päivää sitten."
 
-#: ../../english/template/debian/wnpp.wml:82
+#: ../../english/template/debian/wnpp.wml:107
 msgid "package info"
 msgstr "pakettitietoa"