Author: minton
Date: 2015-12-07 20:04:19 +0100 (Mon, 07 Dec 2015)
New Revision: 95139
Modified:
trunk/yast/fi/po/update.fi.po
Log:
Merged update.pot for fi
Modified: trunk/yast/fi/po/update.fi.po
===================================================================
--- trunk/yast/fi/po/update.fi.po 2015-12-07 19:04:18 UTC (rev 95138)
+++ trunk/yast/fi/po/update.fi.po 2015-12-07 19:04:19 UTC (rev 95139)
@@ -20,7 +20,7 @@
msgstr ""
"Project-Id-Version: update.fi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-04 15:53+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2014-10-27 22:03+0200\n"
"Last-Translator: Jyri Palokangas \n"
"Language-Team: Finnish \n"
@@ -150,7 +150,7 @@
#. screen title for update options
#. this is a heading
-#: src/clients/inst_update.rb:48 src/clients/update_proposal.rb:278
+#: src/clients/inst_update.rb:48 src/clients/update_proposal.rb:284
msgid "Update Options"
msgstr "Päivitysvalinnat"
@@ -179,9 +179,9 @@
#. TRANSLATORS: label for an unknown installed system
#: src/clients/inst_update.rb:69 src/clients/inst_update.rb:74
#: src/include/update/rootpart.rb:100 src/include/update/rootpart.rb:106
-#: src/include/update/rootpart.rb:126 src/modules/RootPart.rb:155
-#: src/modules/RootPart.rb:1434 src/modules/RootPart.rb:1440
-#: src/modules/RootPart.rb:1981
+#: src/include/update/rootpart.rb:126 src/modules/RootPart.rb:156
+#: src/modules/RootPart.rb:1441 src/modules/RootPart.rb:1447
+#: src/modules/RootPart.rb:1994
msgid "Unknown"
msgstr "Tuntematon"
@@ -298,28 +298,30 @@
msgstr "Mahdollisesti havaittiin keskeneräinen asennus."
#. proposal for packages during update, %1 is count of packages
-#: src/clients/packages_proposal.rb:115
+#: src/clients/packages_proposal.rb:119
msgid "Packages to Update: %1"
msgstr "Päivitettävät paketit: %1"
#. proposal for packages during update, %1 is count of packages
-#: src/clients/packages_proposal.rb:123
+#: src/clients/packages_proposal.rb:127
msgid "New Packages to Install: %1"
msgstr "Uudet asennettavat paketit: %1"
#. proposal for packages during update, %1 is count of packages
-#: src/clients/packages_proposal.rb:131
+#: src/clients/packages_proposal.rb:135
msgid "Packages to Remove: %1"
msgstr "Poistettavat paketit: %1"
#. part of summary, %1 is size of packages (in MB or GB)
-#: src/clients/packages_proposal.rb:139
+#: src/clients/packages_proposal.rb:143
msgid "Total Size of Packages to Update: %1"
msgstr "Päivitettävien pakettien yhteiskoko: %1"
-#. warning text
-#: src/clients/packages_proposal.rb:149
-msgid "Cannot solve all conflicts. Manual intervention is required."
+#. TRANSLATORS: warning text, keep the HTML tags (<a href...>) untouched
+#: src/clients/packages_proposal.rb:154
+#, fuzzy
+#| msgid "Cannot solve all conflicts. Manual intervention is required."
+msgid "Cannot solve all conflicts. Manual intervention is required.</a>"
msgstr "Kaikkien ongelmien ratkaisu ei onnistu. Vaaditaan käyttäjän toimia."
#. this is a heading
@@ -364,27 +366,29 @@
#. error message in proposal
#. part of error popup message
-#: src/clients/update_proposal.rb:85 src/clients/update_proposal.rb:384
+#: src/clients/update_proposal.rb:87 src/clients/update_proposal.rb:390
msgid "Cannot read the current RPM Database."
msgstr "Nykyisen RPM-tietokannan lukeminen ei onnistunut."
-#. error message in proposal
-#: src/clients/update_proposal.rb:101
-msgid "The installed product is not compatible with the product on the installation media."
-msgstr "Asennettu tuote ei ole yhteensopiva asennustietovälineellä olevan tuotteen kanssa."
-
#. TRANSLATORS: unknown product (label)
#. TRANSLATORS: unknown product (label)
#. TRANSLATORS: unknown product name
#. TRANSLATORS: unknown product name
-#: src/clients/update_proposal.rb:110 src/clients/update_proposal.rb:128
-#: src/clients/update_proposal.rb:171 src/clients/update_proposal.rb:177
+#: src/clients/update_proposal.rb:101 src/clients/update_proposal.rb:119
+#: src/clients/update_proposal.rb:174 src/clients/update_proposal.rb:180
msgid "Unknown product"
msgstr "Tuntematon tuote"
+#. error message in proposal
+#: src/clients/update_proposal.rb:129
+#, fuzzy
+#| msgid "The installed product is not compatible with the product on the installation media."
+msgid "The installed product (%{update_from}) is not compatible with the product on the installation media (%{update_to})."
+msgstr "Asennettu tuote ei ole yhteensopiva asennustietovälineellä olevan tuotteen kanssa."
+
#. TRANSLATORS: proposal error, %1 is the version of installed system
#. %2 is the version being installed
-#: src/clients/update_proposal.rb:143
+#: src/clients/update_proposal.rb:146
msgid ""
"Updating system to another version (%1 -> %2) is not supported on the running system.<br>\n"
"Boot from the installation media and use a normal upgrade\n"
@@ -395,22 +399,22 @@
"tai poista käytöstä tuotteen eri version asennuslähteet.\n"
#. TRANSLATORS: proposal warning, both %1 and %2 are replaced with product names
-#: src/clients/update_proposal.rb:164
+#: src/clients/update_proposal.rb:167
msgid "Warning: Updating from '%1' to '%2', products do not exactly match."
msgstr "Varoitus: Päivitetään '%1' -> '%2', tuotteet eivät täysin täsmää."
#. Proposal for backup during update
-#: src/clients/update_proposal.rb:191
+#: src/clients/update_proposal.rb:194
msgid "Only update installed packages"
msgstr "Päivitä vain asennetut paketit"
#. proposal string
-#: src/clients/update_proposal.rb:206
+#: src/clients/update_proposal.rb:209
msgid "Update based on patterns"
msgstr "Päivitys pohjautuu ohjelmistoryhmiin"
#. TRANSLATORS: proposal dialog help
-#: src/clients/update_proposal.rb:232
+#: src/clients/update_proposal.rb:238
msgid ""
"<p><b><big>Update Options</big></b> Select how your system will be updated.\n"
"Choose if only installed packages should be updated or new ones should be\n"
@@ -423,17 +427,17 @@
"(oletusvalinta) ja poistetaanko ylläpitämättömät paketit.</p>\n"
#. this is a menu entry
-#: src/clients/update_proposal.rb:280
+#: src/clients/update_proposal.rb:286
msgid "&Update Options"
msgstr "&Päivitysvalinnat"
#. part of error popup message, %1 stands for newline-separated list of files
-#: src/clients/update_proposal.rb:387
+#: src/clients/update_proposal.rb:393
msgid "None of these files exist:%1"
msgstr "Mitään näistä tiedostoista ei ole olemassa:%1"
#. continue-cancel popup
-#: src/clients/update_proposal.rb:517
+#: src/clients/update_proposal.rb:529
msgid ""
"The installed product is not compatible with the product\n"
"on the installation media. If you try to update using the\n"
@@ -596,7 +600,7 @@
msgstr "&Kyllä, jatka"
#. Link to SDB article concerning renaming of devices.
-#: src/modules/RootPart.rb:108
+#: src/modules/RootPart.rb:109
msgid ""
"See the SDB article at %1 for details\n"
"about how to solve this problem."
@@ -605,17 +609,17 @@
"miten tämä ongelma ratkaistaan."
#. label - name of sustem to update
-#: src/modules/RootPart.rb:146
+#: src/modules/RootPart.rb:147
msgid "Unknown Linux System"
msgstr "Tuntematon Linux-järjestelmä"
#. label - name of sustem to update
-#: src/modules/RootPart.rb:151
+#: src/modules/RootPart.rb:152
msgid "Non-Linux System"
msgstr "Muu kuin Linux-järjestelmä"
#. error report, %1 is device (eg. /dev/hda1)
-#: src/modules/RootPart.rb:307
+#: src/modules/RootPart.rb:308
msgid ""
"Cannot unmount partition %1.\n"
"\n"
@@ -630,7 +634,7 @@
"tai käynnistä tietokone uudelleen.\n"
#. label, %1 is partition
-#: src/modules/RootPart.rb:378
+#: src/modules/RootPart.rb:379
msgid "Checking partition %1"
msgstr "Tarkistetaan osiota %1"
@@ -639,23 +643,23 @@
#. @param string button (true)
#. @param string button (false)
#. @param [String] details (hidden under [Details] button; optional; to disable, use "")
-#: src/modules/RootPart.rb:415
+#: src/modules/RootPart.rb:416
msgid "Show &Details"
msgstr "Näytä tie&dot"
#. #176292, run fsck before jfs is mounted
-#: src/modules/RootPart.rb:497
+#: src/modules/RootPart.rb:498
msgid "Checking file system on %1..."
msgstr "Tarkistetaan tiedostojärjestelmää %1..."
#. popup headline
-#: src/modules/RootPart.rb:529
+#: src/modules/RootPart.rb:530
msgid "File System Check Failed"
msgstr "Tiedostojärjestelmän tarkistus epäonnistui."
#. popup question (continue/cancel dialog)
#. %1 is a device name such as /dev/hda5
-#: src/modules/RootPart.rb:533
+#: src/modules/RootPart.rb:534
msgid ""
"The file system check of device %1 has failed.\n"
"\n"
@@ -666,24 +670,24 @@
"Haluatko jatkaa laitteen liittämistä?\n"
#. button
-#: src/modules/RootPart.rb:542
+#: src/modules/RootPart.rb:543
msgid "&Skip Mounting"
msgstr "&Ohita laitteen liittäminen"
#. yes-no popup
-#: src/modules/RootPart.rb:1058
+#: src/modules/RootPart.rb:1065
msgid "Incorrect password. Try again?"
msgstr "Väärä salasana. Yritetäänkö uudelleen?"
#. TRANSLATORS: a popup headline
-#: src/modules/RootPart.rb:1161
+#: src/modules/RootPart.rb:1168
msgid "Warning"
msgstr "Varoitus"
#. TRANSLATORS: error message,
#. %1 is replaced with the current /boot partition size
#. %2 with the recommended size
-#: src/modules/RootPart.rb:1166
+#: src/modules/RootPart.rb:1173
msgid ""
"Your /boot partition is too small (%1 MB).\n"
"We recommend a size of no less than %2 MB or else the new Kernel may not fit.\n"
@@ -700,7 +704,7 @@
"Haluatko jatkaa nykyisen järjestelmän päivittämistä?\n"
#. label in a popup, %1 is device (eg. /dev/hda1), %2 is output of the 'mount' command
-#: src/modules/RootPart.rb:1258
+#: src/modules/RootPart.rb:1265
msgid ""
"The partition %1 could not be mounted.\n"
"\n"
@@ -721,27 +725,27 @@
"Keskeyttääksesi päivityksen napsauta \"Peruuta\".\n"
#. push button
-#: src/modules/RootPart.rb:1276
+#: src/modules/RootPart.rb:1283
msgid "&Specify Mount Options"
msgstr "Määritä liito&svalinnat"
#. popup heading
-#: src/modules/RootPart.rb:1292
+#: src/modules/RootPart.rb:1299
msgid "Mount Options"
msgstr "Liitosvalinnat"
#. text entry label
-#: src/modules/RootPart.rb:1295
+#: src/modules/RootPart.rb:1302
msgid "&Mount Point"
msgstr "&Liitoskohta"
#. tex entry label
-#: src/modules/RootPart.rb:1298
+#: src/modules/RootPart.rb:1305
msgid "&Device"
msgstr "&Laite"
#. text entry label
-#: src/modules/RootPart.rb:1303
+#: src/modules/RootPart.rb:1310
msgid ""
"&File System\n"
"(empty for autodetection)"
@@ -750,12 +754,12 @@
"(tyhjä = automaattitunnistus)"
#. error message
-#: src/modules/RootPart.rb:1380
+#: src/modules/RootPart.rb:1387
msgid "The /var partition %1 could not be mounted.\n"
msgstr "/var-osion %1 liittäminen ei onnistu.\n"
#. Informational text about selected partition, %x are replaced with values later
-#: src/modules/RootPart.rb:1421
+#: src/modules/RootPart.rb:1428
msgid ""
"<b>File system:</b> %1, <b>Type:</b> %2,<br>\n"
"<b>Label:</b> %3, <b>Size:</b> %4,<br>\n"
@@ -767,17 +771,17 @@
"<b>udev ID:</b> %5,<br>\n"
"<b>udev polku:</b> %6"
-#: src/modules/RootPart.rb:1435
+#: src/modules/RootPart.rb:1442
msgid "None"
msgstr "Ei mikään"
#. a popup caption
-#: src/modules/RootPart.rb:1458
+#: src/modules/RootPart.rb:1465
msgid "Unable to find the /var partition automatically"
msgstr "/var-osioa ei löydetty automaattisesti"
#. a popup message
-#: src/modules/RootPart.rb:1463
+#: src/modules/RootPart.rb:1470
msgid ""
"Your system uses a separate /var partition which is required for the upgrade\n"
"process to detect the disk-naming changes. Select the /var partition manually\n"
@@ -788,22 +792,22 @@
"jatkaaksesi päivitystoimintoa."
#. a combo-box label
-#: src/modules/RootPart.rb:1476
+#: src/modules/RootPart.rb:1483
msgid "&Select /var Partition Device"
msgstr "&Valitse /var-osion -laite"
#. an informational rich-text widget label
-#: src/modules/RootPart.rb:1482
+#: src/modules/RootPart.rb:1489
msgid "Device Info"
msgstr "Laitetiedot"
#. error message
-#: src/modules/RootPart.rb:1623
+#: src/modules/RootPart.rb:1630
msgid "Unable to mount /var partition with this disk configuration.\n"
msgstr "/var-osion liittäminen ei onnistu tällä levymäärityksellä.\n"
#. popup message, %1 will be replace with the name of the logfile
-#: src/modules/RootPart.rb:1654
+#: src/modules/RootPart.rb:1661
msgid ""
"Partitions could not be mounted.\n"
"\n"
@@ -816,7 +820,7 @@
#. read the keyboard settings now, so that it used when
#. typing passwords for encrypted partitions
#. Calling a script because otherwise this module would depend on yast2-country
-#: src/modules/RootPart.rb:1698
+#: src/modules/RootPart.rb:1705
msgid ""
"Some partitions in the system on %1 are mounted by kernel-device name. This is\n"
"not reliable for the update since kernel-device names are unfortunately not\n"
@@ -829,32 +833,32 @@
"liitostapa johonkin muuhun tapaan."
#. error message
-#: src/modules/RootPart.rb:1716
+#: src/modules/RootPart.rb:1723
msgid "No fstab found."
msgstr "Tiedostoa fstab ei löytynyt."
#. message part 1
-#: src/modules/RootPart.rb:1741
+#: src/modules/RootPart.rb:1748
msgid "The root partition in /etc/fstab has an invalid root device.\n"
msgstr "Juuriosiolla /etc/fstab-tiedostossa on virheellinen juurilaite.\n"
#. message part 2
-#: src/modules/RootPart.rb:1746
+#: src/modules/RootPart.rb:1753
msgid "It is currently mounted as %1 but listed as %2.\n"
msgstr "Se on tällä hetkellä liitettynä %1 mutta listattu %2.\n"
#. prepare progress-bar
-#: src/modules/RootPart.rb:2102
+#: src/modules/RootPart.rb:2115
msgid "Evaluating root partition. One moment please..."
msgstr "Tutkitaan juuriosiota. Pieni hetki..."
#. intermediate popup while mounting partitions
-#: src/modules/RootPart.rb:2184
+#: src/modules/RootPart.rb:2197
msgid "Mounting partitions. One moment please..."
msgstr "Osioita otetaan käyttöön. Pieni hetki..."
#. TRANSLATORS: dialog caption
-#: src/modules/RootPart.rb:2199
+#: src/modules/RootPart.rb:2212
msgid "Searching for Available Systems"
msgstr "Etsitään käytettävissä olevia järjestelmiä"
