diff options
| author | bubulle@debian.org <> | 2006-08-21 10:55:15 -0500 |
|---|---|---|
| committer | bubulle@debian.org <> | 2006-08-21 10:55:15 -0500 |
| commit | 3784e34677882fbea8538baa1c25b0d35abf429a (patch) | |
| tree | 2c4d4f7c81d6126fdce3b1c4665c7f80efb0fb74 /po/gl.po | |
| parent | 8fa7672020f75a9ec7d3ffcfd8c8f3aad6f159b7 (diff) | |
| parent | 02b7ddb1404fa3969bceb03a5f35107884027ba6 (diff) | |
Merge with Michael and resolve conflicts
Diffstat (limited to 'po/gl.po')
| -rw-r--r-- | po/gl.po | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:33-0500\n" +"POT-Creation-Date: 2006-05-27 13:46+0200\n" "PO-Revision-Date: 2006-05-11 18:09+0200\n" "Last-Translator: Jacobo Tarrío <jtarrio@debian.org>\n" "Language-Team: Galician <trasno@ceu.fi.udc.es>\n" @@ -15,7 +15,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: cmdline/apt-cache.cc:135 -#, c-format +#, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "O paquete %s versión %s ten unha dependencia incumprida:\n" @@ -2297,15 +2297,15 @@ msgstr "opcional" msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 +#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 msgid "Building dependency tree" msgstr "A construír a árbore de dependencias" -#: apt-pkg/depcache.cc:61 +#: apt-pkg/depcache.cc:62 msgid "Candidate versions" msgstr "Versións candidatas" -#: apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:91 msgid "Dependency generation" msgstr "Xeración de dependencias" |