Another sync with Christian

diff --git a/debian/changelog b/debian/changelog
index f618b84dffea6861f28dcd97561cc1ea319f992e..48429c9daee66c600769242d68681ed87dc98351 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
 apt (0.7.4) UNRELEASED; urgency=low
 
-  [Michael Vogt]
+  [ Michael Vogt ]
   * cmdline/apt-get.cc:
     - fix in the task-install code regexp (thanks to Adam Conrad and
       Colin Watson)
 
-  [Otavio Salvador]
+  [ Otavio Salvador ]
   * Fix a typo on 0.7.3 changelog entry about g++ (7.3 to 4.3)
   * Fix compilation warnings:
     - apt-pkg/contrib/configuration.cc: wrong argument type;
@@ -22,8 +22,16 @@ apt (0.7.4) UNRELEASED; urgency=low
   * Fix example for Install-{Recommends,Suggests} options on
     configure-index example file. Thanks to Peter Eisentraut
     <peter_e@gmx.net> by the patch (closes: #432223)
+  
+  [ Christian Perrier ]
+  * Basque translation update. Closes: ##423766
+  * Unfuzzy formerly complete translations
+  * French translation update
+  * Re-generate PO(T) files
+  * Spanish translation update
+  * Swedish translation update
 
- -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 11 Jul 2007 23:20:15 +0100
+ -- Otavio Salvador <otavio@ossystems.com.br>  Sat, 14 Jul 2007 15:52:15 -0300
 
 apt (0.7.3) unstable; urgency=low
 
@@ -2562,4 +2570,3 @@ apt (0.0.1) unstable; urgency=low
   * Initial Release.
 
  -- Scott K. Ellis <scott@debian.org>  Tue, 31 Mar 1998 12:49:28 -0500
-

diff --git a/po/sv.po b/po/sv.po
index 0e353079aa276ddcef634e20abc1ca9cc0af0f3e..bd8e136c630b39fbbd2792624ba169799f72a118 100644 (file)
--- a/po/sv.po
+++ b/po/sv.po
@@ -1051,8 +1051,13 @@ 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"
 
@@ -1066,8 +1071,13 @@ 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"
 
@@ -1257,7 +1267,12 @@ 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"
@@ -2109,10 +2124,17 @@ 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
@@ -2584,9 +2606,15 @@ 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
@@ -2614,9 +2642,15 @@ 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."