summaryrefslogtreecommitdiff
path: root/po/en_GB.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/en_GB.po')
-rw-r--r--po/en_GB.po1074
1 files changed, 524 insertions, 550 deletions
diff --git a/po/en_GB.po b/po/en_GB.po
index 0cb2cee6..b4a2f3c9 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Pacman package manager 3.0.0\n"
"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-12-02 21:40-0600\n"
-"PO-Revision-Date: 2007-12-03 15:20+1000\n"
+"POT-Creation-Date: 2008-01-14 23:03-0600\n"
+"PO-Revision-Date: 2008-01-16 10:39+1000\n"
"Last-Translator: Jeff Bailes <thepizzaking@gmail.com>\n"
"Language-Team: English <en_gb@li.org>\n"
"MIME-Version: 1.0\n"
@@ -16,28 +16,28 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/pacman/add.c:42
-#: src/pacman/remove.c:44
+#: src/pacman/add.c:40
+#: src/pacman/remove.c:42
#, c-format
msgid "failed to release transaction (%s)\n"
msgstr "failed to release transaction (%s)\n"
-#: src/pacman/add.c:79
-#: src/pacman/query.c:372
-#: src/pacman/remove.c:65
-#: src/pacman/sync.c:753
+#: src/pacman/add.c:77
+#: src/pacman/query.c:363
+#: src/pacman/remove.c:63
+#: src/pacman/sync.c:784
msgid "no targets specified (use -h for help)\n"
msgstr "no targets specified (use -h for help)\n"
-#: src/pacman/add.c:106
-#: src/pacman/sync.c:508
+#: src/pacman/add.c:104
+#: src/pacman/sync.c:510
#, c-format
msgid "error: %s\n"
msgstr "error: %s\n"
-#: src/pacman/add.c:109
-#: src/pacman/remove.c:100
-#: src/pacman/sync.c:482
+#: src/pacman/add.c:107
+#: src/pacman/remove.c:98
+#: src/pacman/sync.c:484
#, c-format
msgid ""
" if you're sure a package manager is not already\n"
@@ -46,57 +46,57 @@ msgstr ""
" if you're sure a package manager is not already\n"
" running, you can remove %s.\n"
-#: src/pacman/add.c:116
-#: src/pacman/remove.c:108
+#: src/pacman/add.c:114
+#: src/pacman/remove.c:106
#, c-format
msgid "loading package data... "
msgstr "loading package data... "
-#: src/pacman/add.c:120
+#: src/pacman/add.c:118
#, c-format
msgid "error: failed to add target '%s' (%s)"
msgstr "error: failed to add target '%s' (%s)"
-#: src/pacman/add.c:126
-#: src/pacman/remove.c:120
-#: src/pacman/sync.c:174
-#: src/pacman/sync.c:192
+#: src/pacman/add.c:124
+#: src/pacman/remove.c:118
+#: src/pacman/sync.c:176
+#: src/pacman/sync.c:194
#, c-format
msgid "done.\n"
msgstr "done.\n"
-#: src/pacman/add.c:131
-#: src/pacman/remove.c:124
-#: src/pacman/sync.c:614
+#: src/pacman/add.c:129
+#: src/pacman/remove.c:122
+#: src/pacman/sync.c:646
#, c-format
msgid "error: failed to prepare transaction (%s)\n"
msgstr "error: failed to prepare transaction (%s)\n"
-#: src/pacman/add.c:143
-#: src/pacman/remove.c:132
-#: src/pacman/sync.c:623
+#: src/pacman/add.c:141
+#: src/pacman/remove.c:130
+#: src/pacman/sync.c:655
#, c-format
msgid ":: %s: requires %s\n"
msgstr ":: %s: requires %s\n"
-#: src/pacman/add.c:151
+#: src/pacman/add.c:149
#, c-format
msgid ":: %s: conflicts with %s"
msgstr ":: %s: conflicts with %s"
-#: src/pacman/add.c:160
-#: src/pacman/sync.c:686
+#: src/pacman/add.c:158
+#: src/pacman/sync.c:718
#, c-format
msgid "%s exists in both '%s' and '%s'\n"
msgstr "%s exists in both '%s' and '%s'\n"
-#: src/pacman/add.c:166
-#: src/pacman/sync.c:692
+#: src/pacman/add.c:164
+#: src/pacman/sync.c:724
#, c-format
msgid "%s: %s exists in filesystem\n"
msgstr "%s: %s exists in filesystem\n"
-#: src/pacman/add.c:172
+#: src/pacman/add.c:170
#, c-format
msgid ""
"\n"
@@ -105,131 +105,140 @@ msgstr ""
"\n"
"errors occurred, no packages were upgraded.\n"
-#: src/pacman/add.c:186
-#: src/pacman/remove.c:171
-#: src/pacman/sync.c:677
+#: src/pacman/add.c:183
+#: src/pacman/remove.c:168
+#: src/pacman/sync.c:709
#, c-format
msgid "error: failed to commit transaction (%s)\n"
msgstr "error: failed to commit transaction (%s)\n"
-#: src/pacman/callback.c:163
+#: src/pacman/callback.c:165
#, c-format
msgid "checking dependencies...\n"
msgstr "checking dependencies...\n"
-#: src/pacman/callback.c:167
+#: src/pacman/callback.c:169
#, c-format
msgid "checking for file conflicts...\n"
msgstr "checking for file conflicts...\n"
-#: src/pacman/callback.c:171
+#: src/pacman/callback.c:173
#, c-format
msgid "resolving dependencies...\n"
msgstr "resolving dependencies...\n"
-#: src/pacman/callback.c:174
+#: src/pacman/callback.c:176
#, c-format
msgid "looking for inter-conflicts...\n"
msgstr "looking for inter-conflicts...\n"
-#: src/pacman/callback.c:178
+#: src/pacman/callback.c:180
#, c-format
msgid "installing %s...\n"
msgstr "installing %s...\n"
-#: src/pacman/callback.c:189
+#: src/pacman/callback.c:191
#, c-format
msgid "removing %s...\n"
msgstr "removing %s...\n"
-#: src/pacman/callback.c:200
+#: src/pacman/callback.c:202
#, c-format
msgid "upgrading %s...\n"
msgstr "upgrading %s...\n"
-#: src/pacman/callback.c:211
+#: src/pacman/callback.c:213
#, c-format
msgid "checking package integrity...\n"
msgstr "checking package integrity...\n"
-#: src/pacman/callback.c:214
+#: src/pacman/callback.c:216
#, c-format
msgid "checking delta integrity...\n"
msgstr "checking delta integrity...\n"
-#: src/pacman/callback.c:217
+#: src/pacman/callback.c:219
#, c-format
msgid "applying deltas...\n"
msgstr "applying deltas...\n"
-#: src/pacman/callback.c:220
+#: src/pacman/callback.c:222
#, c-format
msgid "generating %s with %s... "
msgstr "generating %s with %s... "
-#: src/pacman/callback.c:223
+#: src/pacman/callback.c:225
#, c-format
msgid "success!\n"
msgstr "success!\n"
-#: src/pacman/callback.c:226
+#: src/pacman/callback.c:228
#, c-format
msgid "failed.\n"
msgstr "failed.\n"
-#: src/pacman/callback.c:235
+#: src/pacman/callback.c:237
#, c-format
msgid ":: Retrieving packages from %s...\n"
msgstr ":: Retrieving packages from %s...\n"
-#: src/pacman/callback.c:263
+#: src/pacman/callback.c:265
#, c-format
msgid ":: %s requires installing %s from IgnorePkg/IgnoreGroup. Install anyway? [Y/n] "
msgstr ":: %s requires installing %s from IgnorePkg/IgnoreGroup. Install anyway? [Y/n] "
-#: src/pacman/callback.c:268
+#: src/pacman/callback.c:270
#, c-format
msgid ":: %s is in IgnorePkg/IgnoreGroup. Install anyway? [Y/n] "
msgstr ":: %s is in IgnorePkg/IgnoreGroup. Install anyway? [Y/n] "
-#: src/pacman/callback.c:274
+#: src/pacman/callback.c:276
#, c-format
msgid ":: %s is designated as a HoldPkg. Remove anyway? [Y/n] "
msgstr ":: %s is designated as a HoldPkg. Remove anyway? [Y/n] "
-#: src/pacman/callback.c:279
+#: src/pacman/callback.c:282
#, c-format
msgid ":: Replace %s with %s/%s? [Y/n] "
msgstr ":: Replace %s with %s/%s? [Y/n] "
-#: src/pacman/callback.c:286
+#: src/pacman/callback.c:288
+#, c-format
+msgid ""
+"Replacing %s with %s/%s\n"
+"."
+msgstr ""
+"Replacing %s with %s/%s\n"
+"."
+
+#: src/pacman/callback.c:296
#, c-format
msgid ":: %s conflicts with %s. Remove %s? [Y/n] "
msgstr ":: %s conflicts with %s. Remove %s? [Y/n] "
-#: src/pacman/callback.c:294
+#: src/pacman/callback.c:304
#, c-format
msgid ":: %s-%s: local version is newer. Upgrade anyway? [Y/n] "
msgstr ":: %s-%s: local version is newer. Upgrade anyway? [Y/n] "
-#: src/pacman/callback.c:304
+#: src/pacman/callback.c:314
#, c-format
msgid ":: File %s is corrupted. Do you want to delete it? [Y/n] "
msgstr ":: File %s is corrupted. Do you want to delete it? [Y/n] "
-#: src/pacman/callback.c:354
+#: src/pacman/callback.c:364
msgid "installing"
msgstr "installing"
-#: src/pacman/callback.c:357
+#: src/pacman/callback.c:367
msgid "upgrading"
msgstr "upgrading"
-#: src/pacman/callback.c:360
+#: src/pacman/callback.c:370
msgid "removing"
msgstr "removing"
-#: src/pacman/callback.c:363
+#: src/pacman/callback.c:373
msgid "checking for file conflicts"
msgstr "checking for file conflicts"
@@ -382,32 +391,32 @@ msgstr "MISSING\t\t%s\n"
msgid "(none)\n"
msgstr "(none)\n"
-#: src/pacman/package.c:244
+#: src/pacman/package.c:243
#, c-format
msgid "error: no changelog available for '%s'.\n"
msgstr "error: no changelog available for '%s'.\n"
-#: src/pacman/pacman.c:62
+#: src/pacman/pacman.c:60
msgid "options"
msgstr "options"
-#: src/pacman/pacman.c:63
+#: src/pacman/pacman.c:61
msgid "file"
msgstr "file"
-#: src/pacman/pacman.c:64
+#: src/pacman/pacman.c:62
msgid "package"
msgstr "package"
-#: src/pacman/pacman.c:65
+#: src/pacman/pacman.c:63
msgid "usage"
msgstr "usage"
-#: src/pacman/pacman.c:66
+#: src/pacman/pacman.c:64
msgid "operation"
msgstr "operation"
-#: src/pacman/pacman.c:78
+#: src/pacman/pacman.c:76
#, c-format
msgid ""
"\n"
@@ -416,173 +425,172 @@ msgstr ""
"\n"
"use '%s --help' with other options for more syntax\n"
-#: src/pacman/pacman.c:83
-#: src/pacman/pacman.c:97
-#: src/pacman/pacman.c:119
+#: src/pacman/pacman.c:81
+#: src/pacman/pacman.c:95
+#: src/pacman/pacman.c:117
#, c-format
msgid " --asdeps install packages as non-explicitly installed\n"
msgstr " --asdeps install packages as non-explicitly installed\n"
-#: src/pacman/pacman.c:84
-#: src/pacman/pacman.c:90
-#: src/pacman/pacman.c:98
-#: src/pacman/pacman.c:121
+#: src/pacman/pacman.c:82
+#: src/pacman/pacman.c:88
+#: src/pacman/pacman.c:96
+#: src/pacman/pacman.c:119
#, c-format
msgid " -d, --nodeps skip dependency checks\n"
msgstr " -d, --nodeps skip dependency checks\n"
-#: src/pacman/pacman.c:85
-#: src/pacman/pacman.c:99
-#: src/pacman/pacman.c:123
+#: src/pacman/pacman.c:83
+#: src/pacman/pacman.c:97
+#: src/pacman/pacman.c:121
#, c-format
msgid " -f, --force force install, overwrite conflicting files\n"
msgstr " -f, --force force install, overwrite conflicting files\n"
-#: src/pacman/pacman.c:89
+#: src/pacman/pacman.c:87
#, c-format
msgid " -c, --cascade remove packages and all packages that depend on them\n"
msgstr " -c, --cascade remove packages and all packages that depend on them\n"
-#: src/pacman/pacman.c:91
+#: src/pacman/pacman.c:89
#, c-format
msgid " -k, --dbonly only remove database entry, do not remove files\n"
msgstr " -k, --dbonly only remove database entry, do not remove files\n"
-#: src/pacman/pacman.c:92
+#: src/pacman/pacman.c:90
#, c-format
msgid " -n, --nosave remove configuration files as well\n"
msgstr " -n, --nosave remove configuration files as well\n"
-#: src/pacman/pacman.c:93
+#: src/pacman/pacman.c:91
#, c-format
msgid " -s, --recursive remove dependencies also (that won't break packages)\n"
msgstr " -s, --recursive remove dependencies also (that won't break packages)\n"
-#: src/pacman/pacman.c:103
+#: src/pacman/pacman.c:101
#, c-format
msgid " -c, --changelog view the changelog of a package\n"
msgstr " -c, --changelog view the changelog of a package\n"
-#: src/pacman/pacman.c:104
+#: src/pacman/pacman.c:102
#, c-format
msgid " -d, --deps list all packages installed as dependencies\n"
msgstr " -d, --deps list all packages installed as dependencies\n"
-#: src/pacman/pacman.c:105
+#: src/pacman/pacman.c:103
#, c-format
msgid " -e, --explicit list all packages explicitly installed\n"
msgstr " -e, --explicit list all packages explicitly installed\n"
-#: src/pacman/pacman.c:106
-#: src/pacman/pacman.c:124
+#: src/pacman/pacman.c:104
+#: src/pacman/pacman.c:122
#, c-format
msgid " -g, --groups view all members of a package group\n"
msgstr " -g, --groups view all members of a package group\n"
-#: src/pacman/pacman.c:107
+#: src/pacman/pacman.c:105
#, c-format
msgid " -i, --info view package information (-ii for backup files)\n"
msgstr " -i, --info view package information (-ii for backup files)\n"
-#: src/pacman/pacman.c:108
+#: src/pacman/pacman.c:106
#, c-format
msgid " -l, --list list the contents of the queried package\n"
msgstr " -l, --list list the contents of the queried package\n"
-#: src/pacman/pacman.c:109
+#: src/pacman/pacman.c:107
#, c-format
msgid " -m, --foreign list installed packages not found in sync db(s)\n"
msgstr ""
" -m, --foreign list installed packages not found in sync db(s)\n"
"(s)\n"
-#: src/pacman/pacman.c:110
+#: src/pacman/pacman.c:108
#, c-format
msgid " -o, --owns <file> query the package that owns <file>\n"
msgstr " -o, --owns <file> query the package that owns <file>\n"
-#: src/pacman/pacman.c:111
+#: src/pacman/pacman.c:109
#, c-format
msgid " -p, --file <package> query a package file instead of the database\n"
msgstr " -p, --file <package> query a package file instead of the database\n"
-#: src/pacman/pacman.c:112
+#: src/pacman/pacman.c:110
#, c-format
msgid " -s, --search <regex> search locally-installed packages for matching strings\n"
msgstr " -s, --search <regex> search locally-installed packages for matching strings\n"
-#: src/pacman/pacman.c:113
+#: src/pacman/pacman.c:111
#, c-format
-msgid " -t, --orphans list all packages not required by any package\n"
-msgstr " -t, --orphans list all packages not required by any package\n"
+msgid " -t, --unrequired list all packages not required by any package\n"
+msgstr " -t, --unrequired list all packages not required by any package\n"
-#: src/pacman/pacman.c:114
+#: src/pacman/pacman.c:112
#, c-format
msgid " -u, --upgrades list all packages that can be upgraded\n"
msgstr " -u, --upgrades list all packages that can be upgraded\n"
-#: src/pacman/pacman.c:115
-#: src/pacman/pacman.c:136
+#: src/pacman/pacman.c:113
#, c-format
msgid " -q, --quiet show less information for query and search\n"
msgstr " -q, --quiet show less information for query and search\n"
-#: src/pacman/pacman.c:120
+#: src/pacman/pacman.c:118
#, c-format
msgid " -c, --clean remove old packages from cache directory (-cc for all)\n"
msgstr " -c, --clean remove old packages from cache directory (-cc for all)\n"
-#: src/pacman/pacman.c:122
+#: src/pacman/pacman.c:120
#, c-format
msgid " -e, --dependsonly install dependencies only\n"
msgstr " -e, --dependsonly install dependencies only\n"
-#: src/pacman/pacman.c:125
+#: src/pacman/pacman.c:123
#, c-format
msgid " -i, --info view package information\n"
msgstr " -i, --info view package information\n"
-#: src/pacman/pacman.c:126
+#: src/pacman/pacman.c:124
#, c-format
msgid " -l, --list <repo> view a list of packages in a repo\n"
msgstr " -l, --list <repo> view a list of packages in a repo\n"
-#: src/pacman/pacman.c:127
+#: src/pacman/pacman.c:125
#, c-format
msgid " -p, --print-uris print out URIs for given packages and their dependencies\n"
msgstr " -p, --print-uris print out URIs for given packages and their dependencies\n"
-#: src/pacman/pacman.c:128
+#: src/pacman/pacman.c:126
#, c-format
msgid " -s, --search <regex> search remote repositories for matching strings\n"
msgstr " -s, --search <regex> search remote repositories for matching strings\n"
-#: src/pacman/pacman.c:129
+#: src/pacman/pacman.c:127
#, c-format
msgid " -u, --sysupgrade upgrade all packages that are out of date\n"
msgstr " -u, --sysupgrade upgrade all packages that are out of date\n"
-#: src/pacman/pacman.c:130
+#: src/pacman/pacman.c:128
#, c-format
msgid " -w, --downloadonly download packages but do not install/upgrade anything\n"
msgstr " -w, --downloadonly download packages but do not install/upgrade anything\n"
-#: src/pacman/pacman.c:131
+#: src/pacman/pacman.c:129
#, c-format
msgid " -y, --refresh download fresh package databases from the server\n"
msgstr " -y, --refresh download fresh package databases from the server\n"
-#: src/pacman/pacman.c:132
+#: src/pacman/pacman.c:130
#, c-format
msgid " --needed only upgrade outdated or not yet installed packages\n"
msgstr " --needed only upgrade outdated or not yet installed packages\n"
-#: src/pacman/pacman.c:133
+#: src/pacman/pacman.c:131
#, c-format
msgid " --ignore <pkg> ignore a package upgrade (can be used more than once)\n"
msgstr " --ignore <pkg> ignore a package upgrade (can be used more than once)\n"
-#: src/pacman/pacman.c:134
+#: src/pacman/pacman.c:132
#, c-format
msgid ""
" --ignoregroup <grp>\n"
@@ -591,52 +599,57 @@ msgstr ""
" --ignoregroup <grp>\n"
" ignore a group upgrade (can be used more than once)\n"
-#: src/pacman/pacman.c:138
+#: src/pacman/pacman.c:134
+#, c-format
+msgid " -q --quiet show less information for query and search\n"
+msgstr " -q --quiet show less information for query and search\n"
+
+#: src/pacman/pacman.c:136
#, c-format
msgid " --config <path> set an alternate configuration file\n"
msgstr " --config <path> set an alternate configuration file\n"
-#: src/pacman/pacman.c:139
+#: src/pacman/pacman.c:137
#, c-format
msgid " --logfile <path> set an alternate log file\n"
msgstr " --logfile <path> set an alternate log file\n"
-#: src/pacman/pacman.c:140
+#: src/pacman/pacman.c:138
#, c-format
msgid " --noconfirm do not ask for any confirmation\n"
msgstr " --noconfirm do not ask for any confirmation\n"
-#: src/pacman/pacman.c:141
+#: src/pacman/pacman.c:139
#, c-format
msgid " --noprogressbar do not show a progress bar when downloading files\n"
msgstr " --noprogressbar do not show a progress bar when downloading files\n"
-#: src/pacman/pacman.c:142
+#: src/pacman/pacman.c:140
#, c-format
msgid " --noscriptlet do not execute the install scriptlet if one exists\n"
msgstr " --noscriptlet do not execute the install scriptlet if one exists\n"
-#: src/pacman/pacman.c:143
+#: src/pacman/pacman.c:141
#, c-format
msgid " -v, --verbose be verbose\n"
msgstr " -v, --verbose be verbose\n"
-#: src/pacman/pacman.c:144
+#: src/pacman/pacman.c:142
#, c-format
msgid " -r, --root <path> set an alternate installation root\n"
msgstr " -r, --root <path> set an alternate installation root\n"
-#: src/pacman/pacman.c:145
+#: src/pacman/pacman.c:143
#, c-format
msgid " -b, --dbpath <path> set an alternate database location\n"
msgstr " -b, --dbpath <path> set an alternate database location\n"
-#: src/pacman/pacman.c:146
+#: src/pacman/pacman.c:144
#, c-format
msgid " --cachedir <dir> set an alternate package cache location\n"
msgstr " --cachedir <dir> set an alternate package cache location\n"
-#: src/pacman/pacman.c:159
+#: src/pacman/pacman.c:157
#, c-format
msgid ""
" This program may be freely redistributed under\n"
@@ -645,169 +658,168 @@ msgstr ""
" This program may be freely redistributed under\n"
" the terms of the GNU General Public License\n"
-#: src/pacman/pacman.c:250
+#: src/pacman/pacman.c:247
#, c-format
msgid "problem setting rootdir '%s' (%s)\n"
msgstr "problem setting rootdir '%s' (%s)\n"
-#: src/pacman/pacman.c:267
+#: src/pacman/pacman.c:264
#, c-format
msgid "problem setting dbpath '%s' (%s)\n"
msgstr "problem setting dbpath '%s' (%s)\n"
-#: src/pacman/pacman.c:275
+#: src/pacman/pacman.c:272
#, c-format
msgid "problem setting logfile '%s' (%s)\n"
msgstr "problem setting logfile '%s' (%s)\n"
-#: src/pacman/pacman.c:384
+#: src/pacman/pacman.c:382
#, c-format
msgid "'%s' is not a valid debug level\n"
msgstr "'%s' is not a valid debug level\n"
-#: src/pacman/pacman.c:398
-#: src/pacman/pacman.c:677
+#: src/pacman/pacman.c:396
+#: src/pacman/pacman.c:672
#, c-format
msgid "problem adding cachedir '%s' (%s)\n"
msgstr "problem adding cachedir '%s' (%s)\n"
-#: src/pacman/pacman.c:484
+#: src/pacman/pacman.c:482
msgid "only one operation may be used at a time\n"
msgstr "only one operation may be used at a time\n"
-#: src/pacman/pacman.c:544
+#: src/pacman/pacman.c:542
#, c-format
msgid "config file %s could not be read.\n"
msgstr "config file %s could not be read.\n"
-#: src/pacman/pacman.c:580
+#: src/pacman/pacman.c:578
#, c-format
msgid "config file %s, line %d: bad section name.\n"
msgstr "config file %s, line %d: bad section name.\n"
-#: src/pacman/pacman.c:602
+#: src/pacman/pacman.c:600
#, c-format
msgid "config file %s, line %d: syntax error in config file- missing key.\n"
msgstr "config file %s, line %d: syntax error in config file- missing key.\n"
-#: src/pacman/pacman.c:612
+#: src/pacman/pacman.c:610
#, c-format
-msgid "config file %s, line %d: 'Include' directive must belong to a section.\n"
-msgstr "config file %s, line %d: 'Include' directive must belong to a section.\n"
+msgid "config file %s, line %d: All directives must belong to a section.\n"
+msgstr "config file %s, line %d: All directives must belong to a section.\n"
-#: src/pacman/pacman.c:640
-#: src/pacman/pacman.c:702
-#: src/pacman/pacman.c:717
+#: src/pacman/pacman.c:638
+#: src/pacman/pacman.c:692
+#: src/pacman/pacman.c:707
#, c-format
msgid "config file %s, line %d: directive '%s' not recognized.\n"
msgstr "config file %s, line %d: directive '%s' not recognised.\n"
-#: src/pacman/pacman.c:787
+#: src/pacman/pacman.c:777
#, c-format
msgid "failed to initialize alpm library (%s)\n"
msgstr "failed to initialise alpm library (%s)\n"
-#: src/pacman/pacman.c:824
+#: src/pacman/pacman.c:814
msgid "you cannot perform this operation unless you are root.\n"
msgstr "you cannot perform this operation unless you are root.\n"
-#: src/pacman/pacman.c:847
+#: src/pacman/pacman.c:837
#, c-format
msgid "could not register 'local' database (%s)\n"
msgstr "could not register 'local' database (%s)\n"
-#: src/pacman/pacman.c:873
+#: src/pacman/pacman.c:863
msgid "no operation specified (use -h for help)\n"
msgstr "no operation specified (use -h for help)\n"
-#: src/pacman/query.c:67
+#: src/pacman/query.c:65
#, c-format
msgid "error: no file was specified for --owns\n"
msgstr "error: no file was specified for --owns\n"
-#: src/pacman/query.c:80
+#: src/pacman/query.c:78
#, c-format
msgid "error: failed to read file '%s': %s\n"
msgstr "error: failed to read file '%s': %s\n"
-#: src/pacman/query.c:87
+#: src/pacman/query.c:85
#, c-format
msgid "error: cannot determine ownership of a directory\n"
msgstr "error: cannot determine ownership of a directory\n"
-#: src/pacman/query.c:95
+#: src/pacman/query.c:93
#, c-format
msgid "error: cannot determine real path for '%s': %s\n"
msgstr "error: cannot determine real path for '%s': %s\n"
-#: src/pacman/query.c:117
+#: src/pacman/query.c:115
#, c-format
msgid "%s is owned by %s %s\n"
msgstr "%s is owned by %s %s\n"
-#: src/pacman/query.c:125
+#: src/pacman/query.c:123
#, c-format
msgid "error: No package owns %s\n"
msgstr "error: No package owns %s\n"
-#: src/pacman/query.c:221
+#: src/pacman/query.c:219
#, c-format
msgid "error: group \"%s\" was not found\n"
msgstr "error: group \"%s\" was not found\n"
-#: src/pacman/query.c:232
+#: src/pacman/query.c:230
#, c-format
msgid "Checking for package upgrades... \n"
msgstr "Checking for package upgrades... \n"
-#: src/pacman/query.c:243
+#: src/pacman/query.c:241
#, c-format
msgid "no upgrades found.\n"
msgstr "no upgrades found.\n"
-#: src/pacman/query.c:362
-#: src/pacman/sync.c:743
+#: src/pacman/query.c:353
+#: src/pacman/sync.c:774
msgid "no usable package repositories configured.\n"
msgstr "no usable package repositories configured.\n"
-#: src/pacman/query.c:406
+#: src/pacman/query.c:397
#, c-format
msgid "error: package \"%s\" not found\n"
msgstr "error: package \"%s\" not found\n"
-#: src/pacman/remove.c:78
-#: src/pacman/sync.c:583
+#: src/pacman/remove.c:76
#, c-format
msgid ":: group %s:\n"
msgstr ":: group %s:\n"
-#: src/pacman/remove.c:80
+#: src/pacman/remove.c:78
msgid " Remove whole content? [Y/n] "
msgstr " Remove whole content? [Y/n] "
-#: src/pacman/remove.c:84
+#: src/pacman/remove.c:82
#, c-format
msgid ":: Remove %s from group %s? [Y/n] "
msgstr ":: Remove %s from group %s? [Y/n] "
-#: src/pacman/remove.c:97
-#: src/pacman/sync.c:479
-#: src/pacman/sync.c:540
+#: src/pacman/remove.c:95
+#: src/pacman/sync.c:481
+#: src/pacman/sync.c:543
#, c-format
msgid "error: failed to init transaction (%s)\n"
msgstr "error: failed to init transaction (%s)\n"
-#: src/pacman/remove.c:113
+#: src/pacman/remove.c:111
#, c-format
msgid "error: failed to add target '%s' (%s)\n"
msgstr "error: failed to add target '%s' (%s)\n"
-#: src/pacman/remove.c:158
-#: src/pacman/util.c:462
+#: src/pacman/remove.c:155
+#: src/pacman/util.c:460
msgid "Targets:"
msgstr "Targets:"
-#: src/pacman/remove.c:161
+#: src/pacman/remove.c:158
msgid ""
"\n"
"Do you want to remove these packages? [Y/n] "
@@ -820,120 +832,120 @@ msgstr ""
msgid "error: could not access database directory\n"
msgstr "error: could not access database directory\n"
-#: src/pacman/sync.c:83
+#: src/pacman/sync.c:84
#, c-format
msgid "Do you want to remove %s? [Y/n] "
msgstr "Do you want to remove %s? [Y/n] "
-#: src/pacman/sync.c:88
+#: src/pacman/sync.c:89
#, c-format
msgid "error: could not remove repository directory\n"
msgstr "error: could not remove repository directory\n"
-#: src/pacman/sync.c:101
+#: src/pacman/sync.c:102
#, c-format
msgid "Database directory: %s\n"
msgstr "Database directory: %s\n"
-#: src/pacman/sync.c:102
+#: src/pacman/sync.c:103
msgid "Do you want to remove unused repositories? [Y/n] "
msgstr "Do you want to remove unused repositories? [Y/n] "
-#: src/pacman/sync.c:112
+#: src/pacman/sync.c:114
#, c-format
msgid "Database directory cleaned up\n"
msgstr "Database directory cleaned up\n"
-#: src/pacman/sync.c:130
-#: src/pacman/sync.c:177
+#: src/pacman/sync.c:132
+#: src/pacman/sync.c:179
#, c-format
msgid "Cache directory: %s\n"
msgstr "Cache directory: %s\n"
-#: src/pacman/sync.c:131
+#: src/pacman/sync.c:133
msgid "Do you want to remove uninstalled packages from cache? [Y/n] "
msgstr "Do you want to remove uninstalled packages from cache? [Y/n] "
-#: src/pacman/sync.c:134
+#: src/pacman/sync.c:136
#, c-format
msgid "removing old packages from cache... "
msgstr "removing old packages from cache... "
-#: src/pacman/sync.c:138
+#: src/pacman/sync.c:140
#, c-format
msgid "error: could not access cache directory\n"
msgstr "error: could not access cache directory\n"
-#: src/pacman/sync.c:178
+#: src/pacman/sync.c:180
msgid "Do you want to remove ALL packages from cache? [Y/n] "
msgstr "Do you want to remove ALL packages from cache? [Y/n] "
-#: src/pacman/sync.c:181
+#: src/pacman/sync.c:183
#, c-format
msgid "removing all packages from cache... "
msgstr "removing all packages from cache... "
-#: src/pacman/sync.c:184
+#: src/pacman/sync.c:186
#, c-format
msgid "error: could not remove cache directory\n"
msgstr "error: could not remove cache directory\n"
-#: src/pacman/sync.c:189
+#: src/pacman/sync.c:191
#, c-format
msgid "error: could not create new cache directory\n"
msgstr "error: could not create new cache directory\n"
-#: src/pacman/sync.c:216
+#: src/pacman/sync.c:218
#, c-format
msgid "error: failed to synchronize %s: %s\n"
msgstr "error: failed to synchronise %s: %s\n"
-#: src/pacman/sync.c:219
+#: src/pacman/sync.c:221
#, c-format
msgid "error: failed to update %s (%s)\n"
msgstr "error: failed to update %s (%s)\n"
-#: src/pacman/sync.c:223
+#: src/pacman/sync.c:225
#, c-format
msgid " %s is up to date\n"
msgstr " %s is up to date\n"
-#: src/pacman/sync.c:366
+#: src/pacman/sync.c:368
#, c-format
msgid "error: repository '%s' does not exist\n"
msgstr "error: repository '%s' does not exist\n"
-#: src/pacman/sync.c:381
+#: src/pacman/sync.c:383
#, c-format
msgid "error: package '%s' was not found in repository '%s'\n"
msgstr "error: package '%s' was not found in repository '%s'\n"
-#: src/pacman/sync.c:401
+#: src/pacman/sync.c:403
#, c-format
msgid "error: package '%s' was not found\n"
msgstr "error: package '%s' was not found\n"
-#: src/pacman/sync.c:438
+#: src/pacman/sync.c:440
#, c-format
msgid "error: repository \"%s\" was not found.\n"
msgstr "error: repository \"%s\" was not found.\n"
-#: src/pacman/sync.c:490
+#: src/pacman/sync.c:492
#, c-format
msgid ":: Synchronizing package databases...\n"
msgstr ":: Synchronising package databases...\n"
-#: src/pacman/sync.c:493
+#: src/pacman/sync.c:495
#, c-format
msgid "error: failed to synchronize any databases\n"
msgstr "error: failed to synchronise any databases\n"
-#: src/pacman/sync.c:505
+#: src/pacman/sync.c:507
#, c-format
msgid ":: Starting full system upgrade...\n"
msgstr ":: Starting full system upgrade...\n"
-#: src/pacman/sync.c:526
+#: src/pacman/sync.c:529
#, c-format
msgid ""
":: pacman has detected a newer version of itself.\n"
@@ -948,215 +960,166 @@ msgstr ""
":: operation. If you wish to continue the operation and\n"
":: not upgrade pacman separately, answer no.\n"
-#: src/pacman/sync.c:531
+#: src/pacman/sync.c:534
msgid ":: Cancel current operation? [Y/n] "
msgstr ":: Cancel current operation? [Y/n] "
-#: src/pacman/sync.c:533
-#: src/pacman/sync.c:720
+#: src/pacman/sync.c:536
+#: src/pacman/sync.c:751
#, c-format
msgid "error: failed to release transaction (%s)\n"
msgstr "error: failed to release transaction (%s)\n"
-#: src/pacman/sync.c:545
+#: src/pacman/sync.c:548
#, c-format
msgid "error: pacman: %s\n"
msgstr "error: pacman: %s\n"
-#: src/pacman/sync.c:569
+#: src/pacman/sync.c:573
#, c-format
msgid "error: '%s': %s\n"
msgstr "error: '%s': %s\n"
-#: src/pacman/sync.c:588
+#: src/pacman/sync.c:587
+#, c-format
+msgid ":: group %s (including ignored packages):\n"
+msgstr ":: group %s (including ignored packages):\n"
+
+#: src/pacman/sync.c:592
msgid ":: Install whole content? [Y/n] "
msgstr ":: Install whole content? [Y/n] "
-#: src/pacman/sync.c:595
+#: src/pacman/sync.c:599
#, c-format
msgid ":: Install %s from group %s? [Y/n] "
msgstr ":: Install %s from group %s? [Y/n] "
-#: src/pacman/sync.c:604
+#: src/pacman/sync.c:620
+#, c-format
+msgid "Warning: %s provides %s\n"
+msgstr "Warning: %s provides %s\n"
+
+#: src/pacman/sync.c:624
+#, c-format
+msgid "error: several packages provide %s, please specify one :\n"
+msgstr "error: several packages provide %s, please specify one :\n"
+
+#: src/pacman/sync.c:635
#, c-format
msgid "error: '%s': not found in sync db\n"
msgstr "error: '%s': not found in sync db\n"
-#: src/pacman/sync.c:631
+#: src/pacman/sync.c:663
#, c-format
msgid ":: %s: conflicts with %s\n"
msgstr ":: %s: conflicts with %s\n"
-#: src/pacman/sync.c:645
+#: src/pacman/sync.c:677
#, c-format
msgid " local database is up to date\n"
msgstr " local database is up to date\n"
-#: src/pacman/sync.c:657
+#: src/pacman/sync.c:689
#, c-format
msgid "Beginning download...\n"
msgstr "Beginning download...\n"
-#: src/pacman/sync.c:660
+#: src/pacman/sync.c:692
msgid "Proceed with download? [Y/n] "
msgstr "Proceed with download? [Y/n] "
-#: src/pacman/sync.c:664
+#: src/pacman/sync.c:696
#, c-format
msgid "Beginning upgrade process...\n"
msgstr "Beginning upgrade process...\n"
-#: src/pacman/sync.c:667
+#: src/pacman/sync.c:699
msgid "Proceed with installation? [Y/n] "
msgstr "Proceed with installation? [Y/n] "
-#: src/pacman/sync.c:708
+#: src/pacman/sync.c:740
#, c-format
msgid "Errors occurred, no packages were upgraded.\n"
msgstr "Errors occurred, no packages were upgraded.\n"
-#: src/pacman/util.c:356
-#: src/pacman/util.c:388
+#: src/pacman/util.c:354
+#: src/pacman/util.c:386
#, c-format
msgid "None\n"
msgstr "None\n"
-#: src/pacman/util.c:454
+#: src/pacman/util.c:452
msgid "Remove:"
msgstr "Remove:"
-#: src/pacman/util.c:458
+#: src/pacman/util.c:456
#, c-format
msgid "Total Removed Size: %.2f MB\n"
msgstr "Total Removed Size: %.2f MB\n"
-#: src/pacman/util.c:465
+#: src/pacman/util.c:463
#, c-format
msgid "Total Download Size: %.2f MB\n"
msgstr "Total Download Size: %.2f MB\n"
-#: src/pacman/util.c:469
+#: src/pacman/util.c:467
#, c-format
msgid "Total Installed Size: %.2f MB\n"
msgstr "Total Installed Size: %.2f MB\n"
-#: src/pacman/util.c:496
+#: src/pacman/util.c:494
msgid "Y"
msgstr "Y"
-#: src/pacman/util.c:496
+#: src/pacman/util.c:494
msgid "YES"
msgstr "YES"
-#: src/pacman/util.c:557
+#: src/pacman/util.c:543
+#, c-format
+msgid "debug: %s"
+msgstr "debug: %s"
+
+#: src/pacman/util.c:546
+#, c-format
+msgid "error: %s"
+msgstr "error: %s"
+
+#: src/pacman/util.c:549
+#, c-format
+msgid "warning: %s"
+msgstr "warning: %s"
+
+#: src/pacman/util.c:552
+#, c-format
+msgid "function: %s"
+msgstr "function: %s"
+
+#: src/pacman/util.c:590
#, c-format
msgid "debug: "
msgstr "debug: "
-#: src/pacman/util.c:560
+#: src/pacman/util.c:593
#, c-format
msgid "error: "
msgstr "error: "
-#: src/pacman/util.c:563
+#: src/pacman/util.c:596
#, c-format
msgid "warning: "
msgstr "warning: "
-#: src/pacman/util.c:568
+#: src/pacman/util.c:601
#, c-format
msgid "function: "
msgstr "function: "
-#: scripts/abs.sh.in:60
-#: scripts/makepkg.sh.in:110
-#: scripts/makepkg.sh.in:112
-#: scripts/repo-add.sh.in:50
-#: scripts/repo-remove.sh.in:50
-msgid "ERROR:"
-msgstr "ERROR:"
-
-#: scripts/abs.sh.in:65
-msgid "abs (pacman) %s - download a PKGBUILD tree from a CVS repository"
-msgstr "abs (pacman) %s - download a PKGBUILD tree from a CVS repository"
-
-#: scripts/abs.sh.in:66
-msgid "Usage %s [options] [repository...]"
-msgstr "Usage %s [options] [repository...]"
-
-#: scripts/abs.sh.in:67
-#: scripts/makepkg.sh.in:1055
-msgid "Options:"
-msgstr "Options:"
-
-#: scripts/abs.sh.in:68
-msgid " -p, --passive The connection is opened in passive mode."
-msgstr " -p, --passive The connection is opened in passive mode."
-
-#: scripts/abs.sh.in:70
-msgid " -h, --help Display this help message then exit."
-msgstr " -h, --help Display this help message then exit."
-
-#: scripts/abs.sh.in:71
-msgid " -V, --version Display version information then exit."
-msgstr " -V, --version Display version information then exit."
-
-#: scripts/abs.sh.in:73
-msgid ""
-"abs will synchronize build scripts from the CVS repository\\n"
-"into %s. You can follow different package trees by\\n"
-"editing %s files. If no argument is given, abs\\n"
-"will synchronize from supfiles specified in %s.\\n"
-"\\n"
-msgstr ""
-"abs will synchronise build scripts from the CVS repository\\n"
-"into %s. You can follow different package trees by\\n"
-"editing %s files. If no argument is given, abs\\n"
-"will synchronise from supfiles specified in %s.\\n"
-"\\n"
-
-#: scripts/abs.sh.in:79
-msgid "Report bugs to <%s>."
-msgstr "Report bugs to <%s>."
-
-#: scripts/abs.sh.in:84
-#: scripts/gensync.sh.in:54
-#: scripts/makepkg.sh.in:1088
-#: scripts/pacman-optimize.sh.in:59
-#: scripts/repo-remove.sh.in:66
-msgid ""
-"Copyright (C) 2002-2007 Judd Vinet <jvinet@zeroflux.org>.\\n"
-"\\n"
-"This is free software; see the source for copying conditions.\\n"
-"There is NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Copyright (C) 2002-2007 Judd Vinet <jvinet@zeroflux.org>.\\n"
-"\\n"
-"This is free software; see the source for copying conditions.\\n"
-"There is NO WARRANTY, to the extent permitted by law.\\n"
-
-#: scripts/abs.sh.in:130
-#: scripts/pacman-optimize.sh.in:100
-msgid "%s does not exist or is not a directory."
-msgstr "%s does not exist or is not a directory."
-
-#: scripts/abs.sh.in:133
-msgid "You do not have write permissions in %s."
-msgstr "You do not have write permissions in %s."
-
-#: scripts/abs.sh.in:143
-msgid "Missing CVS synchronization utility. Install csup or cvsup."
-msgstr "Missing CVS synchronisation utility. Install csup or cvsup."
-
-#: scripts/abs.sh.in:166
-msgid "Updating %s..."
-msgstr "Updating %s..."
-
-#: scripts/gensync.sh.in:34
+#: scripts/gensync.sh.in:32
msgid "Usage: %s <root> <destfile> [package_directory]"
msgstr "Usage: %s <root> <destfile> [package_directory]"
-#: scripts/gensync.sh.in:35
+#: scripts/gensync.sh.in:33
msgid ""
"gensync will generate a sync database by reading all PKGBUILD files\\n"
"from <root>. gensync builds the database in a temporary directory\\n"
@@ -1168,7 +1131,7 @@ msgstr ""
"and then compresses it to <destfile>.\\n"
"\\n"
-#: scripts/gensync.sh.in:39
+#: scripts/gensync.sh.in:37
msgid ""
"gensync will calculate md5sums of packages in the same directory as\\n"
"<destfile>, unless an alternate [package_directory] is specified.\\n"
@@ -1178,7 +1141,7 @@ msgstr ""
"<destfile>, unless an alternate [package_directory] is specified.\\n"
"\\n"
-#: scripts/gensync.sh.in:42
+#: scripts/gensync.sh.in:40
msgid ""
"note: The <destfile> name is important. It must be of the form\\n"
" {treename}.db.tar.gz where {treename} is the name of the custom\\n"
@@ -1194,102 +1157,125 @@ msgstr ""
" custom packages (also configured in /etc/pacman.conf)\\n"
"\\n"
-#: scripts/gensync.sh.in:48
+#: scripts/gensync.sh.in:46
msgid "Example: gensync /var/abs/local /home/mypkgs/custom.db.tar.gz"
msgstr "Example: gensync /var/abs/local /home/mypkgs/custom.db.tar.gz"
-#: scripts/gensync.sh.in:102
-#: scripts/updatesync.sh.in:101
+#: scripts/gensync.sh.in:51
+#: scripts/makepkg.sh.in:1091
+#: scripts/pacman-optimize.sh.in:57
+#: scripts/repo-remove.sh.in:64
+msgid ""
+"Copyright (C) 2002-2007 Judd Vinet <jvinet@zeroflux.org>.\\n"
+"\\n"
+"This is free software; see the source for copying conditions.\\n"
+"There is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr ""
+"Copyright (C) 2002-2007 Judd Vinet <jvinet@zeroflux.org>.\\n"
+"\\n"
+"This is free software; see the source for copying conditions.\\n"
+"There is NO WARRANTY, to the extent permitted by law.\\n"
+
+#: scripts/gensync.sh.in:99
+#: scripts/updatesync.sh.in:98
msgid "%s not found. Can not continue."
msgstr "%s not found. Can not continue."
-#: scripts/gensync.sh.in:120
+#: scripts/gensync.sh.in:117
msgid "invalid root dir: %s"
msgstr "invalid root dir: %s"
-#: scripts/gensync.sh.in:122
+#: scripts/gensync.sh.in:119
msgid "gensync: building database entries, generating md5sums..."
msgstr "gensync: building database entries, generating md5sums..."
-#: scripts/gensync.sh.in:131
-msgid "failed to parse parse %s"
-msgstr "failed to parse parse %s"
+#: scripts/gensync.sh.in:128
+#: scripts/updatesync.sh.in:126
+msgid "failed to parse %s"
+msgstr "failed to parse %s"
-#: scripts/gensync.sh.in:142
-msgid "could not find %s-%s-%s-%s.%s - skipping"
-msgstr "could not find %s-%s-%s-%s.%s - skipping"
+#: scripts/gensync.sh.in:139
+msgid "could not find %s-%s-%s-%s%s - skipping"
+msgstr "could not find %s-%s-%s-%s%s - skipping"
-#: scripts/gensync.sh.in:152
+#: scripts/gensync.sh.in:149
msgid "creating repo DB..."
msgstr "creating repo DB..."
-#: scripts/makepkg.sh.in:101
-#: scripts/makepkg.sh.in:103
-#: scripts/repo-add.sh.in:45
-#: scripts/repo-remove.sh.in:45
+#: scripts/makepkg.sh.in:100
+#: scripts/makepkg.sh.in:102
+#: scripts/repo-add.sh.in:46
+#: scripts/repo-remove.sh.in:43
msgid "WARNING:"
msgstr "WARNING:"
-#: scripts/makepkg.sh.in:143
+#: scripts/makepkg.sh.in:109
+#: scripts/makepkg.sh.in:111
+#: scripts/repo-add.sh.in:51
+#: scripts/repo-remove.sh.in:48
+msgid "ERROR:"
+msgstr "ERROR:"
+
+#: scripts/makepkg.sh.in:142
msgid "Cleaning up..."
msgstr "Cleaning up..."
-#: scripts/makepkg.sh.in:193
+#: scripts/makepkg.sh.in:192
msgid "Options beginning with 'no' will be deprecated in the next version of makepkg!"
msgstr "Options beginning with 'no' will be deprecated in the next version of makepkg!"
-#: scripts/makepkg.sh.in:194
+#: scripts/makepkg.sh.in:193
msgid "Please replace 'no' with '!': %s -> %s."
msgstr "Please replace 'no' with '!': %s -> %s."
-#: scripts/makepkg.sh.in:198
+#: scripts/makepkg.sh.in:197
msgid "Option 'keepdocs' may not work as intended. Please replace with 'docs'."
msgstr "Option 'keepdocs' may not work as intended. Please replace with 'docs'."
-#: scripts/makepkg.sh.in:286
+#: scripts/makepkg.sh.in:285
msgid "There is no agent set up to handle %s URLs. Check %s."
msgstr "There is no agent set up to handle %s URLs. Check %s."
-#: scripts/makepkg.sh.in:287
-#: scripts/makepkg.sh.in:296
+#: scripts/makepkg.sh.in:286
+#: scripts/makepkg.sh.in:295
#: scripts/makepkg.sh.in:448
#: scripts/makepkg.sh.in:476
#: scripts/makepkg.sh.in:522
#: scripts/makepkg.sh.in:610
#: scripts/makepkg.sh.in:638
#: scripts/makepkg.sh.in:700
-#: scripts/makepkg.sh.in:767
-#: scripts/makepkg.sh.in:1105
-#: scripts/makepkg.sh.in:1415
-#: scripts/makepkg.sh.in:1419
+#: scripts/makepkg.sh.in:775
+#: scripts/makepkg.sh.in:1108
+#: scripts/makepkg.sh.in:1421
+#: scripts/makepkg.sh.in:1425
msgid "Aborting..."
msgstr "Aborting..."
-#: scripts/makepkg.sh.in:295
+#: scripts/makepkg.sh.in:294
msgid "The download program %s is not installed."
msgstr "The download program %s is not installed."
-#: scripts/makepkg.sh.in:311
+#: scripts/makepkg.sh.in:310
msgid "Pacman returned a fatal error (%i): %s"
msgstr "Pacman returned a fatal error (%i): %s"
-#: scripts/makepkg.sh.in:335
+#: scripts/makepkg.sh.in:334
msgid "Installing missing dependencies..."
msgstr "Installing missing dependencies..."
-#: scripts/makepkg.sh.in:345
+#: scripts/makepkg.sh.in:344
msgid "Pacman failed to install missing dependencies."
msgstr "Pacman failed to install missing dependencies."
-#: scripts/makepkg.sh.in:349
+#: scripts/makepkg.sh.in:348
msgid "Building missing dependencies..."
msgstr "Building missing dependencies..."
-#: scripts/makepkg.sh.in:354
+#: scripts/makepkg.sh.in:353
msgid "Source root cannot be found - please make sure it is specified in %s."
msgstr "Source root cannot be found - please make sure it is specified in %s."
-#: scripts/makepkg.sh.in:362
+#: scripts/makepkg.sh.in:361
msgid "Could not find '%s' under %s"
msgstr "Could not find '%s' under %s"
@@ -1402,465 +1388,466 @@ msgstr "Tidying install..."
msgid "Removing info/doc files..."
msgstr "Removing info/doc files..."
-#: scripts/makepkg.sh.in:717
-msgid "Moving usr/share/man files to usr/man..."
-msgstr "Moving usr/share/man files to usr/man..."
-
-#: scripts/makepkg.sh.in:724
+#: scripts/makepkg.sh.in:716
msgid "Compressing man pages..."
msgstr "Compressing man pages..."
-#: scripts/makepkg.sh.in:742
+#: scripts/makepkg.sh.in:750
msgid "Stripping debugging symbols from binaries and libraries..."
msgstr "Stripping debugging symbols from binaries and libraries..."
-#: scripts/makepkg.sh.in:754
+#: scripts/makepkg.sh.in:762
msgid "Removing libtool .la files..."
msgstr "Removing libtool .la files..."
-#: scripts/makepkg.sh.in:759
+#: scripts/makepkg.sh.in:767
msgid "Removing empty directories..."
msgstr "Removing empty directories..."
-#: scripts/makepkg.sh.in:766
+#: scripts/makepkg.sh.in:774
msgid "Missing pkg/ directory."
msgstr "Missing pkg/ directory."
-#: scripts/makepkg.sh.in:772
+#: scripts/makepkg.sh.in:780
msgid "Creating package..."
msgstr "Creating package..."
-#: scripts/makepkg.sh.in:782
-msgid "Generating .FILELIST file..."
-msgstr "Generating .FILELIST file..."
-
-#: scripts/makepkg.sh.in:792
+#: scripts/makepkg.sh.in:791
msgid "Generating .PKGINFO file..."
msgstr "Generating .PKGINFO file..."
-#: scripts/makepkg.sh.in:838
+#: scripts/makepkg.sh.in:837
msgid "Please add a license line to your %s!"
msgstr "Please add a license line to your %s!"
-#: scripts/makepkg.sh.in:839
+#: scripts/makepkg.sh.in:838
msgid "Example for GPL'ed software: license=('GPL')."
msgstr "Example for GPL'ed software: license=('GPL')."
-#: scripts/makepkg.sh.in:847
-#: scripts/makepkg.sh.in:942
+#: scripts/makepkg.sh.in:846
+#: scripts/makepkg.sh.in:941
msgid "Adding install script..."
msgstr "Adding install script..."
-#: scripts/makepkg.sh.in:854
+#: scripts/makepkg.sh.in:853
msgid "Adding package changelog..."
msgstr "Adding package changelog..."
-#: scripts/makepkg.sh.in:860
+#: scripts/makepkg.sh.in:859
msgid "Compressing package..."
msgstr "Compressing package..."
-#: scripts/makepkg.sh.in:865
+#: scripts/makepkg.sh.in:864
msgid "Failed to create package file."
msgstr "Failed to create package file."
-#: scripts/makepkg.sh.in:874
+#: scripts/makepkg.sh.in:873
msgid "Cannot find the xdelta binary! Is xdelta installed?"
msgstr "Cannot find the xdelta binary! Is xdelta installed?"
-#: scripts/makepkg.sh.in:904
+#: scripts/makepkg.sh.in:903
msgid "Making delta from version %s..."
msgstr "Making delta from version %s..."
-#: scripts/makepkg.sh.in:918
+#: scripts/makepkg.sh.in:917
msgid "Recreating package tarball from delta to match md5 signatures"
msgstr "Recreating package tarball from delta to match md5 signatures"
-#: scripts/makepkg.sh.in:919
+#: scripts/makepkg.sh.in:918
msgid "NOTE: the delta should ONLY be distributed with this tarball"
msgstr "NOTE: the delta should ONLY be distributed with this tarball"
-#: scripts/makepkg.sh.in:923
+#: scripts/makepkg.sh.in:922
msgid "Could not generate the package from the delta."
msgstr "Could not generate the package from the delta."
-#: scripts/makepkg.sh.in:927
+#: scripts/makepkg.sh.in:926
msgid "Delta was not able to be created."
msgstr "Delta was not able to be created."
-#: scripts/makepkg.sh.in:930
+#: scripts/makepkg.sh.in:929
msgid "No previous version found, skipping xdelta."
msgstr "No previous version found, skipping xdelta."
-#: scripts/makepkg.sh.in:936
+#: scripts/makepkg.sh.in:935
msgid "Creating source package..."
msgstr "Creating source package..."
-#: scripts/makepkg.sh.in:938
-#: scripts/makepkg.sh.in:950
-#: scripts/makepkg.sh.in:957
+#: scripts/makepkg.sh.in:937
+#: scripts/makepkg.sh.in:949
+#: scripts/makepkg.sh.in:956
msgid "Adding %s..."
msgstr "Adding %s..."
-#: scripts/makepkg.sh.in:945
+#: scripts/makepkg.sh.in:944
msgid "Install script %s not found."
msgstr "Install script %s not found."
-#: scripts/makepkg.sh.in:965
+#: scripts/makepkg.sh.in:964
msgid "Compressing source package..."
msgstr "Compressing source package..."
-#: scripts/makepkg.sh.in:967
+#: scripts/makepkg.sh.in:966
msgid "Failed to create source package file."
msgstr "Failed to create source package file."
-#: scripts/makepkg.sh.in:975
-msgid "Installing package with pacman -U..."
-msgstr "Installing package with pacman -U..."
-
-#: scripts/makepkg.sh.in:992
+#: scripts/makepkg.sh.in:994
msgid "Determining latest darcs revision..."
msgstr "Determining latest darcs revision..."
-#: scripts/makepkg.sh.in:995
+#: scripts/makepkg.sh.in:997
msgid "Determining latest cvs revision..."
msgstr "Determining latest cvs revision..."
-#: scripts/makepkg.sh.in:998
+#: scripts/makepkg.sh.in:1000
msgid "Determining latest git revision..."
msgstr "Determining latest git revision..."
-#: scripts/makepkg.sh.in:1001
+#: scripts/makepkg.sh.in:1003
msgid "Determining latest svn revision..."
msgstr "Determining latest svn revision..."
-#: scripts/makepkg.sh.in:1004
+#: scripts/makepkg.sh.in:1006
msgid "Determining latest bzr revision..."
msgstr "Determining latest bzr revision..."
-#: scripts/makepkg.sh.in:1007
+#: scripts/makepkg.sh.in:1009
msgid "Determining latest hg revision..."
msgstr "Determining latest hg revision..."
-#: scripts/makepkg.sh.in:1022
+#: scripts/makepkg.sh.in:1024
msgid "Version found: %s"
msgstr "Version found: %s"
-#: scripts/makepkg.sh.in:1053
+#: scripts/makepkg.sh.in:1055
msgid "Usage: %s [options]"
msgstr "Usage: %s [options]"
-#: scripts/makepkg.sh.in:1056
+#: scripts/makepkg.sh.in:1057
+msgid "Options:"
+msgstr "Options:"
+
+#: scripts/makepkg.sh.in:1058
msgid " -A, --ignorearch Ignore incomplete arch field in %s"
msgstr " -A, --ignorearch Ignore incomplete arch field in %s"
-#: scripts/makepkg.sh.in:1057
+#: scripts/makepkg.sh.in:1059
msgid " -b, --builddeps Build missing dependencies from source"
msgstr " -b, --builddeps Build missing dependencies from source"
-#: scripts/makepkg.sh.in:1058
+#: scripts/makepkg.sh.in:1060
msgid " -c, --clean Clean up work files after build"
msgstr " -c, --clean Clean up work files after build"
-#: scripts/makepkg.sh.in:1059
+#: scripts/makepkg.sh.in:1061
msgid " -C, --cleancache Clean up source files from the cache"
msgstr " -C, --cleancache Clean up source files from the cache"
-#: scripts/makepkg.sh.in:1060
+#: scripts/makepkg.sh.in:1062
msgid " -d, --nodeps Skip all dependency checks"
msgstr " -d, --nodeps Skip all dependency checks"
-#: scripts/makepkg.sh.in:1061
+#: scripts/makepkg.sh.in:1063
msgid " -e, --noextract Do not extract source files (use existing src/ dir)"
msgstr " -e, --noextract Do not extract source files (use existing src/ dir)"
-#: scripts/makepkg.sh.in:1062
+#: scripts/makepkg.sh.in:1064
msgid " -f, --force Overwrite existing package"
msgstr " -f, --force Overwrite existing package"
-#: scripts/makepkg.sh.in:1063
+#: scripts/makepkg.sh.in:1065
msgid " -g, --geninteg Generate integrity checks for source files"
msgstr " -g, --geninteg Generate integrity checks for source files"
-#: scripts/makepkg.sh.in:1064
+#: scripts/makepkg.sh.in:1066
msgid " -h, --help This help"
msgstr " -h, --help This help"
-#: scripts/makepkg.sh.in:1065
+#: scripts/makepkg.sh.in:1067
msgid " -i, --install Install package after successful build"
msgstr " -i, --install Install package after successful build"
-#: scripts/makepkg.sh.in:1066
+#: scripts/makepkg.sh.in:1068
msgid " -L, --log Log package build process"
msgstr " -L, --log Log package build process"
-#: scripts/makepkg.sh.in:1067
+#: scripts/makepkg.sh.in:1069
msgid " -m, --nocolor Disable colorized output messages"
msgstr " -m, --nocolor Disable colourised output messages"
-#: scripts/makepkg.sh.in:1068
+#: scripts/makepkg.sh.in:1070
msgid " -o, --nobuild Download and extract files only"
msgstr " -o, --nobuild Download and extract files only"
-#: scripts/makepkg.sh.in:1069
+#: scripts/makepkg.sh.in:1071
msgid " -p <buildscript> Use an alternate build script (instead of '%s')"
msgstr " -p <buildscript> Use an alternate build script (instead of '%s')"
-#: scripts/makepkg.sh.in:1070
+#: scripts/makepkg.sh.in:1072
msgid " -r, --rmdeps Remove installed dependencies after a successful build"
msgstr " -r, --rmdeps Remove installed dependencies after a successful build"
-#: scripts/makepkg.sh.in:1072
+#: scripts/makepkg.sh.in:1074
msgid " -R, --repackage Repackage contents of pkg/ without building"
msgstr " -R, --repackage Repackage contents of pkg/ without building"
-#: scripts/makepkg.sh.in:1073
+#: scripts/makepkg.sh.in:1075
msgid " -s, --syncdeps Install missing dependencies with pacman"
msgstr " -s, --syncdeps Install missing dependencies with pacman"
-#: scripts/makepkg.sh.in:1074
+#: scripts/makepkg.sh.in:1076
msgid " --asroot Allow makepkg to run as root user"
msgstr " --asroot Allow makepkg to run as root user"
-#: scripts/makepkg.sh.in:1075
+#: scripts/makepkg.sh.in:1077
+msgid " --holdver Prevent automatic version bumping for development PKGBUILDs"
+msgstr " --holdver Prevent automatic version bumping for development PKGBUILDs"
+
+#: scripts/makepkg.sh.in:1078
msgid " --source Do not build package; generate a source-only tarball"
msgstr " --source Do not build package; generate a source-only tarball"
-#: scripts/makepkg.sh.in:1077
+#: scripts/makepkg.sh.in:1080
msgid "These options can be passed to pacman:"
msgstr "These options can be passed to pacman:"
-#: scripts/makepkg.sh.in:1079
+#: scripts/makepkg.sh.in:1082
msgid " --noconfirm Do not ask for confirmation when resolving dependencies"
msgstr " --noconfirm Do not ask for confirmation when resolving dependencies"
-#: scripts/makepkg.sh.in:1080
+#: scripts/makepkg.sh.in:1083
msgid " --noprogressbar Do not show a progress bar when downloading files"
msgstr " --noprogressbar Do not show a progress bar when downloading files"
-#: scripts/makepkg.sh.in:1082
+#: scripts/makepkg.sh.in:1085
msgid "If -p is not specified, makepkg will look for '%s'"
msgstr "If -p is not specified, makepkg will look for '%s'"
-#: scripts/makepkg.sh.in:1104
+#: scripts/makepkg.sh.in:1107
msgid "%s not found."
msgstr "%s not found."
-#: scripts/makepkg.sh.in:1177
+#: scripts/makepkg.sh.in:1169
msgid "Sudo is used by default now. The --usesudo option is deprecated!"
msgstr "Sudo is used by default now. The --usesudo option is deprecated!"
-#: scripts/makepkg.sh.in:1192
+#: scripts/makepkg.sh.in:1184
+msgid "--"
+msgstr "--"
+
+#: scripts/makepkg.sh.in:1191
msgid "Cleaning up ALL files from %s."
msgstr "Cleaning up ALL files from %s."
-#: scripts/makepkg.sh.in:1193
+#: scripts/makepkg.sh.in:1192
msgid " Are you sure you wish to do this? [Y/n] "
msgstr " Are you sure you wish to do this? [Y/n] "
-#: scripts/makepkg.sh.in:1199
+#: scripts/makepkg.sh.in:1198
msgid "Problem removing files; you may not have correct permissions in %s"
msgstr "Problem removing files; you may not have correct permissions in %s"
-#: scripts/makepkg.sh.in:1203
+#: scripts/makepkg.sh.in:1202
msgid "Source cache cleaned."
msgstr "Source cache cleaned."
-#: scripts/makepkg.sh.in:1208
+#: scripts/makepkg.sh.in:1207
msgid "No files have been removed."
msgstr "No files have been removed."
-#: scripts/makepkg.sh.in:1213
+#: scripts/makepkg.sh.in:1212
msgid "Source destination must be defined in makepkg.conf."
msgstr "Source destination must be defined in makepkg.conf."
-#: scripts/makepkg.sh.in:1214
+#: scripts/makepkg.sh.in:1213
msgid "In addition, please run makepkg -C outside of your cache directory."
msgstr "In addition, please run makepkg -C outside of your cache directory."
-#: scripts/makepkg.sh.in:1220
+#: scripts/makepkg.sh.in:1219
msgid "BUILDSCRIPT is undefined! Ensure you have updated %s."
msgstr "BUILDSCRIPT is undefined! Ensure you have updated %s."
-#: scripts/makepkg.sh.in:1227
+#: scripts/makepkg.sh.in:1226
msgid "Running makepkg as root is a BAD idea and can cause"
msgstr "Running makepkg as root is a BAD idea and can cause"
-#: scripts/makepkg.sh.in:1228
+#: scripts/makepkg.sh.in:1227
msgid "permanent, catastrophic damage to your system. If you"
msgstr "permanent, catastrophic damage to your system. If you"
-#: scripts/makepkg.sh.in:1229
+#: scripts/makepkg.sh.in:1228
msgid "wish to run as root, please use the --asroot option."
msgstr "wish to run as root, please use the --asroot option."
-#: scripts/makepkg.sh.in:1233
+#: scripts/makepkg.sh.in:1232
msgid "The --asroot option is meant for the root user only."
msgstr "The --asroot option is meant for the root user only."
-#: scripts/makepkg.sh.in:1234
+#: scripts/makepkg.sh.in:1233
msgid "Please rerun makepkg without the --asroot flag."
msgstr "Please rerun makepkg without the --asroot flag."
-#: scripts/makepkg.sh.in:1238
+#: scripts/makepkg.sh.in:1237
msgid "Fakeroot must be installed if using the 'fakeroot' option"
msgstr "Fakeroot must be installed if using the 'fakeroot' option"
-#: scripts/makepkg.sh.in:1239
+#: scripts/makepkg.sh.in:1238
msgid "in the BUILDENV array in %s."
msgstr "in the BUILDENV array in %s."
-#: scripts/makepkg.sh.in:1243
+#: scripts/makepkg.sh.in:1242
msgid "Running makepkg as an unprivileged user will result in non-root"
msgstr "Running makepkg as an unprivileged user will result in non-root"
-#: scripts/makepkg.sh.in:1244
+#: scripts/makepkg.sh.in:1243
msgid "ownership of the packaged files. Try using the fakeroot environment by"
msgstr "ownership of the packaged files. Try using the fakeroot environment by"
-#: scripts/makepkg.sh.in:1245
+#: scripts/makepkg.sh.in:1244
msgid "placing 'fakeroot' in the BUILDENV array in makepkg.conf."
msgstr "placing 'fakeroot' in the BUILDENV array in makepkg.conf."
-#: scripts/makepkg.sh.in:1250
+#: scripts/makepkg.sh.in:1249
msgid "Do not use the '-F' option. This option is only for use by makepkg."
msgstr "Do not use the '-F' option. This option is only for use by makepkg."
-#: scripts/makepkg.sh.in:1259
+#: scripts/makepkg.sh.in:1258
msgid "Cannot find the sudo binary! Is sudo installed?"
msgstr "Cannot find the sudo binary! Is sudo installed?"
-#: scripts/makepkg.sh.in:1260
+#: scripts/makepkg.sh.in:1259
msgid "Missing dependencies cannot be installed or removed as a normal user"
msgstr "Missing dependencies cannot be installed or removed as a normal user"
-#: scripts/makepkg.sh.in:1261
+#: scripts/makepkg.sh.in:1260
msgid "without sudo; install and configure sudo to auto-resolve dependencies."
msgstr "without sudo; install and configure sudo to auto-resolve dependencies."
-#: scripts/makepkg.sh.in:1271
+#: scripts/makepkg.sh.in:1270
msgid "%s does not exist."
msgstr "%s does not exist."
-#: scripts/makepkg.sh.in:1286
-#: scripts/makepkg.sh.in:1290
+#: scripts/makepkg.sh.in:1285
+#: scripts/makepkg.sh.in:1289
+#: scripts/makepkg.sh.in:1293
msgid "%s is not allowed to be empty."
msgstr "%s is not allowed to be empty."
-#: scripts/makepkg.sh.in:1294
-#: scripts/makepkg.sh.in:1298
+#: scripts/makepkg.sh.in:1297
+#: scripts/makepkg.sh.in:1301
msgid "%s is not allowed to contain hyphens."
msgstr "%s is not allowed to contain hyphens."
-#: scripts/makepkg.sh.in:1308
-#: scripts/makepkg.sh.in:1313
+#: scripts/makepkg.sh.in:1311
+#: scripts/makepkg.sh.in:1316
msgid "%s is not available for the '%s' architecture."
msgstr "%s is not available for the '%s' architecture."
-#: scripts/makepkg.sh.in:1309
-#: scripts/makepkg.sh.in:1314
+#: scripts/makepkg.sh.in:1312
+#: scripts/makepkg.sh.in:1317
msgid "Note that many packages may need a line added to their %s"
msgstr "Note that many packages may need a line added to their %s"
-#: scripts/makepkg.sh.in:1310
-#: scripts/makepkg.sh.in:1315
+#: scripts/makepkg.sh.in:1313
+#: scripts/makepkg.sh.in:1318
msgid "such as arch=('%s')."
msgstr "such as arch=('%s')."
-#: scripts/makepkg.sh.in:1320
+#: scripts/makepkg.sh.in:1323
msgid "Install scriptlet (%s) does not exist."
msgstr "Install scriptlet (%s) does not exist."
-#: scripts/makepkg.sh.in:1330
+#: scripts/makepkg.sh.in:1337
msgid "A package has already been built, installing existing package..."
msgstr "A package has already been built, installing existing package..."
-#: scripts/makepkg.sh.in:1334
-#: scripts/makepkg.sh.in:1366
+#: scripts/makepkg.sh.in:1341
+#: scripts/makepkg.sh.in:1372
msgid "A package has already been built. (use -f to overwrite)"
msgstr "A package has already been built. (use -f to overwrite)"
-#: scripts/makepkg.sh.in:1343
-#: scripts/makepkg.sh.in:1442
+#: scripts/makepkg.sh.in:1350
+#: scripts/makepkg.sh.in:1449
msgid "Skipping build."
msgstr "Skipping build."
-#: scripts/makepkg.sh.in:1352
+#: scripts/makepkg.sh.in:1358
msgid "Leaving fakeroot environment."
msgstr "Leaving fakeroot environment."
-#: scripts/makepkg.sh.in:1356
+#: scripts/makepkg.sh.in:1362
msgid "Making package: %s"
msgstr "Making package: %s"
-#: scripts/makepkg.sh.in:1359
+#: scripts/makepkg.sh.in:1365
msgid "Running makepkg as root..."
msgstr "Running makepkg as root..."
-#: scripts/makepkg.sh.in:1370
+#: scripts/makepkg.sh.in:1376
msgid "Source package created: %s"
msgstr "Source package created: %s"
-#: scripts/makepkg.sh.in:1377
+#: scripts/makepkg.sh.in:1383
msgid "Skipping dependency checks."
msgstr "Skipping dependency checks."
-#: scripts/makepkg.sh.in:1384
+#: scripts/makepkg.sh.in:1390
msgid "Checking Runtime Dependencies..."
msgstr "Checking Runtime Dependencies..."
-#: scripts/makepkg.sh.in:1387
+#: scripts/makepkg.sh.in:1393
msgid "Checking Buildtime Dependencies..."
msgstr "Checking Buildtime Dependencies..."
-#: scripts/makepkg.sh.in:1391
+#: scripts/makepkg.sh.in:1397
msgid "Could not resolve all dependencies."
msgstr "Could not resolve all dependencies."
-#: scripts/makepkg.sh.in:1395
+#: scripts/makepkg.sh.in:1401
msgid "pacman was not found in PATH; skipping dependency checks."
msgstr "pacman was not found in PATH; skipping dependency checks."
-#: scripts/makepkg.sh.in:1409
+#: scripts/makepkg.sh.in:1415
msgid "Skipping source retrieval -- using existing src/ tree"
msgstr "Skipping source retrieval -- using existing src/ tree"
-#: scripts/makepkg.sh.in:1410
+#: scripts/makepkg.sh.in:1416
msgid "Skipping source integrity checks -- using existing src/ tree"
msgstr "Skipping source integrity checks -- using existing src/ tree"
-#: scripts/makepkg.sh.in:1411
+#: scripts/makepkg.sh.in:1417
msgid "Skipping source extraction -- using existing src/ tree"
msgstr "Skipping source extraction -- using existing src/ tree"
-#: scripts/makepkg.sh.in:1414
+#: scripts/makepkg.sh.in:1420
msgid "The source directory is empty, there is nothing to build!"
msgstr "The source directory is empty, there is nothing to build!"
-#: scripts/makepkg.sh.in:1418
+#: scripts/makepkg.sh.in:1424
msgid "The package directory is empty, there is nothing to repackage!"
msgstr "The package directory is empty, there is nothing to repackage!"
-#: scripts/makepkg.sh.in:1429
+#: scripts/makepkg.sh.in:1435
msgid "Sources are ready."
msgstr "Sources are ready."
-#: scripts/makepkg.sh.in:1434
+#: scripts/makepkg.sh.in:1440
msgid "Removing existing pkg/ directory..."
msgstr "Removing existing pkg/ directory..."
-#: scripts/makepkg.sh.in:1451
+#: scripts/makepkg.sh.in:1458
msgid "Entering fakeroot environment..."
msgstr "Entering fakeroot environment..."
-#: scripts/makepkg.sh.in:1464
+#: scripts/makepkg.sh.in:1470
msgid "Finished making: %s"
msgstr "Finished making: %s"
-#: scripts/pacman-optimize.sh.in:44
+#: scripts/pacman-optimize.sh.in:42
msgid "Usage: %s [pacman_db_root]"
msgstr "Usage: %s [pacman_db_root]"
-#: scripts/pacman-optimize.sh.in:45
+#: scripts/pacman-optimize.sh.in:43
msgid ""
"pacman-optimize is a little hack that should improve the performance\\n"
"of pacman when reading/writing to its filesystem-based database.\\n"
@@ -1870,7 +1857,7 @@ msgstr ""
"of pacman when reading/writing to its filesystem-based database.\\n"
"\\n"
-#: scripts/pacman-optimize.sh.in:48
+#: scripts/pacman-optimize.sh.in:46
msgid ""
"Because pacman uses many small files to keep track of packages,\\n"
"there is a tendency for these files to become fragmented over time.\\n"
@@ -1886,63 +1873,67 @@ msgstr ""
"drive should be able to read them faster, since the hard drive head\\n"
"does not have to move around the disk as much.\\n"
-#: scripts/pacman-optimize.sh.in:91
+#: scripts/pacman-optimize.sh.in:89
msgid "diff tool was not found, please install diffutils."
msgstr "diff tool was not found, please install diffutils."
-#: scripts/pacman-optimize.sh.in:96
+#: scripts/pacman-optimize.sh.in:94
msgid "Pacman lock file was found. Cannot run while pacman is running."
msgstr "Pacman lock file was found. Cannot run while pacman is running."
-#: scripts/pacman-optimize.sh.in:104
+#: scripts/pacman-optimize.sh.in:98
+msgid "%s does not exist or is not a directory."
+msgstr "%s does not exist or is not a directory."
+
+#: scripts/pacman-optimize.sh.in:102
msgid "You must have correct permissions to optimize the database."
msgstr "You must have correct permissions to optimise the database."
-#: scripts/pacman-optimize.sh.in:108
+#: scripts/pacman-optimize.sh.in:106
msgid "ERROR: Can not create temp directory for database building."
msgstr "ERROR: Can not create temp directory for database building."
-#: scripts/pacman-optimize.sh.in:114
+#: scripts/pacman-optimize.sh.in:112
msgid "MD5sum'ing the old database..."
msgstr "MD5sum'ing the old database..."
-#: scripts/pacman-optimize.sh.in:118
+#: scripts/pacman-optimize.sh.in:116
msgid "Tar'ing up %s..."
msgstr "Tar'ing up %s..."
-#: scripts/pacman-optimize.sh.in:123
+#: scripts/pacman-optimize.sh.in:121
msgid "Tar'ing up %s failed."
msgstr "Tar'ing up %s failed."
-#: scripts/pacman-optimize.sh.in:127
+#: scripts/pacman-optimize.sh.in:125
msgid "Making and MD5sum'ing the new db..."
msgstr "Making and MD5sum'ing the new db..."
-#: scripts/pacman-optimize.sh.in:132
+#: scripts/pacman-optimize.sh.in:130
msgid "Untar'ing %s failed."
msgstr "Untar'ing %s failed."
-#: scripts/pacman-optimize.sh.in:138
+#: scripts/pacman-optimize.sh.in:136
msgid "Checking integrity..."
msgstr "Checking integrity..."
-#: scripts/pacman-optimize.sh.in:144
+#: scripts/pacman-optimize.sh.in:142
msgid "Integrity check FAILED, reverting to old database."
msgstr "Integrity check FAILED, reverting to old database."
-#: scripts/pacman-optimize.sh.in:149
+#: scripts/pacman-optimize.sh.in:147
msgid "Putting the new database in place..."
msgstr "Putting the new database in place..."
-#: scripts/pacman-optimize.sh.in:158
+#: scripts/pacman-optimize.sh.in:156
msgid "Finished. Your pacman database has been optimized."
msgstr "Finished. Your pacman database has been optimised."
-#: scripts/pacman-optimize.sh.in:159
+#: scripts/pacman-optimize.sh.in:157
msgid "For full benefits of pacman-optimize, run 'sync' now."
msgstr "For full benefits of pacman-optimize, run 'sync' now."
-#: scripts/repo-add.sh.in:56
+#: scripts/repo-add.sh.in:57
msgid ""
"Usage: %s <path-to-db> [--force] <package> ...\\n"
"\\n"
@@ -1950,7 +1941,7 @@ msgstr ""
"Usage: %s <path-to-db> [--force] <package> ...\\n"
"\\n"
-#: scripts/repo-add.sh.in:57
+#: scripts/repo-add.sh.in:58
msgid ""
"repo-add will update a package database by reading a package file.\\n"
"Multiple packages to add can be specified on the command line.\\n"
@@ -1960,7 +1951,7 @@ msgstr ""
"Multiple packages to add can be specified on the command line.\\n"
"\\n"
-#: scripts/repo-add.sh.in:60
+#: scripts/repo-add.sh.in:61
msgid ""
"The --force flag will add a 'force' entry to the sync database, which\\n"
"tells pacman to skip its internal version number checking and update\\n"
@@ -1972,11 +1963,11 @@ msgstr ""
"the package regardless.\\n"
"\\n"
-#: scripts/repo-add.sh.in:64
+#: scripts/repo-add.sh.in:65
msgid "Example: repo-add /path/to/repo.db.tar.gz pacman-3.0.0.pkg.tar.gz"
msgstr "Example: repo-add /path/to/repo.db.tar.gz pacman-3.0.0.pkg.tar.gz"
-#: scripts/repo-add.sh.in:69
+#: scripts/repo-add.sh.in:70
msgid ""
"Copyright (C) 2006 Aaron Griffin <aaron@archlinux.org>.\\n"
"\\n"
@@ -1988,86 +1979,86 @@ msgstr ""
"This is free software; see the source for copying conditions.\\n"
"There is NO WARRANTY, to the extent permitted by law.\\n"
-#: scripts/repo-add.sh.in:173
+#: scripts/repo-add.sh.in:174
msgid "Invalid package file '%s'."
msgstr "Invalid package file '%s'."
-#: scripts/repo-add.sh.in:182
-#: scripts/repo-remove.sh.in:91
+#: scripts/repo-add.sh.in:183
+#: scripts/repo-remove.sh.in:89
msgid "Removing existing package '%s'..."
msgstr "Removing existing package '%s'..."
-#: scripts/repo-add.sh.in:192
+#: scripts/repo-add.sh.in:193
msgid "Creating 'desc' db entry..."
msgstr "Creating 'desc' db entry..."
-#: scripts/repo-add.sh.in:202
+#: scripts/repo-add.sh.in:203
msgid "Computing md5 checksums..."
msgstr "Computing md5 checksums..."
-#: scripts/repo-add.sh.in:214
+#: scripts/repo-add.sh.in:215
msgid "Creating 'depends' db entry..."
msgstr "Creating 'depends' db entry..."
-#: scripts/repo-add.sh.in:230
+#: scripts/repo-add.sh.in:231
msgid "Creating 'deltas' db entry..."
msgstr "Creating 'deltas' db entry..."
-#: scripts/repo-add.sh.in:236
+#: scripts/repo-add.sh.in:237
msgid "Added delta '%s'"
msgstr "Added delta '%s'"
-#: scripts/repo-add.sh.in:238
+#: scripts/repo-add.sh.in:239
msgid "Could not add delta '%s'"
msgstr "Could not add delta '%s'"
-#: scripts/repo-add.sh.in:276
-#: scripts/repo-remove.sh.in:123
+#: scripts/repo-add.sh.in:277
+#: scripts/repo-remove.sh.in:121
msgid "%s not found. Cannot continue."
msgstr "%s not found. Cannot continue."
-#: scripts/repo-add.sh.in:286
-#: scripts/repo-remove.sh.in:133
+#: scripts/repo-add.sh.in:287
+#: scripts/repo-remove.sh.in:131
msgid "Cannot create temp directory for database building."
msgstr "Cannot create temp directory for database building."
-#: scripts/repo-add.sh.in:297
-#: scripts/repo-remove.sh.in:142
+#: scripts/repo-add.sh.in:298
+#: scripts/repo-remove.sh.in:140
msgid "Repository file '%s' is not a proper pacman database."
msgstr "Repository file '%s' is not a proper pacman database."
-#: scripts/repo-add.sh.in:300
-#: scripts/repo-remove.sh.in:145
+#: scripts/repo-add.sh.in:301
+#: scripts/repo-remove.sh.in:143
msgid "Extracting database to a temporary location..."
msgstr "Extracting database to a temporary location..."
-#: scripts/repo-add.sh.in:306
+#: scripts/repo-add.sh.in:307
msgid "'%s' is not a package file, skipping"
msgstr "'%s' is not a package file, skipping"
-#: scripts/repo-add.sh.in:308
+#: scripts/repo-add.sh.in:309
msgid "Adding package '%s'"
msgstr "Adding package '%s'"
-#: scripts/repo-add.sh.in:315
+#: scripts/repo-add.sh.in:316
msgid "Package '%s' not found."
msgstr "Package '%s' not found."
-#: scripts/repo-add.sh.in:322
+#: scripts/repo-add.sh.in:323
msgid "Creating updated database file %s"
msgstr "Creating updated database file %s"
-#: scripts/repo-add.sh.in:332
-#: scripts/repo-remove.sh.in:170
+#: scripts/repo-add.sh.in:333
+#: scripts/repo-remove.sh.in:168
msgid "No compression set."
msgstr "No compression set."
-#: scripts/repo-add.sh.in:340
-#: scripts/repo-remove.sh.in:178
+#: scripts/repo-add.sh.in:341
+#: scripts/repo-remove.sh.in:176
msgid "No packages modified, nothing to do."
msgstr "No packages modified, nothing to do."
-#: scripts/repo-remove.sh.in:55
+#: scripts/repo-remove.sh.in:53
msgid ""
"repo-remove %s\\n"
"\\n"
@@ -2075,7 +2066,7 @@ msgstr ""
"repo-remove %s\\n"
"\\n"
-#: scripts/repo-remove.sh.in:56
+#: scripts/repo-remove.sh.in:54
msgid ""
"usage: %s <path-to-db> <packagename> ...\\n"
"\\n"
@@ -2083,7 +2074,7 @@ msgstr ""
"usage: %s <path-to-db> <packagename> ...\\n"
"\\n"
-#: scripts/repo-remove.sh.in:57
+#: scripts/repo-remove.sh.in:55
msgid ""
"repo-remove will update a package database by removing the package name\\n"
"specified on the command line from the given repo database. Multiple\\n"
@@ -2095,27 +2086,27 @@ msgstr ""
"packages to remove can be specified on the command line.\\n"
"\\n"
-#: scripts/repo-remove.sh.in:61
+#: scripts/repo-remove.sh.in:59
msgid "Example: repo-remove /path/to/repo.db.tar.gz kernel26"
msgstr "Example: repo-remove /path/to/repo.db.tar.gz kernel26"
-#: scripts/repo-remove.sh.in:149
+#: scripts/repo-remove.sh.in:147
msgid "Searching for package '%s'..."
msgstr "Searching for package '%s'..."
-#: scripts/repo-remove.sh.in:154
+#: scripts/repo-remove.sh.in:152
msgid "Package matching '%s' not found."
msgstr "Package matching '%s' not found."
-#: scripts/repo-remove.sh.in:161
+#: scripts/repo-remove.sh.in:159
msgid "Creating updated database file '%s'..."
msgstr "Creating updated database file '%s'..."
-#: scripts/updatesync.sh.in:35
+#: scripts/updatesync.sh.in:33
msgid "Usage: %s <action> <destfile> <option> [package_directory]"
msgstr "Usage: %s <action> <destfile> <option> [package_directory]"
-#: scripts/updatesync.sh.in:36
+#: scripts/updatesync.sh.in:34
msgid ""
"updatesync will update a sync database by reading a PKGBUILD and\\n"
"modifying the destfile. updatesync updates the database in a temporary\\n"
@@ -2127,7 +2118,7 @@ msgstr ""
"directory and then compresses it to <destfile>.\\n"
"\\n"
-#: scripts/updatesync.sh.in:40
+#: scripts/updatesync.sh.in:38
msgid ""
"There are two types of actions:\\n"
"\\n"
@@ -2135,7 +2126,7 @@ msgstr ""
"There are two types of actions:\\n"
"\\n"
-#: scripts/updatesync.sh.in:41
+#: scripts/updatesync.sh.in:39
msgid ""
"upd - Will update a package's entry or create it if it doesn't exist.\\n"
" It takes the package's PKGBUILD as an option.\\n"
@@ -2143,7 +2134,7 @@ msgstr ""
"upd - Will update a package's entry or create it if it doesn't exist.\\n"
" It takes the package's PKGBUILD as an option.\\n"
-#: scripts/updatesync.sh.in:42
+#: scripts/updatesync.sh.in:40
msgid ""
"del - Will remove a package's entry from the db. It takes the package's\\n"
" name as an option.\\n"
@@ -2151,7 +2142,7 @@ msgstr ""
"del - Will remove a package's entry from the db. It takes the package's\\n"
" name as an option.\\n"
-#: scripts/updatesync.sh.in:44
+#: scripts/updatesync.sh.in:42
msgid ""
"updatesync will calculate md5sums of packages in the same directory as\\n"
"<destfile>, unless an alternate [package_directory] is specified.\\n"
@@ -2161,11 +2152,11 @@ msgstr ""
"<destfile>, unless an alternate [package_directory] is specified.\\n"
"\\n"
-#: scripts/updatesync.sh.in:47
+#: scripts/updatesync.sh.in:45
msgid "Example: updatesync upd /home/mypkgs/custom.db.tar.gz PKGBUILD"
msgstr "Example: updatesync upd /home/mypkgs/custom.db.tar.gz PKGBUILD"
-#: scripts/updatesync.sh.in:53
+#: scripts/updatesync.sh.in:50
msgid ""
"Copyright (C) 2004 Jason Chu <jason@archlinux.org>.\\n"
"\\n"
@@ -2177,28 +2168,11 @@ msgstr ""
"This is free software; see the source for copying conditions.\\n"
"There is NO WARRANTY, to the extent permitted by law.\\n"
-#: scripts/updatesync.sh.in:123
+#: scripts/updatesync.sh.in:120
msgid "%s not found"
msgstr "%s not found"
-#: scripts/updatesync.sh.in:129
-msgid "failed to parse %s"
-msgstr "failed to parse %s"
-
-#: scripts/updatesync.sh.in:136
-msgid "could not find %s-%s-%s-%s.%s - aborting"
-msgstr "could not find %s-%s-%s-%s.%s - aborting"
-
-#~ msgid ":: %s-%s: local version is up to date. Upgrade anyway? [Y/n] "
-#~ msgstr ":: %s-%s: local version is up to date. Upgrade anyway? [Y/n] "
-#~ msgid "usage: %s {-R --remove} [options] <package>\n"
-#~ msgstr "usage: %s {-R --remove} [options] <package>\n"
-#~ msgid "Total Package Size: %.2f MB\n"
-#~ msgstr "Total Package Size: %.2f MB\n"
-#~ msgid ""
-#~ " --ask <number> pre-specify answers for questions (see manpage)\n"
-#~ msgstr ""
-#~ " --ask <number> pre-specify answers for questions (see manpage)\n"
-#~ msgid "Do you want to remove all packages from cache? [Y/n] "
-#~ msgstr "Do you want to remove all packages from cache? [Y/n] "
+#: scripts/updatesync.sh.in:133
+msgid "could not find %s-%s-%s-%s%s - aborting"
+msgstr "could not find %s-%s-%s-%s%s - aborting"