summaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-03-21 07:53:13 -0500
committerDan McGee <dan@archlinux.org>2011-03-21 07:53:13 -0500
commit0ff52b68452046d61c24649ec94886bd74faab45 (patch)
treea9960a6143d17aeedeb530f2fe57c6796966e205 /po
parentc67c864ffd50ec0e071b055897c4622eaa132fc2 (diff)
parentb0bb4f9024712adcee5e2baf6cebe73c966d7d7f (diff)
downloadpacman-0ff52b68452046d61c24649ec94886bd74faab45.tar.xz
Merge branch 'maint'
Conflicts due to change in return calling style. Conflicts: src/pacman/pacman.c src/pacman/sync.c
Diffstat (limited to 'po')
-rw-r--r--po/pacman.pot21
1 files changed, 4 insertions, 17 deletions
diff --git a/po/pacman.pot b/po/pacman.pot
index 9ab5d701..4fce2719 100644
--- a/po/pacman.pot
+++ b/po/pacman.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pacman 3.5.0\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-03-14 13:57-0500\n"
+"POT-Creation-Date: 2011-03-20 23:07-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -614,11 +614,8 @@ msgid "could not change directory to %s (%s)\n"
msgstr ""
#, c-format
-msgid "directive '%s' without value not recognized\n"
-msgstr ""
-
-#, c-format
-msgid "directive '%s' with a value not recognized\n"
+msgid ""
+"config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
msgstr ""
#, c-format
@@ -652,17 +649,7 @@ msgid "config file %s, line %d: All directives must belong to a section.\n"
msgstr ""
#, c-format
-msgid "config file %s, line %d: directive %s needs a value\n"
-msgstr ""
-
-#, c-format
-msgid "config file %s, line %d: problem in options section\n"
-msgstr ""
-
-#, c-format
-msgid ""
-"config file %s, line %d: directive '%s' in repository section '%s' not "
-"recognized.\n"
+msgid "config file %s, line %d: directive '%s' needs a value\n"
msgstr ""
#, c-format