* apt-inst/contrib/extracttar.cc:

[apt.git] / po / sv.po

diff --git a/po/sv.po b/po/sv.po
index bd8e136c630b39fbbd2792624ba169799f72a118..0e353079aa276ddcef634e20abc1ca9cc0af0f3e 100644 (file)
--- a/po/sv.po
+++ b/po/sv.po
@@ -1051,13 +1051,8 @@ msgstr "Internt fel, AutoRemover f
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Internt fel, AllUpgrade förstörde något"
 
-<<<<<<< TREE
-#: cmdline/apt-get.cc:1544
-#, fuzzy, c-format
-=======
 #: cmdline/apt-get.cc:1544
 #, c-format
->>>>>>> MERGE-SOURCE
 msgid "Couldn't find task %s"
 msgstr "Kunde inte hitta funktionen %s"
 
@@ -1071,13 +1066,8 @@ msgstr "Kunde inte hitta paketet %s"
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Observera, väljer %s för det reguljära uttrycket \"%s\"\n"
 
-<<<<<<< TREE
-#: cmdline/apt-get.cc:1712
-#, fuzzy, c-format
-=======
 #: cmdline/apt-get.cc:1712
 #, c-format
->>>>>>> MERGE-SOURCE
 msgid "%s set to manual installed.\n"
 msgstr "%s är satt till manuellt installerad.\n"
 
@@ -1267,12 +1257,7 @@ msgstr "Misslyckades med att behandla byggberoenden"
 msgid "Supported modules:"
 msgstr "Moduler som stöds:"
 
-<<<<<<< TREE
-#: cmdline/apt-get.cc:2630
-#, fuzzy
-=======
 #: cmdline/apt-get.cc:2630
->>>>>>> MERGE-SOURCE
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -2124,17 +2109,10 @@ msgstr "Ok
 msgid "Opening configuration file %s"
 msgstr "Öppnar konfigurationsfilen %s"
 
-<<<<<<< TREE
-#: apt-pkg/contrib/configuration.cc:510
-#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
-msgstr "Rad %d för lång (max %d)"
-=======
 #: apt-pkg/contrib/configuration.cc:510
 #, c-format
 msgid "Line %d too long (max %lu)"
 msgstr "Rad %d är för lång (max %lu)"
->>>>>>> MERGE-SOURCE
 
 #: apt-pkg/contrib/configuration.cc:606
 #, c-format
@@ -2606,15 +2584,9 @@ msgid "Error occurred while processing %s (UsePackage1)"
 msgstr "Fel uppstod vid hantering av %s (UsePackage1)"
 
 #: apt-pkg/pkgcachegen.cc:153
-<<<<<<< TREE
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr "Fel uppstod vid hantering av %s (NewFileVer1)"
-=======
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc1)"
 msgstr "Fel uppstod vid hantering av %s (NewFileDesc1)"
->>>>>>> MERGE-SOURCE
 
 #: apt-pkg/pkgcachegen.cc:178
 #, c-format
@@ -2642,15 +2614,9 @@ msgid "Error occurred while processing %s (NewVersion2)"
 msgstr "Fel uppstod vid hantering av %s (NewVersion2)"
 
 #: apt-pkg/pkgcachegen.cc:245
-<<<<<<< TREE
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (NewFileDesc2)"
-msgstr "Fel uppstod vid hantering av %s (NewFileVer1)"
-=======
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc2)"
 msgstr "Fel uppstod vid hantering av %s (NewFileDesc2)"
->>>>>>> MERGE-SOURCE
 
 #: apt-pkg/pkgcachegen.cc:251
 msgid "Wow, you exceeded the number of package names this APT is capable of."