[Suse-i18n-commit] r52537 - trunk/lcn/et/po
Novell Forge SVN
Date: 2009-10-19 04:51:29 -0600 (Mon, 19 Oct 2009)
New Revision: 52537
Modified:
trunk/lcn/et/po/zypp.et.po
Log:
mergedmerged
Modified: trunk/lcn/et/po/zypp.et.po
===================================================================
--- trunk/lcn/et/po/zypp.et.po 2009-10-19 10:51:19 UTC (rev 52536)
+++ trunk/lcn/et/po/zypp.et.po 2009-10-19 10:51:29 UTC (rev 52537)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: zypp.et\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-01 18:11+0200\n"
+"POT-Creation-Date: 2009-10-14 15:02+0200\n"
"PO-Revision-Date: 2009-06-10 09:49+0300\n"
"Last-Translator: Ain Vagula <ava...@gmail.com>\n"
"Language-Team: Estonian <linu...@lists.eenet.ee>\n"
@@ -18,7 +18,7 @@
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: KBabel 1.11.4\n"
-#: zypp/solver/detail/SATResolver.cc:1016
+#: zypp/solver/detail/SATResolver.cc:1042
msgid ""
"\n"
"uninstallable providers: "
@@ -39,36 +39,36 @@
msgid " execution failed"
msgstr " käivitamine nurjus"
-#: zypp/target/TargetImpl.cc:241
+#: zypp/target/TargetImpl.cc:243
msgid " execution skipped while aborting"
msgstr " käivitamine jäeti katkestamise käigus vahele"
-#: zypp/solver/detail/SATResolver.cc:963
+#: zypp/solver/detail/SATResolver.cc:989
#, c-format
msgid "%s conflicts with %s provided by %s"
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:926
+#: zypp/solver/detail/SATResolver.cc:952
#, c-format
msgid "%s does not belong to a distupgrade repository"
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:930
+#: zypp/solver/detail/SATResolver.cc:956
#, c-format
msgid "%s has inferior architecture"
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:948
+#: zypp/solver/detail/SATResolver.cc:974
#, c-format
msgid "%s is not installable"
msgstr "%s pole paigaldatav"
-#: zypp/solver/detail/SATResolver.cc:968
+#: zypp/solver/detail/SATResolver.cc:994
#, c-format
msgid "%s obsoletes %s provided by %s"
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:1004
+#: zypp/solver/detail/SATResolver.cc:1030
#, c-format
msgid "%s requires %s, but this requirement cannot be provided"
msgstr ""
@@ -322,7 +322,7 @@
msgstr ""
#. !\todo add comma to the message for the next release
-#: zypp/media/MediaCurl.cc:1506 zypp/media/MediaSMB.cc:426
+#: zypp/media/MediaCurl.cc:1500 zypp/media/MediaSMB.cc:426
#, c-format
msgid "Authentication required for '%s'"
msgstr ""
@@ -1136,6 +1136,13 @@
"Error message: %s\n"
msgstr ""
+#. Ask for retry on partial downloads, when it makes sense to retry with --continue!
+#. Other errors are handled by the layers above.
+#: zypp/media/MediaAria2c.cc:448
+#, c-format
+msgid "Download interrupted at %d%%"
+msgstr ""
+
#. language code: dra
#: zypp/LanguageCode.cc:470
msgid "Dravidian (Other)"
@@ -1265,9 +1272,9 @@
msgid "Error occurred while setting download (metalink curl) options for '%s':"
msgstr ""
-#: zypp/target/TargetImpl.cc:287 zypp/target/TargetImpl.cc:307
-#: zypp/target/TargetImpl.cc:336 zypp/target/TargetImpl.cc:370
-#: zypp/target/TargetImpl.cc:378
+#: zypp/target/TargetImpl.cc:298 zypp/target/TargetImpl.cc:318
+#: zypp/target/TargetImpl.cc:346 zypp/target/TargetImpl.cc:383
+#: zypp/target/TargetImpl.cc:391
#, fuzzy
#| msgid "Error during key encryption."
msgid "Error sending update message notification."
@@ -1329,7 +1336,7 @@
msgstr "Võtme kustutamine nurjus."
#. TranslatorExplanation: Failed to download <FILENAME> from <SERVERURL>.
-#: zypp/media/MediaAria2c.cc:441
+#: zypp/media/MediaAria2c.cc:461
#, fuzzy, c-format
msgid "Failed to download %s from %s"
msgstr "%s - %s ei saa avada\n"
@@ -1713,7 +1720,7 @@
msgid "Hausa"
msgstr "Hausa"
-#: zypp/solver/detail/SATResolver.cc:944
+#: zypp/solver/detail/SATResolver.cc:970
msgid "Have you enabled all requested repositories?"
msgstr ""
@@ -1872,8 +1879,8 @@
msgid "Ingush"
msgstr "Inguši"
-#: zypp/target/TargetImpl.cc:1026 zypp/target/TargetImpl.cc:1078
-#: zypp/target/TargetImpl.cc:1371
+#: zypp/target/TargetImpl.cc:1041 zypp/target/TargetImpl.cc:1093
+#: zypp/target/TargetImpl.cc:1389
msgid "Installation has been aborted as directed."
msgstr ""
@@ -2822,8 +2829,7 @@
msgid "New Zealand"
msgstr "Uus-Meremaa"
-#. without root prefix
-#: zypp/target/TargetImpl.cc:422
+#: zypp/target/TargetImpl.cc:437
msgid "New update message"
msgstr ""
@@ -3806,8 +3812,8 @@
msgid "This action is being run by another program already."
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:1151
-#: zypp/solver/detail/SATResolver.cc:1172
+#: zypp/solver/detail/SATResolver.cc:1177
+#: zypp/solver/detail/SATResolver.cc:1198
#, fuzzy
msgid "This request will break your system!"
msgstr "Päring on juba olemas."
@@ -4329,7 +4335,7 @@
msgid "applydeltarpm failed."
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:1273
+#: zypp/solver/detail/SATResolver.cc:1299
#, c-format
msgid "architecture change of %s to %s"
msgstr ""
@@ -4341,12 +4347,12 @@
msgid "break %s by ignoring some of its dependencies"
msgstr "Sõltuvuste kontrollimine"
-#: zypp/solver/detail/SATResolver.cc:958
+#: zypp/solver/detail/SATResolver.cc:984
#, c-format
msgid "cannot install both %s and %s"
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:937
+#: zypp/solver/detail/SATResolver.cc:963
msgid "conflicting requests"
msgstr "vastuolulised päringud"
@@ -4355,47 +4361,47 @@
msgid "created backup %s"
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:1303
+#: zypp/solver/detail/SATResolver.cc:1329
#, fuzzy, c-format
msgid "deinstallation of %s"
msgstr "Paigaldamine"
-#: zypp/solver/detail/SATResolver.cc:1006
+#: zypp/solver/detail/SATResolver.cc:1032
msgid "deleted providers: "
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:1179
+#: zypp/solver/detail/SATResolver.cc:1205
#, c-format
msgid "do not ask to delete all solvables providing %s"
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:1157
+#: zypp/solver/detail/SATResolver.cc:1183
#, c-format
msgid "do not ask to install a solvable providing %s"
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:1100
+#: zypp/solver/detail/SATResolver.cc:1126
#, fuzzy, c-format
msgid "do not forbid installation of %s"
msgstr "Käivita paigaldus või süsteem"
-#: zypp/solver/detail/SATResolver.cc:1080
-#: zypp/solver/detail/SATResolver.cc:1116
+#: zypp/solver/detail/SATResolver.cc:1106
+#: zypp/solver/detail/SATResolver.cc:1142
#, c-format
msgid "do not install %s"
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:1192
+#: zypp/solver/detail/SATResolver.cc:1218
#, c-format
msgid "do not install most recent version of %s"
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:1075
+#: zypp/solver/detail/SATResolver.cc:1101
#, fuzzy, c-format
msgid "do not keep %s installed"
msgstr "paigaldamata"
-#: zypp/solver/detail/SATResolver.cc:1265
+#: zypp/solver/detail/SATResolver.cc:1291
#, c-format
msgid "downgrade of %s to %s"
msgstr ""
@@ -4404,24 +4410,24 @@
msgid "generally ignore of some dependecies"
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:1152
-#: zypp/solver/detail/SATResolver.cc:1173
+#: zypp/solver/detail/SATResolver.cc:1178
+#: zypp/solver/detail/SATResolver.cc:1199
msgid "ignore the warning of a broken system"
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:1283
+#: zypp/solver/detail/SATResolver.cc:1309
#, c-format
msgid ""
"install %s (with vendor change)\n"
" %s --> %s"
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:1218
+#: zypp/solver/detail/SATResolver.cc:1244
#, c-format
msgid "install %s despite the inferior architecture"
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:1232
+#: zypp/solver/detail/SATResolver.cc:1258
#, c-format
msgid "install %s from excluded repository"
msgstr ""
@@ -4431,19 +4437,19 @@
msgstr "vigane"
#. for solver reason: NOT weak lock.
-#: zypp/solver/detail/SATResolver.cc:1095
-#: zypp/solver/detail/SATResolver.cc:1137
-#: zypp/solver/detail/SATResolver.cc:1248
+#: zypp/solver/detail/SATResolver.cc:1121
+#: zypp/solver/detail/SATResolver.cc:1163
+#: zypp/solver/detail/SATResolver.cc:1274
#, c-format
msgid "keep %s"
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:1213
+#: zypp/solver/detail/SATResolver.cc:1239
#, c-format
msgid "keep %s despite the inferior architecture"
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:1227
+#: zypp/solver/detail/SATResolver.cc:1253
#, fuzzy, c-format
#| msgid "Obsoletes"
msgid "keep obsolete %s"
@@ -4457,22 +4463,22 @@
msgid "libhal_set_dbus_connection: Can't set dbus connection"
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:953
+#: zypp/solver/detail/SATResolver.cc:979
#, c-format
msgid "nothing provides %s needed by %s"
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:943
+#: zypp/solver/detail/SATResolver.cc:969
#, c-format
msgid "nothing provides requested %s"
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:934
+#: zypp/solver/detail/SATResolver.cc:960
#, fuzzy, c-format
msgid "problem with installed package %s"
msgstr "Paigaldatud pakettide lugemine"
-#: zypp/solver/detail/SATResolver.cc:1292
+#: zypp/solver/detail/SATResolver.cc:1318
#, c-format
msgid "replacement of %s with %s"
msgstr ""
@@ -4505,16 +4511,16 @@
"Here are the first 25 lines of difference:\n"
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:972
+#: zypp/solver/detail/SATResolver.cc:998
#, c-format
msgid "solvable %s conflicts with %s provided by itself"
msgstr ""
-#: zypp/solver/detail/SATResolver.cc:940
+#: zypp/solver/detail/SATResolver.cc:966
msgid "some dependency problem"
msgstr "mingi sõltuvuse probleem"
-#: zypp/solver/detail/SATResolver.cc:1018
+#: zypp/solver/detail/SATResolver.cc:1044
msgid "uninstallable providers: "
msgstr "kättesaamatud varustajad: "
_______________________________________________
Suse-i18n-commit mailing list
Suse-i18...@forge.novell.com
http://forge.novell.com/mailman/listinfo/suse-i18n-commit