From 4f7b3edefe62549fc60812deee782e53c5d9fc56 Mon Sep 17 00:00:00 2001 From: Jo Date: Fri, 23 Jun 2023 20:15:47 +0200 Subject: [PATCH] chore(yay): update deps (#2220) * update deps * update po --- go.mod | 10 +-- go.sum | 20 ++--- po/en.po | 241 +++++++++++++++++-------------------------------------- 3 files changed, 90 insertions(+), 181 deletions(-) diff --git a/go.mod b/go.mod index 69cb9f0fe..6c1f800a8 100644 --- a/go.mod +++ b/go.mod @@ -9,9 +9,9 @@ require ( github.com/bradleyjkemp/cupaloy v2.3.0+incompatible github.com/leonelquinteros/gotext v1.5.2 github.com/stretchr/testify v1.8.3 - golang.org/x/sys v0.8.0 - golang.org/x/term v0.8.0 - golang.org/x/text v0.9.0 // indirect + golang.org/x/sys v0.9.0 + golang.org/x/term v0.9.0 + golang.org/x/text v0.10.0 // indirect gopkg.in/h2non/gock.v1 v1.1.2 ) @@ -26,9 +26,9 @@ require ( require ( github.com/deckarep/golang-set/v2 v2.3.0 - github.com/itchyny/gojq v0.12.12 // indirect + github.com/itchyny/gojq v0.12.13 // indirect github.com/itchyny/timefmt-go v0.1.5 // indirect - github.com/ohler55/ojg v1.18.5 // indirect + github.com/ohler55/ojg v1.18.7 // indirect ) require github.com/hashicorp/go-multierror v1.1.1 diff --git a/go.sum b/go.sum index 5851e16f0..b9d6d2dfe 100644 --- a/go.sum +++ b/go.sum @@ -26,8 +26,8 @@ github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= -github.com/itchyny/gojq v0.12.12 h1:x+xGI9BXqKoJQZkr95ibpe3cdrTbY8D9lonrK433rcA= -github.com/itchyny/gojq v0.12.12/go.mod h1:j+3sVkjxwd7A7Z5jrbKibgOLn0ZfLWkV+Awxr/pyzJE= +github.com/itchyny/gojq v0.12.13 h1:IxyYlHYIlspQHHTE0f3cJF0NKDMfajxViuhBLnHd/QU= +github.com/itchyny/gojq v0.12.13/go.mod h1:JzwzAqenfhrPUuwbmEz3nu3JQmFLlQTQMUcOdnu/Sf4= github.com/itchyny/timefmt-go v0.1.5 h1:G0INE2la8S6ru/ZI5JecgyzbbJNs5lG1RcBqa7Jm6GE= github.com/itchyny/timefmt-go v0.1.5/go.mod h1:nEP7L+2YmAbT2kZ2HfSs1d8Xtw9LY8D2stDBckWakZ8= github.com/leonelquinteros/gotext v1.5.2 h1:T2y6ebHli+rMBCjcJlHTXyUrgXqsKBhl/ormgvt7lPo= @@ -36,8 +36,8 @@ github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyua github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32 h1:W6apQkHrMkS0Muv8G/TipAy/FJl/rCYT0+EuS8+Z0z4= github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod h1:9wM+0iRr9ahx58uYLpLIr5fm8diHn0JbqRycJi6w0Ms= -github.com/ohler55/ojg v1.18.5 h1:tzn5LJtkSyXowCo8SlGieU0zEc7WF4143Ri9MYlQy7Q= -github.com/ohler55/ojg v1.18.5/go.mod h1:uHcD1ErbErC27Zhb5Df2jUjbseLLcmOCo6oxSr3jZxo= +github.com/ohler55/ojg v1.18.7 h1:sC7zy0usEiWa6bvx3NU1yZH4kCA2F3Qzs6iiDX4+xdk= +github.com/ohler55/ojg v1.18.7/go.mod h1:uHcD1ErbErC27Zhb5Df2jUjbseLLcmOCo6oxSr3jZxo= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= @@ -64,18 +64,18 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= -golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s= +golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.8.0 h1:n5xxQn2i3PC0yLAbjTpNT85q/Kgzcr2gIoX9OrJUols= -golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= +golang.org/x/term v0.9.0 h1:GRRCnKYhdQrD8kfRAdQ6Zcw1P0OcELxGLKJvtjVMZ28= +golang.org/x/term v0.9.0/go.mod h1:M6DEAAIenWoTxdKrOltXcmDY3rSplQUkrvaDU5FcQyo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= -golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= -golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.10.0 h1:UpjohKhiEgNc0CSauXmwYftY1+LlaC75SJwh0SgCX58= +golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= diff --git a/po/en.po b/po/en.po index 3d5a12c59..ce3c78d20 100644 --- a/po/en.po +++ b/po/en.po @@ -15,22 +15,12 @@ msgstr "" msgid " (Installed)" msgstr "" -#: pkg/dep/depCheck.go:310 -msgid " (Target" -msgstr "" - -#: pkg/dep/depCheck.go:312 -msgid " (Wanted by: " -msgstr "" - -#: cmd.go:470 +#: cmd.go:461 msgid " [Installed]" msgstr "" -#: cmd.go:423 -#: install.go:172 -#: install.go:206 -#: vote.go:34 +#: cmd.go:418 +#: vote.go:35 msgid " there is nothing to do" msgstr "" @@ -38,12 +28,11 @@ msgstr "" msgid "%s [A]ll [Ab]ort [I]nstalled [No]tInstalled or (1 2 3, 1-3, ^4)" msgstr "" -#: aur_install.go:293 -#: install.go:741 +#: aur_install.go:304 msgid "%s already made -- skipping build" msgstr "" -#: pkg/menus/edit_menu.go:57 +#: pkg/menus/edit_menu.go:56 msgid "%s is not set" msgstr "" @@ -51,21 +40,16 @@ msgstr "" msgid "%s is present." msgstr "" -#: pkg/dep/dep_graph.go:396 -#: aur_install.go:290 -#: install.go:727 +#: pkg/dep/dep_graph.go:431 +#: aur_install.go:301 msgid "%s is up to date -- skipping" msgstr "" -#: install.go:642 -msgid "%s not satisfied, flushing install queue" -msgstr "" - -#: pkg/upgrade/service.go:298 +#: pkg/upgrade/service.go:304 msgid "%s to upgrade/install." msgstr "" -#: pkg/upgrade/service.go:292 +#: pkg/upgrade/service.go:298 msgid "%s will also be installed for this operation." msgstr "" @@ -90,11 +74,10 @@ msgid "%s: ignoring package upgrade (%s => %s)" msgstr "" #: pkg/query/aur_warnings.go:51 -#: upgrade.go:165 msgid "%s: local (%s) is newer than AUR (%s)" msgstr "" -#: vote.go:49 +#: vote.go:50 msgid "%s: please set AUR_USERNAME and AUR_PASSWORD environment variables for voting" msgstr "" @@ -111,21 +94,21 @@ msgstr "" msgid "(%d/%d) Parsing SRCINFO: %s" msgstr "" -#: pkg/query/types.go:70 -#: pkg/query/types.go:101 +#: pkg/query/types.go:72 +#: pkg/query/types.go:103 msgid "(Installed)" msgstr "" -#: pkg/query/types.go:68 -#: pkg/query/types.go:99 +#: pkg/query/types.go:70 +#: pkg/query/types.go:101 msgid "(Installed: %s)" msgstr "" -#: pkg/query/types.go:59 +#: pkg/query/types.go:61 msgid "(Orphaned)" msgstr "" -#: pkg/query/types.go:63 +#: pkg/query/types.go:65 msgid "(Out-of-date: %s)" msgstr "" @@ -137,7 +120,7 @@ msgstr "" msgid "AUR" msgstr "" -#: pkg/menus/edit_menu.go:58 +#: pkg/menus/edit_menu.go:57 msgid "Add %s or %s to your environment variables" msgstr "" @@ -153,33 +136,19 @@ msgstr "" msgid "Check Deps" msgstr "" -#: upgrade.go:95 #: pkg/upgrade/service.go:90 msgid "Checking development packages..." msgstr "" -#: pkg/dep/depCheck.go:137 -msgid "Checking for conflicts..." -msgstr "" - -#: pkg/dep/depCheck.go:145 -msgid "Checking for inner conflicts..." -msgstr "" - #: clean.go:217 msgid "Cleaning (%d/%d): %s" msgstr "" -#: pkg/dep/depCheck.go:200 -msgid "Conflicting packages will have to be confirmed manually" -msgstr "" - #: print.go:39 msgid "Conflicts With" msgstr "" -#: pkg/menus/clean_menu.go:61 -#: pkg/menus/clean_menu.go:108 +#: pkg/menus/clean_menu.go:60 msgid "Deleting (%d/%d): %s" msgstr "" @@ -195,8 +164,7 @@ msgstr "" msgid "Description" msgstr "" -#: pkg/menus/diff_menu.go:161 -#: pkg/menus/diff_menu.go:194 +#: pkg/menus/diff_menu.go:158 msgid "Diffs to show?" msgstr "" @@ -216,7 +184,7 @@ msgstr "" msgid "Do you want to remove all other AUR packages from cache?" msgstr "" -#: pkg/menus/edit_menu.go:61 +#: pkg/menus/edit_menu.go:60 msgid "Edit PKGBUILD with?" msgstr "" @@ -224,7 +192,7 @@ msgstr "" msgid "Error during AUR search: %s\n" msgstr "" -#: pkg/upgrade/service.go:302 +#: pkg/upgrade/service.go:308 msgid "Excluding packages may cause partial upgrades and break systems" msgstr "" @@ -232,16 +200,16 @@ msgstr "" msgid "Explicit" msgstr "" -#: print.go:84 +#: print.go:85 msgid "Explicitly installed packages: %s" msgstr "" -#: pkg/dep/dep_graph.go:376 -#: pkg/dep/dep_graph.go:465 +#: pkg/dep/dep_graph.go:408 +#: pkg/dep/dep_graph.go:506 msgid "Failed to find AUR package for" msgstr "" -#: aur_install.go:110 +#: aur_install.go:120 msgid "Failed to install layer, rolling up to next layer." msgstr "" @@ -257,7 +225,7 @@ msgstr "" msgid "Flagged Out Of Date AUR Packages:" msgstr "" -#: print.go:83 +#: print.go:84 msgid "Foreign installed packages: %s" msgstr "" @@ -281,14 +249,6 @@ msgstr "" msgid "Importing keys with gpg..." msgstr "" -#: pkg/dep/depCheck.go:155 -msgid "Inner conflicts found:" -msgstr "" - -#: pkg/dep/depCheck.go:173 -msgid "Installing %s will remove:" -msgstr "" - #: print.go:27 msgid "Keywords" msgstr "" @@ -329,8 +289,8 @@ msgstr "" msgid "Name" msgstr "" -#: pkg/dep/dep_graph.go:381 -#: pkg/dep/dep_graph.go:478 +#: pkg/dep/dep_graph.go:413 +#: pkg/dep/dep_graph.go:519 msgid "No AUR package found for" msgstr "" @@ -355,17 +315,11 @@ msgstr "" msgid "PGP keys need importing:" msgstr "" -#: install.go:265 -#: vcs.go:46 -msgid "PKGBUILD up to date, Skipping (%d/%d): %s" -msgstr "" - -#: preparer.go:226 +#: preparer.go:242 msgid "PKGBUILD up to date, skipping download: %s" msgstr "" -#: pkg/menus/edit_menu.go:131 -#: pkg/menus/edit_menu.go:163 +#: pkg/menus/edit_menu.go:130 msgid "PKGBUILDs to edit?" msgstr "" @@ -377,44 +331,32 @@ msgstr "" msgid "Package Base" msgstr "" -#: pkg/dep/depCheck.go:170 -msgid "Package conflicts found:" -msgstr "" - #: pkg/query/aur_warnings.go:72 msgid "Packages not in AUR:" msgstr "" -#: pkg/menus/clean_menu.go:53 -#: pkg/menus/clean_menu.go:100 +#: pkg/menus/clean_menu.go:52 msgid "Packages to cleanBuild?" msgstr "" -#: pkg/dep/dep_graph.go:206 -#: upgrade.go:213 +#: pkg/dep/dep_graph.go:216 msgid "Packages to exclude" msgstr "" -#: pkg/upgrade/service.go:301 +#: pkg/upgrade/service.go:307 msgid "Packages to exclude: (eg: \"1 2 3\", \"1-3\", \"^4\" or repo name)" msgstr "" -#: cmd.go:405 +#: cmd.go:400 msgid "Packages to install (eg: 1 2 3, 1-3 or ^4)" msgstr "" -#: upgrade.go:210 -msgid "Packages to upgrade." -msgstr "" - #: print.go:42 msgid "Popularity" msgstr "" -#: pkg/menus/diff_menu.go:173 -#: pkg/menus/diff_menu.go:206 -#: pkg/menus/edit_menu.go:142 -#: pkg/menus/edit_menu.go:176 +#: pkg/menus/diff_menu.go:170 +#: pkg/menus/edit_menu.go:143 msgid "Proceed with install?" msgstr "" @@ -422,17 +364,11 @@ msgstr "" msgid "Provides" msgstr "" -#: pkg/query/aur_info.go:89 -msgid "Querying AUR..." -msgstr "" - -#: install.go:236 -#: preparer.go:108 +#: preparer.go:119 msgid "Remove make dependencies after install?" msgstr "" -#: pkg/dep/depPool.go:503 -#: pkg/dep/dep_graph.go:658 +#: pkg/dep/dep_graph.go:701 msgid "Repository AUR" msgstr "" @@ -445,25 +381,23 @@ msgstr "" msgid "SRCINFO" msgstr "" -#: upgrade.go:73 #: pkg/upgrade/service.go:72 msgid "Searching AUR for updates..." msgstr "" -#: upgrade.go:62 -#: pkg/upgrade/service.go:154 +#: pkg/upgrade/service.go:160 msgid "Searching databases for updates..." msgstr "" -#: pkg/query/query_builder.go:191 +#: pkg/query/query_builder.go:214 msgid "Showing repo packages only" msgstr "" -#: print.go:88 +#: print.go:89 msgid "Size of pacman cache %s: %s" msgstr "" -#: print.go:91 +#: print.go:92 msgid "Size of yay cache %s: %s" msgstr "" @@ -475,17 +409,15 @@ msgstr "" msgid "Sync" msgstr "" -#: print.go:93 +#: print.go:94 msgid "Ten biggest packages:" msgstr "" -#: install.go:495 #: sync.go:190 msgid "The following packages are not compatible with your architecture:" msgstr "" -#: pkg/dep/depPool.go:499 -#: pkg/dep/dep_graph.go:654 +#: pkg/dep/dep_graph.go:697 #: pkg/db/ialpm/alpm.go:179 msgid "There are %d providers available for %s:" msgstr "" @@ -494,15 +426,14 @@ msgstr "" msgid "There may be another Pacman instance running. Waiting..." msgstr "" -#: print.go:85 +#: print.go:86 msgid "Total Size occupied by packages: %s" msgstr "" -#: print.go:82 +#: print.go:83 msgid "Total installed packages: %s" msgstr "" -#: install.go:503 #: sync.go:198 msgid "Try to build them anyway?" msgstr "" @@ -511,9 +442,9 @@ msgstr "" msgid "URL" msgstr "" -#: pkg/menus/clean_menu.go:64 -#: pkg/menus/clean_menu.go:70 #: clean.go:195 +#: pkg/menus/clean_menu.go:63 +#: pkg/menus/clean_menu.go:69 msgid "Unable to clean:" msgstr "" @@ -522,7 +453,7 @@ msgstr "" msgid "Unable to find the following packages:" msgstr "" -#: vote.go:21 +#: vote.go:19 msgid "Unable to handle package vote for: %s. err: %s" msgstr "" @@ -538,7 +469,7 @@ msgstr "" msgid "Votes" msgstr "" -#: print.go:80 +#: print.go:81 msgid "Yay version v%s" msgstr "" @@ -550,8 +481,7 @@ msgstr "" msgid "\nBuild directory:" msgstr "" -#: pkg/dep/depPool.go:513 -#: pkg/dep/dep_graph.go:668 +#: pkg/dep/dep_graph.go:711 #: pkg/db/ialpm/alpm.go:201 msgid "\nEnter a number (default=1): " msgstr "" @@ -560,7 +490,7 @@ msgstr "" msgid "aborting due to user" msgstr "" -#: pkg/settings/parser/parser.go:620 +#: pkg/settings/parser/parser.go:619 msgid "argument '-' specified without input on stdin" msgstr "" @@ -568,7 +498,7 @@ msgstr "" msgid "cannot find PKGBUILD and .SRCINFO in directory" msgstr "" -#: install.go:532 +#: install.go:130 msgid "cannot find package name: %v" msgstr "" @@ -580,20 +510,12 @@ msgstr "" msgid "could not find all required packages" msgstr "" -#: pkg/dep/depCheck.go:303 -msgid "could not find all required packages:" -msgstr "" - #: errors.go:16 msgid "could not find any package archives listed in %s" msgstr "" -#: install.go:788 -msgid "could not find srcinfo for: %s" -msgstr "" - #: errors.go:26 -#: pkg/upgrade/service.go:293 +#: pkg/upgrade/service.go:299 msgid "dependency" msgstr "" @@ -602,7 +524,7 @@ msgstr "" msgid "devel check for package failed: '%s' encountered an error" msgstr "" -#: pkg/menus/edit_menu.go:110 +#: pkg/menus/edit_menu.go:109 msgid "editor did not exit successfully, aborting: %s" msgstr "" @@ -614,27 +536,21 @@ msgstr "" msgid "error fetching %s: %s" msgstr "" -#: install.go:321 -#: install.go:455 #: local_install.go:26 msgid "error installing repo packages" msgstr "" -#: aur_install.go:255 -#: aur_install.go:259 +#: aur_install.go:266 +#: aur_install.go:270 msgid "error installing:" msgstr "" -#: aur_install.go:222 -#: aur_install.go:226 -#: install.go:683 -#: install.go:724 -#: install.go:738 -#: install.go:752 +#: aur_install.go:233 +#: aur_install.go:237 msgid "error making: %s" msgstr "" -#: install.go:588 +#: install.go:160 msgid "error merging %s: %s" msgstr "" @@ -642,13 +558,12 @@ msgstr "" msgid "error reading %s" msgstr "" -#: install.go:110 #: sync.go:37 msgid "error refreshing databases" msgstr "" #: clean.go:223 -#: install.go:581 +#: install.go:153 msgid "error resetting %s: %s" msgstr "" @@ -664,7 +579,7 @@ msgstr "" msgid "failed to create directory '%s': %s" msgstr "" -#: pkg/settings/config.go:288 +#: pkg/settings/config.go:284 msgid "failed to open config file '%s': %s" msgstr "" @@ -676,15 +591,15 @@ msgstr "" msgid "failed to parse %s: %s" msgstr "" -#: local_install.go:82 +#: local_install.go:79 msgid "failed to parse .SRCINFO" msgstr "" -#: pkg/settings/config.go:298 +#: pkg/settings/config.go:294 msgid "failed to read config file '%s': %s" msgstr "" -#: pkg/settings/runtime.go:74 +#: pkg/settings/runtime.go:73 msgid "failed to retrieve aur Cache" msgstr "" @@ -696,8 +611,7 @@ msgstr "" msgid "input too long" msgstr "" -#: pkg/dep/depPool.go:533 -#: pkg/dep/dep_graph.go:689 +#: pkg/dep/dep_graph.go:732 #: pkg/db/ialpm/alpm.go:222 msgid "invalid number: %s" msgstr "" @@ -706,16 +620,15 @@ msgstr "" msgid "invalid option '%s'" msgstr "" -#: cmd.go:207 +#: cmd.go:206 msgid "invalid option: '--deps' and '--explicit' may not be used together" msgstr "" -#: pkg/download/abs.go:21 +#: pkg/download/abs.go:22 msgid "invalid repository" msgstr "" -#: pkg/dep/depPool.go:538 -#: pkg/dep/dep_graph.go:695 +#: pkg/dep/dep_graph.go:738 #: pkg/db/ialpm/alpm.go:227 msgid "invalid value: %d is not between %d and %d" msgstr "" @@ -736,7 +649,7 @@ msgstr "" msgid "no" msgstr "" -#: aur_install.go:231 +#: aur_install.go:242 msgid "nothing to install for %s" msgstr "" @@ -744,23 +657,19 @@ msgstr "" msgid "only one operation may be used at a time" msgstr "" -#: print.go:167 +#: print.go:181 msgid "package '%s' was not found" msgstr "" -#: pkg/dep/depCheck.go:197 -msgid "package conflicts can not be resolved with noconfirm, aborting" -msgstr "" - #: pkg/download/errors.go:15 msgid "package not found in AUR" msgstr "" -#: pkg/download/abs.go:22 +#: pkg/download/abs.go:23 msgid "package not found in repos" msgstr "" -#: pkg/upgrade/service.go:298 +#: pkg/upgrade/service.go:304 msgid "package" msgid_plural "packages" msgstr[0] "" @@ -791,11 +700,11 @@ msgstr "" msgid "unable to CreateHandle: %s" msgstr "" -#: cmd.go:196 +#: cmd.go:195 msgid "unhandled operation" msgstr "" -#: cmd.go:467 +#: cmd.go:458 msgid "unknown-version" msgstr ""