summaryrefslogtreecommitdiff
path: root/po/nn.po
diff options
context:
space:
mode:
authorDaniel Burrows <dburrows@debian.org>2009-01-18 16:09:26 -0800
committerDaniel Burrows <dburrows@debian.org>2009-01-18 16:09:26 -0800
commit486ced6381fad944f9e7b4721cc5a383c65d1ced (patch)
treeec1e9967f5f16247f0c8c0ac0420a81b580d3f23 /po/nn.po
parent3bd4e25d99a2db91f379c1441a696af89fc227b5 (diff)
downloadaptitude-486ced6381fad944f9e7b4721cc5a383c65d1ced.tar.gz
Update the pofiles.
Diffstat (limited to 'po/nn.po')
-rw-r--r--po/nn.po1488
1 files changed, 964 insertions, 524 deletions
diff --git a/po/nn.po b/po/nn.po
index 64abdb7f..ba94b264 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aptitude_nn\n"
"Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2008-11-11 19:42-0800\n"
+"POT-Creation-Date: 2009-01-18 16:00-0800\n"
"PO-Revision-Date: 2005-06-27 21:26+0200\n"
"Last-Translator: Håvard Korsvoll <korsvoll@skulelinux.no>\n"
"Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -533,7 +533,7 @@ msgstr ""
msgid "[%d(%d)/...] Resolving dependencies"
msgstr "Klarer ikkje løysa pakkekrav."
-#: src/broken_indicator.cc:311 src/gtk/resolver.cc:345
+#: src/broken_indicator.cc:311 src/gtk/resolver.cc:307 src/gtk/resolver.cc:488
#: src/solution_dialog.cc:140 src/solution_screen.cc:542
msgid "Internal error: unexpected null solution."
msgstr "Intern feil: uventa nulløysing."
@@ -732,17 +732,17 @@ msgstr ""
msgid "Bad action character '%c'\n"
msgstr "Feil handlingsteikn «%c»\n"
-#: src/cmdline/cmdline_changelog.cc:99
+#: src/cmdline/cmdline_changelog.cc:102
msgid "Can't execute sensible-pager, is this a working Debian system?"
msgstr ""
"Klarer ikkje køyra fornuftig søkjing, er dette eit fungerande debiansystem?"
-#: src/cmdline/cmdline_changelog.cc:157
+#: src/cmdline/cmdline_changelog.cc:160
#, c-format
msgid "%s is not an official Debian package, cannot display its changelog."
msgstr "%s er ikkje ein offisiell debianpakke, kan ikkje visa endringsloggen."
-#: src/cmdline/cmdline_changelog.cc:246
+#: src/cmdline/cmdline_changelog.cc:256
#, c-format
msgid "Couldn't find a changelog for %s"
msgstr "Klarte ikkje finna endringslogg for %s"
@@ -793,7 +793,7 @@ msgid ""
msgstr "Klarer ikkje løysa pakkekrav."
#: src/cmdline/cmdline_do_action.cc:313 src/cmdline/cmdline_simulate.cc:35
-#: src/cmdline/cmdline_upgrade.cc:175 src/main.cc:755
+#: src/cmdline/cmdline_upgrade.cc:175 src/main.cc:757
#, c-format
msgid "Abort.\n"
msgstr "Avbryt.\n"
@@ -907,7 +907,7 @@ msgstr[0] ""
msgstr[1] ""
#: src/cmdline/cmdline_prompt.cc:298 src/cmdline/cmdline_show.cc:437
-#: src/cmdline/cmdline_why.cc:194 src/gtk/dependency_chains_tab.cc:158
+#: src/cmdline/cmdline_why.cc:194 src/gtk/dependency_chains_tab.cc:199
msgid "Provides"
msgstr "Skaffar"
@@ -931,17 +931,17 @@ msgstr "men %s er installert og vert halden tilbake."
msgid "but %s is installed."
msgstr "men %s er installert."
-#: src/cmdline/cmdline_prompt.cc:545 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:545
#, c-format
msgid "but it is not installable"
msgstr "men lèt seg ikkje installera"
-#: src/cmdline/cmdline_prompt.cc:549 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:549 src/cmdline/cmdline_show_broken.cc:93
#, c-format
msgid " which is a virtual package."
msgstr " som er ein virtuell pakke."
-#: src/cmdline/cmdline_prompt.cc:552 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:552 src/cmdline/cmdline_show_broken.cc:96
#, c-format
msgid " or"
msgstr " eller"
@@ -1581,7 +1581,7 @@ msgstr ""
msgid "I want to resolve dependencies, but no dependency resolver was created."
msgstr ""
-#: src/cmdline/cmdline_resolver.cc:530 src/gtk/resolver.cc:317
+#: src/cmdline/cmdline_resolver.cc:530 src/gtk/resolver.cc:614
#: src/solution_dialog.cc:127 src/solution_screen.cc:519
#, fuzzy
msgid "Resolving dependencies..."
@@ -1685,13 +1685,25 @@ msgstr ""
msgid "search: You must provide at least one search term\n"
msgstr "søk: Du må oppgje iallefall eitt søkje ord\n"
-#: src/cmdline/cmdline_show_broken.cc:113
+#: src/cmdline/cmdline_show_broken.cc:86
+#, fuzzy, c-format
+#| msgid "but it is not installable"
+msgid "but it is not installable."
+msgstr "men lèt seg ikkje installera"
+
+#: src/cmdline/cmdline_show_broken.cc:88
+#, fuzzy, c-format
+#| msgid "but %s is to be installed."
+msgid "but it is not going to be installed."
+msgstr "men %s blir installert."
+
+#: src/cmdline/cmdline_show_broken.cc:119
#, c-format
msgid "The following packages have unmet dependencies:\n"
msgstr "Desse pakkane hadde utilfredsstilte pakkekrav:\n"
#: src/cmdline/cmdline_show.cc:172 src/cmdline/cmdline_show.cc:416
-#: src/gtk/resolver.cc:208 src/solution_fragment.cc:58
+#: src/gtk/resolver.cc:218 src/solution_fragment.cc:58
msgid "<NULL>"
msgstr "<NULL>"
@@ -1813,7 +1825,7 @@ msgstr "ja"
msgid "New"
msgstr "Ny"
-#: src/cmdline/cmdline_show.cc:383 src/gtk/gui.cc:89
+#: src/cmdline/cmdline_show.cc:383 src/gtk/gui.cc:91
msgid "Forbidden version"
msgstr "Forboden versjon"
@@ -1825,8 +1837,8 @@ msgstr "Automatisk installert"
msgid "no"
msgstr "ingen"
-#: src/cmdline/cmdline_show.cc:391 src/gtk/packagestab.cc:414
-#: src/gtk/previewtab.cc:215
+#: src/cmdline/cmdline_show.cc:391 src/gtk/packagestab.cc:665
+#: src/gtk/previewtab.cc:225
msgid "Version: "
msgstr "Versjon: "
@@ -1868,6 +1880,7 @@ msgid "MD5sum: "
msgstr "MD5sum: "
#: src/cmdline/cmdline_show.cc:413 src/cmdline/cmdline_show.cc:416
+#: src/gtk/entityview.cc:606
msgid "Archive"
msgstr "Arkiv"
@@ -1903,8 +1916,8 @@ msgstr "Byter ut"
msgid "Obsoletes"
msgstr "Foreldar"
-#: src/cmdline/cmdline_show.cc:441 src/gtk/info.cc:624
-#: src/gtk/packagestab.cc:422 src/gtk/previewtab.cc:223
+#: src/cmdline/cmdline_show.cc:441 src/gtk/info.cc:692
+#: src/gtk/packagestab.cc:673 src/gtk/previewtab.cc:233
#: src/pkg_info_screen.cc:102
msgid "Description: "
msgstr "Skildring: "
@@ -2056,8 +2069,8 @@ msgstr ""
msgid "Candidate"
msgstr "Kdt.Ver"
-#: src/cmdline/cmdline_why.cc:285 src/gtk/aptitude.glade:1630
-#: src/gtk/gui.cc:82
+#: src/cmdline/cmdline_why.cc:285 src/gtk/aptitude.glade:1906
+#: src/gtk/gui.cc:84 src/gtk/gui.cc:1144
#, fuzzy
msgid "Install"
msgstr "^Installer"
@@ -2125,50 +2138,50 @@ msgstr ""
msgid " ++ --> skipping, the dep is satisfied by the current version\n"
msgstr ""
-#: src/cmdline/cmdline_why.cc:526
+#: src/cmdline/cmdline_why.cc:529
msgid " ++ --> ENQUEUING\n"
msgstr ""
-#: src/cmdline/cmdline_why.cc:533
+#: src/cmdline/cmdline_why.cc:536
msgid " ++ --> skipping, version check failed\n"
msgstr ""
-#: src/cmdline/cmdline_why.cc:551
+#: src/cmdline/cmdline_why.cc:554
#, c-format
msgid " ++ --> ENQUEUING %s Provides %s\n"
msgstr ""
-#: src/cmdline/cmdline_why.cc:683
+#: src/cmdline/cmdline_why.cc:688
#, c-format
msgid "Starting search with parameters %ls\n"
msgstr ""
-#: src/cmdline/cmdline_why.cc:906
+#: src/cmdline/cmdline_why.cc:903
msgid "Skipping this solution, I've already seen it.\n"
msgstr ""
-#: src/cmdline/cmdline_why.cc:981
+#: src/cmdline/cmdline_why.cc:1005
#, fuzzy, c-format
msgid "Unable to find a reason to remove %s.\n"
msgstr "Klarer ikkje å finne ei løysing som kan brukast."
-#: src/cmdline/cmdline_why.cc:983
+#: src/cmdline/cmdline_why.cc:1007
#, fuzzy, c-format
msgid "Unable to find a reason to install %s.\n"
msgstr "Klarer ikkje å finne ei løysing som kan brukast."
-#: src/cmdline/cmdline_why.cc:1028 src/cmdline/cmdline_why.cc:1054
-#: src/cmdline/cmdline_why.cc:1109
+#: src/cmdline/cmdline_why.cc:1052 src/cmdline/cmdline_why.cc:1078
+#: src/cmdline/cmdline_why.cc:1133
#, fuzzy, c-format
msgid "No package named \"%s\" exists."
msgstr "Klarte ikkje finna nokon pakke som har namnet «%s»"
-#: src/cmdline/cmdline_why.cc:1058
+#: src/cmdline/cmdline_why.cc:1082
#, fuzzy
msgid "Unable to parse some match patterns."
msgstr "Klarer ikkje opna %s"
-#: src/cmdline/cmdline_why.cc:1082
+#: src/cmdline/cmdline_why.cc:1106
#, c-format
msgid "%s: this command requires at least one argument (the package to query)."
msgstr ""
@@ -2181,7 +2194,7 @@ msgstr "IKKJE TILFREDSSTILT"
msgid "UNAVAILABLE"
msgstr "IKKJE TILGJENGELEG"
-#: src/desc_render.cc:133 src/gtk/aptitude.glade:1114
+#: src/desc_render.cc:133 src/gtk/aptitude.glade:1110
#, fuzzy
msgid "Tags"
msgstr "Merke"
@@ -2215,11 +2228,11 @@ msgstr "Lasta ned %sB på %s (%sB/s)."
msgid "%n%nSome files were not downloaded successfully."
msgstr "%n%nNokre filer blei ikkje lasta ned."
-#: src/download_list.cc:98 src/download_list.cc:345 src/gtk/download.cc:340
+#: src/download_list.cc:98 src/download_list.cc:345 src/gtk/download.cc:389
msgid "Continue"
msgstr "Hald fram"
-#: src/download_list.cc:100 src/mine/cmine.cc:311 src/mine/cmine.cc:376
+#: src/download_list.cc:100 src/mine/cmine.cc:303 src/mine/cmine.cc:368
msgid "Cancel"
msgstr "Avbryt"
@@ -2247,12 +2260,12 @@ msgstr " [ %i%% ]"
msgid "Downloading... "
msgstr "Lastar ned ..."
-#: src/download_list.cc:340 src/gtk/download.cc:337
+#: src/download_list.cc:340 src/gtk/download.cc:386
#, c-format
msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
msgstr "Set inn disken merka med «%s» i stasjonen «%s»"
-#: src/download_list.cc:347 src/gtk/download.cc:341
+#: src/download_list.cc:347 src/gtk/download.cc:390
#, fuzzy
msgid "Abort"
msgstr "Avbryt.\n"
@@ -2413,8 +2426,31 @@ msgid ""
"you make to the states of packages will NOT be preserved!"
msgstr ""
-#: src/generic/apt/aptitude_resolver.cc:39
-msgid "Invalid hint: expected an action, but found nothing."
+#: src/generic/apt/aptitude_resolver.cc:170
+#, c-format
+msgid "Invalid hint \"%s\": expected an action, but found nothing."
+msgstr ""
+
+#: src/generic/apt/aptitude_resolver.cc:188
+#, c-format
+msgid "Invalid hint \"%s\": expected a target, but found nothing."
+msgstr ""
+
+#: src/generic/apt/aptitude_resolver.cc:213
+#, c-format
+msgid "Invalid hint \"%s\": invalid target: %s"
+msgstr ""
+
+#: src/generic/apt/aptitude_resolver.cc:231
+#, c-format
+msgid "Invalid hint \"%s\": trailing junk after the version."
+msgstr ""
+
+#: src/generic/apt/aptitude_resolver.cc:310
+#, c-format
+msgid ""
+"Invalid hint: the action \"%s\" should be \"approve\", \"reject\", or a "
+"number."
msgstr ""
#: src/generic/apt/download_install_manager.cc:60
@@ -2643,84 +2679,92 @@ msgstr ""
"\n"
"Logg ferdig.\n"
-#: src/generic/apt/matching/parse.cc:303
+#: src/generic/apt/matching/parse.cc:307
#, c-format
msgid "Unknown action type: %s"
msgstr "Ukjent handlingstype: %s"
-#: src/generic/apt/matching/parse.cc:344
+#: src/generic/apt/matching/parse.cc:348
#, c-format
msgid "Unterminated literal string after %s"
msgstr ""
-#: src/generic/apt/matching/parse.cc:441
+#: src/generic/apt/matching/parse.cc:445
#, c-format
msgid "Unknown priority %s"
msgstr "Ukjent prioritet %s"
-#: src/generic/apt/matching/parse.cc:460
+#: src/generic/apt/matching/parse.cc:464
#, c-format
msgid "Match pattern ends unexpectedly (expected '%c')."
msgstr ""
-#: src/generic/apt/matching/parse.cc:463
+#: src/generic/apt/matching/parse.cc:467
#, fuzzy, c-format
msgid "Expected '%c', got '%c'."
msgstr "Klarer ikkje opna %s"
-#: src/generic/apt/matching/parse.cc:800
-#: src/generic/apt/matching/parse.cc:1239
-#: src/generic/apt/matching/parse.cc:1279
+#: src/generic/apt/matching/parse.cc:807
+#: src/generic/apt/matching/parse.cc:1255
+#: src/generic/apt/matching/parse.cc:1295
#, c-format
msgid "Unknown dependency type: %s"
msgstr "Ukjend kravtype: %s"
-#: src/generic/apt/matching/parse.cc:853
+#: src/generic/apt/matching/parse.cc:860
#, fuzzy, c-format
msgid "Unknown term type: \"%s\"."
msgstr "Ukjent mønstertype: %c"
#. ForTranslators: Question marks ("?") are used as prefix for function names.
#. Leave the question marks attached to the string placeholders.
-#: src/generic/apt/matching/parse.cc:867 src/generic/apt/matching/parse.cc:876
+#: src/generic/apt/matching/parse.cc:874 src/generic/apt/matching/parse.cc:883
#, c-format
msgid ""
"The ?%s term must be used in a \"wide\" context (a top-level context, or a "
"context enclosed by ?%s)."
msgstr ""
-#: src/generic/apt/matching/parse.cc:1100
+#: src/generic/apt/matching/parse.cc:1113
msgid "Unmatched '('"
msgstr "Passa ikkje «(»"
-#: src/generic/apt/matching/parse.cc:1245
+#: src/generic/apt/matching/parse.cc:1261
msgid "Provides: cannot be broken"
msgstr ""
-#: src/generic/apt/matching/parse.cc:1301
+#: src/generic/apt/matching/parse.cc:1317
#, c-format
msgid "Unknown pattern type: %c"
msgstr "Ukjent mønstertype: %c"
-#: src/generic/apt/matching/parse.cc:1315
+#: src/generic/apt/matching/parse.cc:1334
#, fuzzy
msgid "Can't search for \"\""
msgstr "Søk etter: "
-#: src/generic/apt/matching/parse.cc:1342
+#: src/generic/apt/matching/parse.cc:1362
msgid "Unexpected empty expression"
msgstr "Uventa tomt uttrykk"
-#: src/generic/apt/matching/parse.cc:1371
+#: src/generic/apt/matching/parse.cc:1391
#, fuzzy, c-format
#| msgid "Badly formed expression"
msgid "Badly formed expression: expected '|', got '%c'"
msgstr "Dårleg utforma uttrykk"
-#: src/generic/apt/matching/parse.cc:1412
+#: src/generic/apt/matching/parse.cc:1438
msgid "Unexpected ')'"
msgstr "Uventa «)»"
+#: src/generic/apt/parse_dpkg_status.cc:72
+msgid "<aptitude: internal parse error: no apostrophe>"
+msgstr ""
+
+#: src/generic/apt/parse_dpkg_status.cc:80
+msgid "<aptitude: internal parse error: missing terminal apostrophe>"
+msgstr ""
+
#: src/generic/apt/pkg_acqfile.cc:50
#, c-format
msgid ""
@@ -2737,7 +2781,7 @@ msgid ""
msgstr ""
"Pakkeindeksfilene er øydelagde. Feltet «Filename:» manglar for pakken %s."
-#: src/generic/apt/pkg_changelog.cc:189 src/view_changelog.cc:270
+#: src/generic/apt/pkg_changelog.cc:215 src/view_changelog.cc:270
#, c-format
msgid "ChangeLog of %s"
msgstr "Endringslogg for %s"
@@ -2825,101 +2869,105 @@ msgstr ""
msgid "Unable to remove directory \"%s\""
msgstr "Klarer ikkje opna %s"
-#: src/gtk/aptitude.glade:17
+#: src/gtk/aptitude.glade:6
+msgid "Aptitude Package Manager"
+msgstr ""
+
+#: src/gtk/aptitude.glade:18
#, fuzzy
msgid "_File"
msgstr "Lukk"
-#: src/gtk/aptitude.glade:25 src/ui.cc:2219
+#: src/gtk/aptitude.glade:26 src/ui.cc:2219
msgid "Perform all pending installs and removals"
msgstr "Utfør installering og fjerning av pakkar"
-#: src/gtk/aptitude.glade:26
+#: src/gtk/aptitude.glade:27
#, fuzzy
#| msgid "^Install/remove packages"
-msgid "_Install/remove packages"
+msgid "_Install/Remove Packages"
msgstr "^Installer/fjern pakkar"
-#: src/gtk/aptitude.glade:39 src/ui.cc:2222
+#: src/gtk/aptitude.glade:42 src/ui.cc:2222
msgid "Check for new versions of packages"
msgstr "Sjå etter nye versjonar av pakkar"
-#: src/gtk/aptitude.glade:40
+#: src/gtk/aptitude.glade:43
#, fuzzy
#| msgid "^Update package list"
-msgid "_Update package list"
+msgid "_Update Package List"
msgstr "^Oppdater pakkeliste"
-#: src/gtk/aptitude.glade:58 src/ui.cc:2227
+#: src/gtk/aptitude.glade:63 src/ui.cc:2227
msgid "Mark all upgradable packages which are not held for upgrade"
msgstr "Marker alle pakkar som ikkje er haldt tilbake til oppgradering"
-#: src/gtk/aptitude.glade:59
+#: src/gtk/aptitude.glade:64
#, fuzzy
msgid "Mark Up_gradable"
msgstr "Marker ^Oppgraderbare"
-#: src/gtk/aptitude.glade:72 src/ui.cc:2232
+#: src/gtk/aptitude.glade:79 src/ui.cc:2232
msgid "Forget which packages are \"new\""
msgstr "Gløym kva for pakkar som er «nye»"
-#: src/gtk/aptitude.glade:73
+#: src/gtk/aptitude.glade:80
#, fuzzy
#| msgid "^Forget new packages"
-msgid "_Forget new packages"
+msgid "_Forget New Packages"
msgstr "^Gløym nye pakkar"
-#: src/gtk/aptitude.glade:86 src/ui.cc:2236
+#: src/gtk/aptitude.glade:94 src/ui.cc:2236
#, fuzzy
msgid "Cancel all pending installations, removals, holds, and upgrades."
msgstr "Utfør installering og fjerning av pakkar"
-#: src/gtk/aptitude.glade:87
+#: src/gtk/aptitude.glade:95
#, fuzzy
-msgid "Canc_el pending actions"
+msgid "Canc_el Pending Actions"
msgstr "Pakkar som krev %s"
-#: src/gtk/aptitude.glade:100 src/ui.cc:2240
+#: src/gtk/aptitude.glade:109 src/ui.cc:2240
msgid "Delete package files which were previously downloaded"
msgstr "Slett tidlegare nedlasta pakkefiler"
-#: src/gtk/aptitude.glade:101
+#: src/gtk/aptitude.glade:110
#, fuzzy
#| msgid "^Clean package cache"
-msgid "_Clean package cache"
+msgid "C_lean Package Cache"
msgstr "^Reinsk pakkemellomlageret"
-#: src/gtk/aptitude.glade:114 src/ui.cc:2244
+#: src/gtk/aptitude.glade:124 src/ui.cc:2244
msgid "Delete package files which can no longer be downloaded"
msgstr "Slett pakkefiler som ikkje kan hentast lenger"
-#: src/gtk/aptitude.glade:115
+#: src/gtk/aptitude.glade:125
#, fuzzy
#| msgid "Clean ^obsolete files"
-msgid "Clean _obsolete files"
+msgid "Clean _Obsolete Files"
msgstr "Slett ^forelda filer"
-#: src/gtk/aptitude.glade:133 src/ui.cc:2251
+#: src/gtk/aptitude.glade:144 src/ui.cc:2251
msgid "Reload the package cache"
msgstr "Lastar pakkelagert inn på ny"
-#: src/gtk/aptitude.glade:134
+#: src/gtk/aptitude.glade:145
#, fuzzy
#| msgid "^Reload package cache"
-msgid "_Reload package cache"
+msgid "_Reload Package Cache"
msgstr "^Last inn igjen pakkemellomlageret"
-#: src/gtk/aptitude.glade:147 src/ui.cc:1700 src/ui.cc:2256
+#: src/gtk/aptitude.glade:159 src/ui.cc:1700 src/ui.cc:2256
msgid "Waste time trying to find mines"
msgstr "Bruke tida på å finna miner"
-#: src/gtk/aptitude.glade:148
+#: src/gtk/aptitude.glade:160
#, fuzzy
#| msgid "^Play Minesweeper"
msgid "_Play Minesweeper"
msgstr "^Spel minesveipar"
-#: src/gtk/aptitude.glade:166 src/ui.cc:2261
+#: src/gtk/aptitude.glade:179 src/ui.cc:2261
msgid ""
"Run 'su' to become root; this will restart the program, but your settings "
"will be preserved"
@@ -2927,677 +2975,859 @@ msgstr ""
"Køyrer «su» for å bli root. Dette vil starta programmet på ny, men "
"instillingane vil bli tatt vare på."
-#: src/gtk/aptitude.glade:167
+#: src/gtk/aptitude.glade:180
#, fuzzy
#| msgid "Become root"
-msgid "_Become root"
+msgid "_Become Root"
msgstr "Bli root"
-#: src/gtk/aptitude.glade:180 src/ui.cc:2264
+#: src/gtk/aptitude.glade:194 src/ui.cc:2264
msgid "Exit the program"
msgstr "Avsluttar programmet"
-#: src/gtk/aptitude.glade:181
+#: src/gtk/aptitude.glade:195
#, fuzzy
#| msgid "^Quit"
msgid "_Quit"
msgstr "^Avslutt"
-#: src/gtk/aptitude.glade:197
+#: src/gtk/aptitude.glade:212
msgid "E_dit"
msgstr ""
-#: src/gtk/aptitude.glade:205 src/ui.cc:2271
+#: src/gtk/aptitude.glade:220 src/ui.cc:2271
msgid "Undo the last package operation or group of operations"
msgstr "Angrar den siste pakkehandlinga eller gruppe av handlingar"
-#: src/gtk/aptitude.glade:206 src/ui.cc:2270 src/ui.cc:2650
-msgid "Undo"
-msgstr "Angra"
+#: src/gtk/aptitude.glade:221
+msgid "gtk-undo"
+msgstr ""
-#: src/gtk/aptitude.glade:224
+#: src/gtk/aptitude.glade:234
msgid "gtk-cut"
msgstr ""
-#: src/gtk/aptitude.glade:232
+#: src/gtk/aptitude.glade:242
msgid "gtk-copy"
msgstr ""
-#: src/gtk/aptitude.glade:240
+#: src/gtk/aptitude.glade:250
msgid "gtk-paste"
msgstr ""
-#: src/gtk/aptitude.glade:248
+#: src/gtk/aptitude.glade:258
#, fuzzy
#| msgid "delete"
msgid "gtk-delete"
msgstr "slett"
-#: src/gtk/aptitude.glade:260
+#: src/gtk/aptitude.glade:270
#, fuzzy
#| msgid "Package"
msgid "_Package"
msgstr "Pakke"
-#: src/gtk/aptitude.glade:268 src/ui.cc:2280
-msgid "Flag the currently selected package for installation or upgrade"
-msgstr "Merkjer den valde pakke for installasjon eller oppgradering"
-
-#: src/gtk/aptitude.glade:269
-#, fuzzy
-msgid "_Install"
-msgstr "^Installer"
-
-#: src/gtk/aptitude.glade:282 src/ui.cc:2284
-msgid "Flag the currently selected package for removal"
-msgstr "Merkjer den valde pakke for fjerning"
-
-#: src/gtk/aptitude.glade:283
-#, fuzzy
-msgid "_Remove"
-msgstr "^Fjern"
-
-#: src/gtk/aptitude.glade:296 src/ui.cc:2288
-msgid ""
-"Flag the currently selected package and its configuration files for removal"
-msgstr "Merkjer den valde pakken for fjerning av programfiler og oppsettsfiler"
-
-#: src/gtk/aptitude.glade:297
-#, fuzzy
-#| msgid "^Purge"
-msgid "_Purge"
-msgstr "^Reinsk ut"
-
-#: src/gtk/aptitude.glade:310
-msgid ""
-"Cancel any pending installation, upgrade, or removal of the currently "
-"selected package, and remove any hold that was set on the package"
-msgstr ""
-
-#: src/gtk/aptitude.glade:311
-#, fuzzy
-msgid "_Keep"
-msgstr "^Ta vare på"
-
-#: src/gtk/aptitude.glade:324 src/ui.cc:2296
-msgid ""
-"Cancel any action on the selected package, and protect it from future "
-"upgrades"
-msgstr ""
-"Avbryt handlinar på den valde pakken og vernar han mot framtidige "
-"oppgraderingar."
-
-#: src/gtk/aptitude.glade:325
-#, fuzzy
-msgid "_Hold"
-msgstr "^Hald tilbake"
-
-#: src/gtk/aptitude.glade:338 src/ui.cc:2300
-msgid ""
-"Mark the selected package as having been automatically installed; it will "
-"automatically be removed if no other packages depend on it"
-msgstr ""
-"Merk den valde pakken som om han er automatisk installert. Pakken vil "
-"automatisk bli fjerna viss ingen andre pakkar treng han."
-
-#: src/gtk/aptitude.glade:339
+#: src/gtk/aptitude.glade:282
#, fuzzy
-#| msgid "Mark ^Auto"
-msgid "Mark _Auto"
-msgstr "Merk ^Auto"
+#| msgid "Views"
+msgid "_View"
+msgstr "Visingar"
-#: src/gtk/aptitude.glade:352 src/ui.cc:2304
-msgid ""
-"Mark the selected package as having been manually installed; it will not be "
-"removed unless you manually remove it"
+#: src/gtk/aptitude.glade:290
+msgid "Change which columns are visible in the currently active view."
msgstr ""
-"Merk den valde pakken som om han var manuelt installert. Pakken vil ikkje "
-"bli fjerna viss du ikkje fjernar han manuelt."
-#: src/gtk/aptitude.glade:353
-#, fuzzy
-#| msgid "Mark ^Manual"
-msgid "Mark _Manual"
-msgstr "Merk ^Manuell"
-
-#: src/gtk/aptitude.glade:366 src/ui.cc:2308
-msgid ""
-"Forbid the candidate version of the selected package from being installed; "
-"newer versions of the package will be installed as usual"
+#: src/gtk/aptitude.glade:291
+msgid "_Edit Columns..."
msgstr ""
-"Forby denne versjonen av den valde pakken frå å bli installert.\n"
-"Nyare versjonar av pakken vil bli installert som vanleg"
-#: src/gtk/aptitude.glade:367
-#, fuzzy
-#| msgid "^Forbid Version"
-msgid "_Forbid Version"
-msgstr "^Forby versjon"
-
-#: src/gtk/aptitude.glade:384
-#, fuzzy
-#| msgid "Views"
-msgid "_Views"
-msgstr "Visingar"
-
-#: src/gtk/aptitude.glade:392
+#: src/gtk/aptitude.glade:310
msgid ""
"View errors that have occurred in the apt system since the program was "
"started."
msgstr ""
-#: src/gtk/aptitude.glade:393
-msgid "View apt _errors"
+#: src/gtk/aptitude.glade:311
+msgid "View Apt _Errors"
msgstr ""
-#: src/gtk/aptitude.glade:400
+#: src/gtk/aptitude.glade:325
msgid "Find chains of dependencies linking one package to another."
msgstr ""
-#: src/gtk/aptitude.glade:401
+#: src/gtk/aptitude.glade:326
#, fuzzy
msgid "Find _Dependency Chains"
msgstr "^Handsaming av pakkekrav"
-#: src/gtk/aptitude.glade:412
+#: src/gtk/aptitude.glade:344
#, fuzzy
#| msgid "Help"
msgid "_Help"
msgstr "Hjelp"
-#: src/gtk/aptitude.glade:420
+#: src/gtk/aptitude.glade:352
msgid "gtk-about"
msgstr ""
-#: src/gtk/aptitude.glade:440 src/gtk/aptitude.glade:723
+#: src/gtk/aptitude.glade:372 src/gtk/aptitude.glade:671
+#: src/gtk/dashboardtab.cc:234 src/gtk/gui.cc:1320 src/gtk/gui.cc:1511
msgid "Dashboard"
msgstr ""
-#: src/gtk/aptitude.glade:459
+#: src/gtk/aptitude.glade:391
#, fuzzy
#| msgid "List Update"
msgid "Update"
msgstr "Listeoppdatering"
-#: src/gtk/aptitude.glade:469 src/gtk/aptitude.glade:890 src/ui.cc:837
-#: src/ui.cc:839 src/ui.cc:884 src/ui.cc:886 src/ui.cc:912 src/ui.cc:914
-#: src/ui.cc:935 src/ui.cc:937
+#: src/gtk/aptitude.glade:401 src/gtk/aptitude.glade:883 src/gtk/gui.cc:1050
+#: src/ui.cc:837 src/ui.cc:839 src/ui.cc:884 src/ui.cc:886 src/ui.cc:912
+#: src/ui.cc:914 src/ui.cc:935 src/ui.cc:937
msgid "Packages"
msgstr "Pakkar"
-#: src/gtk/aptitude.glade:479 src/gtk/aptitude.glade:1195 src/ui.cc:1336
+#: src/gtk/aptitude.glade:411 src/gtk/aptitude.glade:1191 src/gtk/gui.cc:755
+#: src/gtk/previewtab.cc:116 src/ui.cc:1336
msgid "Preview"
msgstr "Førehandsvising"
-#: src/gtk/aptitude.glade:489 src/gtk/aptitude.glade:1289 src/ui.cc:2652
+#: src/gtk/aptitude.glade:421 src/gtk/aptitude.glade:1352 src/gtk/gui.cc:750
+#: src/ui.cc:2652
#, fuzzy
msgid "Resolver"
msgstr "^Fjern"
-#: src/gtk/aptitude.glade:499
+#: src/gtk/aptitude.glade:431
#, fuzzy
msgid "Install/Remove"
msgstr "installert"
-#: src/gtk/aptitude.glade:529 src/gtk/aptitude.glade:798
-#: src/gtk/aptitude.glade:1352 src/gtk/aptitude.glade:1445
+#: src/gtk/aptitude.glade:462 src/gtk/aptitude.glade:748
+#: src/gtk/aptitude.glade:1418 src/gtk/aptitude.glade:1555
#, fuzzy
#| msgid "Search"
msgid "Search:"
msgstr "Søk"
-#: src/gtk/aptitude.glade:549 src/gtk/aptitude.glade:818
-#: src/gtk/aptitude.glade:1372 src/gtk/aptitude.glade:1465
+#: src/gtk/aptitude.glade:482 src/gtk/aptitude.glade:768
+#: src/gtk/aptitude.glade:1438 src/gtk/aptitude.glade:1575
msgid "gtk-find"
msgstr ""
-#: src/gtk/aptitude.glade:632
+#: src/gtk/aptitude.glade:500 src/gtk/aptitude.glade:786
+#: src/gtk/aptitude.glade:1381 src/gtk/aptitude.glade:1456
+#: src/gtk/aptitude.glade:1593
+#, fuzzy
+#| msgid "Err "
+msgid "Errors"
+msgstr "Feil "
+
+#: src/gtk/aptitude.glade:580
#, fuzzy
msgid "Upgrade Summary"
msgstr "oppgrader"
-#: src/gtk/aptitude.glade:661
+#: src/gtk/aptitude.glade:609
#, fuzzy
#| msgid "Source Package: "
msgid "Selected Package"
msgstr "Kjeldepakke: "
-#: src/gtk/aptitude.glade:689 src/gtk/gui.cc:84
+#: src/gtk/aptitude.glade:637 src/gtk/gui.cc:86 src/gtk/gui.cc:1135
#, fuzzy
msgid "Upgrade"
msgstr "oppgrader"
-#: src/gtk/aptitude.glade:706
+#: src/gtk/aptitude.glade:654
msgid "<b>Available Upgrades:</b>"
msgstr ""
-#: src/gtk/aptitude.glade:754
+#: src/gtk/aptitude.glade:702 src/gtk/tab.cc:64
#, fuzzy
#| msgid "[Downloaded]"
msgid "Download"
msgstr "[Nedlasta]"
-#: src/gtk/aptitude.glade:954
+#: src/gtk/aptitude.glade:803 src/gtk/aptitude.glade:1473
+#: src/gtk/aptitude.glade:1610
+msgid "Show "
+msgstr ""
+
+#: src/gtk/aptitude.glade:949
msgid "<span size=\"xx-large\">Versions:</span>"
msgstr ""
-#: src/gtk/aptitude.glade:1015
+#: src/gtk/aptitude.glade:1011
#, fuzzy
#| msgid "Dependencies of %s"
msgid "Dependencies"
msgstr "Pakkekrav for %s"
-#: src/gtk/aptitude.glade:1045
+#: src/gtk/aptitude.glade:1041
#, fuzzy
#| msgid "^Changelog"
msgid "Changelog"
msgstr "^Endringslogg"
-#: src/gtk/aptitude.glade:1074
+#: src/gtk/aptitude.glade:1070
#, fuzzy
msgid "Files"
msgstr "Lukk"
-#: src/gtk/aptitude.glade:1085
+#: src/gtk/aptitude.glade:1081
msgid "popcon"
msgstr ""
-#: src/gtk/aptitude.glade:1094
+#: src/gtk/aptitude.glade:1090
msgid "Popcon"
msgstr ""
-#: src/gtk/aptitude.glade:1105
+#: src/gtk/aptitude.glade:1101
#, fuzzy
msgid "tags"
msgstr "Merke"
-#: src/gtk/aptitude.glade:1136
+#: src/gtk/aptitude.glade:1132 src/gtk/info.cc:727
#, fuzzy
#| msgid "no"
msgid "Info"
msgstr "ingen"
-#: src/gtk/aptitude.glade:1227 src/gtk/download.cc:200
+#: src/gtk/aptitude.glade:1219
+msgid ""
+"Arrange the actions of the current solution so that actions that are of the "
+"same type are placed together (for instance, all the actions that remove "
+"packages).\n"
+"\n"
+"This is the default view mode."
+msgstr ""
+
+#: src/gtk/aptitude.glade:1222
+#, fuzzy
+#| msgid "Unknown action type: %s"
+msgid "Group by action type"
+msgstr "Ukjent handlingstype: %s"
+
+#: src/gtk/aptitude.glade:1235
+msgid ""
+"Show the order in which the actions in the current solution were performed "
+"and the dependency that triggered each action."
+msgstr ""
+
+#: src/gtk/aptitude.glade:1236
+msgid "Show an explanation of the solution"
+msgstr ""
+
+#: src/gtk/aptitude.glade:1253
+msgid "<b>View Mode</b>"
+msgstr ""
+
+#: src/gtk/aptitude.glade:1290 src/gtk/download.cc:203
+#: src/gtk/entityview.cc:551
#, fuzzy
#| msgid "State"
msgid "Status"
msgstr "Tilstand"
-#: src/gtk/aptitude.glade:1236
+#: src/gtk/aptitude.glade:1299
msgid "gtk-go-back"
msgstr ""
-#: src/gtk/aptitude.glade:1251
+#: src/gtk/aptitude.glade:1314
msgid "gtk-go-forward"
msgstr ""
-#: src/gtk/aptitude.glade:1266
+#: src/gtk/aptitude.glade:1329
msgid "gtk-apply"
msgstr ""
-#: src/gtk/aptitude.glade:1318
-#, fuzzy
-#| msgid "Err "
-msgid "Errors"
-msgstr "Feil "
-
-#: src/gtk/aptitude.glade:1413
+#: src/gtk/aptitude.glade:1521
msgid "<b>Start at these packages:</b>"
msgstr ""
-#: src/gtk/aptitude.glade:1506
+#: src/gtk/aptitude.glade:1658
msgid "<b>End at these packages:</b>"
msgstr ""
-#: src/gtk/aptitude.glade:1544
+#: src/gtk/aptitude.glade:1705
#, fuzzy
msgid "Dependency Chain"
msgstr "^Handsaming av pakkekrav"
-#: src/gtk/aptitude.glade:1561
+#: src/gtk/aptitude.glade:1723
msgid "A terminal running dpkg will appear here."
msgstr ""
-#: src/gtk/aptitude.glade:1572
+#: src/gtk/aptitude.glade:1734
msgid "Applying Changes"
msgstr ""
-#: src/gtk/aptitude.glade:1643 src/gtk/gui.cc:86
+#: src/gtk/aptitude.glade:1747
+msgid ""
+"Placeholder label for the explanation that two conffiles are being "
+"compared.\n"
+"This text should not appear in the program."
+msgstr ""
+
+#: src/gtk/aptitude.glade:1773
+msgid "View the differences\t"
+msgstr ""
+
+#: src/gtk/aptitude.glade:1799
+msgid ""
+"Do you want to apply these changes?\n"
+"You can also modify the files by hand, then click \"No\"."
+msgstr ""
+
+#: src/gtk/aptitude.glade:1811
+#, fuzzy
+#| msgid "yes"
+msgid "gtk-yes"
+msgstr "ja"
+
+#: src/gtk/aptitude.glade:1821
+msgid "gtk-no"
+msgstr ""
+
+#: src/gtk/aptitude.glade:1847
+#, fuzzy
+msgid "Conffile Diff"
+msgstr "oppsettsfiler"
+
+#: src/gtk/aptitude.glade:1919 src/gtk/gui.cc:88 src/gtk/gui.cc:1151
#, fuzzy
msgid "Remove"
msgstr "^Fjern"
-#: src/gtk/aptitude.glade:1656
+#: src/gtk/aptitude.glade:1932 src/gtk/gui.cc:1156
#, fuzzy
#| msgid "^Purge"
msgid "Purge"
msgstr "^Reinsk ut"
-#: src/gtk/aptitude.glade:1669
+#: src/gtk/aptitude.glade:1945 src/gtk/gui.cc:1161
#, fuzzy
msgid "Keep"
msgstr "^Ta vare på"
-#: src/gtk/aptitude.glade:1682
+#: src/gtk/aptitude.glade:1958 src/gtk/gui.cc:1166
#, fuzzy
msgid "Hold"
msgstr "^Hald tilbake"
-#: src/gtk/changelog.cc:251
+#: src/gtk/aptitude.glade:1971
+msgid "Edit Columns..."
+msgstr ""
+
+#: src/gtk/aptitude.glade:1984
+msgid "Dummy label (will be replaced at runtime)."
+msgstr ""
+
+#: src/gtk/aptitude.glade:2016
+#, fuzzy
+#| msgid "Remove the filter from the package list"
+msgid "Make this the default for new package lists."
+msgstr "Fjernar filteret frå pakkelista"
+
+#: src/gtk/aptitude.glade:2032
+#, fuzzy
+#| msgid "Apply a filter to the package list"
+msgid "Apply these settings to all active package lists."
+msgstr "Bruk eit filter på pakkelista"
+
+#: src/gtk/aptitude.glade:2050
+#, fuzzy
+#| msgid "delete"
+msgid "gtk-close"
+msgstr "slett"
+
+#: src/gtk/changelog.cc:276
msgid "The changelog is empty."
msgstr ""
-#: src/gtk/changelog.cc:253
+#: src/gtk/changelog.cc:278
msgid ""
"No new changelog entries; it looks like you installed a locally compiled "
"version of this package."
msgstr ""
-#: src/gtk/changelog.cc:255
+#: src/gtk/changelog.cc:280
msgid ""
"No new changelog entries; this is likely due to a binary-only upload of this "
"package."
msgstr ""
-#: src/gtk/changelog.cc:384 src/view_changelog.cc:369
-msgid "You can only view changelogs of official Debian packages."
+#: src/gtk/changelog.cc:376
+#, fuzzy, c-format
+#| msgid "URL to use to download changelogs"
+msgid "Failed to download the changelog: %s"
+msgstr "Nettadresse som endringsloggar skal hentast frå"
+
+#: src/gtk/changelog.cc:445
+#, fuzzy, c-format
+#| msgid "You can only view changelogs of official Debian packages."
+msgid ""
+"You can only view changelogs of official Debian packages; the origin of %s "
+"is unknown."
msgstr "Du kan berre lesa endringsloggar for offisielle debianpakkar."
-#: src/gtk/changelog.cc:403
+#: src/gtk/changelog.cc:449
+#, fuzzy, c-format
+#| msgid "You can only view changelogs of official Debian packages."
+msgid ""
+"You can only view changelogs of official Debian packages; %s is from %s."
+msgstr "Du kan berre lesa endringsloggar for offisielle debianpakkar."
+
+#: src/gtk/changelog.cc:469
#, fuzzy
#| msgid "Downloading Changelog"
msgid "Downloading changelog; please wait..."
msgstr "Lastar ned endringslogg"
-#: src/gtk/changelog.cc:447
+#: src/gtk/changelog.cc:528
#, fuzzy
#| msgid "Downloading Changelog"
msgid "Downloading changelogs"
msgstr "Lastar ned endringslogg"
-#: src/gtk/dashboardtab.cc:87
+#: src/gtk/dashboardtab.cc:99
#, fuzzy
#| msgid "URL to use to download changelogs"
msgid "Preparing to download changelogs"
msgstr "Nettadresse som endringsloggar skal hentast frå"
-#: src/gtk/dashboardtab.cc:172
+#: src/gtk/dashboardtab.cc:185
msgid "Available upgrades:"
msgstr ""
-#: src/gtk/dashboardtab.cc:182
+#: src/gtk/dashboardtab.cc:195
#, fuzzy, c-format
msgid "%d available upgrade:"
msgid_plural "%d available upgrades:"
msgstr[0] "%d oppgraderingar"
msgstr[1] "%d oppgraderingar"
-#: src/gtk/dependency_chains_tab.cc:179
+#: src/gtk/dashboardtab.cc:302
+#, c-format
+msgid ""
+"The package %s has no candidate version and will not be upgraded; unable to "
+"show its changelog."
+msgstr ""
+
+#: src/gtk/dependency_chains_tab.cc:77
+#, fuzzy
+msgid "Find dependency chains: start"
+msgstr "^Handsaming av pakkekrav"
+
+#: src/gtk/dependency_chains_tab.cc:79
+#, fuzzy
+msgid "Find dependency chains: end"
+msgstr "^Handsaming av pakkekrav"
+
+#: src/gtk/dependency_chains_tab.cc:81
+#, fuzzy
+msgid "Find dependency chains: results"
+msgstr "^Handsaming av pakkekrav"
+
+#: src/gtk/dependency_chains_tab.cc:220
msgid "Select one or more starting packages and an ending package to search."
msgstr ""
-#: src/gtk/dependency_chains_tab.cc:239
+#: src/gtk/dependency_chains_tab.cc:275
#, fuzzy
msgid "No dependency chain found."
msgstr "^Handsaming av pakkekrav"
-#: src/gtk/download.cc:127
+#: src/gtk/download.cc:129
msgid "Ignored"
msgstr ""
-#: src/gtk/download.cc:134
+#: src/gtk/download.cc:136
#, fuzzy
msgid "Failed"
msgstr "Lukk"
-#: src/gtk/download.cc:143
+#: src/gtk/download.cc:145
#, fuzzy
#| msgid "Deleting downloaded files"
msgid "Already downloaded"
msgstr "Slettar nedlasta filer"
-#: src/gtk/download.cc:150
+#: src/gtk/download.cc:152
#, fuzzy
#| msgid "death"
msgid "Fetch"
msgstr "død"
-#: src/gtk/download.cc:156
+#: src/gtk/download.cc:158
#, fuzzy
#| msgid "none"
msgid "Done"
msgstr "ingen"
-#: src/gtk/download.cc:199
+#: src/gtk/download.cc:202
msgid "URI"
msgstr ""
-#: src/gtk/download.cc:205
+#: src/gtk/download.cc:208
#, fuzzy
#| msgid "Total Progress: "
msgid "Progress"
msgstr "Totalt utført: "
-#: src/gtk/download.cc:212
+#: src/gtk/download.cc:216
#, fuzzy
#| msgid "Description"
msgid "Short Description"
msgstr "Skildring"
-#: src/gtk/download.cc:213 src/pkg_columnizer.cc:93 src/pkg_view.cc:671
+#: src/gtk/download.cc:217 src/gtk/entityview.cc:397 src/pkg_columnizer.cc:93
+#: src/pkg_view.cc:671
msgid "Description"
msgstr "Skildring"
-#: src/gtk/download.cc:297
+#: src/gtk/download.cc:264
+#, fuzzy
+#| msgid "Cleaning while a download is in progress is not allowed"
+msgid "The download is still in progress. Should it be canceled?"
+msgstr "Å vaske medan ei nedlasting held på er ikkje tillatt!"
+
+#: src/gtk/download.cc:340 src/gtk/gui.cc:568
#, fuzzy
#| msgid "View next display"
msgid "View Details"
msgstr "Vis neste skjermbilete"
-#: src/gtk/download.cc:335
+#: src/gtk/download.cc:384
msgid "Change media"
msgstr ""
-#: src/gtk/download.cc:356
+#: src/gtk/download.cc:405
#, c-format
msgid "%s: %sB/s"
msgstr ""
-#: src/gtk/download.cc:376
+#: src/gtk/download.cc:425
#, c-format
msgid "%s: %lu/%lu, %sB/s"
msgstr ""
-#: src/gtk/download.cc:382
+#: src/gtk/download.cc:431
#, fuzzy, c-format
msgid "%s: %lu/%lu, stalled"
msgstr "%B%s%b vil bli installert."
-#: src/gtk/download.cc:403
+#: src/gtk/download.cc:452
#, fuzzy, c-format
#| msgid " [ %i%% ] (%sB/s, %s remaining)"
msgid "%s: %sB of %sB at %sB/s, %s remaining"
msgstr " [ %i%% ] (%sB/s, %s igjen)"
-#: src/gtk/download.cc:410
+#: src/gtk/download.cc:459
#, fuzzy, c-format
#| msgid "but %s is to be installed."
msgid "%s: %sB of %sB, stalled"
msgstr "men %s blir installert."
-#: src/gtk/download.cc:439
+#: src/gtk/download.cc:488
msgid "Completed"
msgstr ""
-#: src/gtk/download.cc:441
+#: src/gtk/download.cc:490
msgid "Completed with errors"
msgstr ""
-#: src/gtk/dpkg_terminal.cc:83
+#: src/gtk/dpkg_terminal.cc:142
#, fuzzy, c-format
msgid "%s: Unable to create a Unix-domain socket: %s"
msgstr "Klarer ikkje opna %s"
-#: src/gtk/dpkg_terminal.cc:263
+#: src/gtk/dpkg_terminal.cc:307
+#, c-format
+msgid "[%s] dpkg process starting...\n"
+msgstr ""
+
+#: src/gtk/dpkg_terminal.cc:342
+#, c-format
+msgid "[%s] dpkg process complete.\n"
+msgstr ""
+
+#: src/gtk/dpkg_terminal.cc:345
+#, c-format
+msgid "[%s] dpkg process failed.\n"
+msgstr ""
+
+#: src/gtk/dpkg_terminal.cc:348
+#, c-format
+msgid "[%s] dpkg process complete; there are more packages left to process.\n"
+msgstr ""
+
+#: src/gtk/dpkg_terminal.cc:366
#, c-format
msgid "%s: Unable to accept a connection from the subprocess: %s"
msgstr ""
-#: src/gtk/entityview.cc:192 src/gtk/resolver.cc:155
+#: src/gtk/entityview.cc:381 src/gtk/entityview.cc:575 src/gtk/resolver.cc:159
#, fuzzy
#| msgid "ProgName"
msgid "Name"
msgstr "ProgNamn"
-#: src/gtk/entityview.cc:207
+#: src/gtk/entityview.cc:385
+msgid "Visible?"
+msgstr ""
+
+#: src/gtk/entityview.cc:411
+#, fuzzy, c-format
+#| msgid "Could not open file \"%s\""
+msgid "Columns of \"%s\":"
+msgstr "Klarte ikkje opna fila «%s»"
+
+#: src/gtk/entityview.cc:412
+#, c-format
+msgid "Editing the columns of \"%s\""
+msgstr ""
+
+#: src/gtk/entityview.cc:552
+msgid "Icons showing the current and future status of this package."
+msgstr ""
+
+#: src/gtk/entityview.cc:564 src/pkg_columnizer.cc:102
+msgid "Auto"
+msgstr "Auto"
+
+#: src/gtk/entityview.cc:570
+#, fuzzy
+#| msgid "'&M' to mark packages as automatically installed"
+msgid "Whether the package is automatically installed."
+msgstr "&M for å merkje pakkar som automatisk installerte"
+
+#: src/gtk/entityview.cc:576
+#, fuzzy
+#| msgid "Cancel any action on the selected package"
+msgid "The name and description of the package."
+msgstr "Avbryt handlingane på den valde pakken"
+
+#: src/gtk/entityview.cc:591
#, fuzzy
#| msgid "Version: "
msgid "Version"
msgstr "Versjon: "
-#: src/gtk/gui.cc:71
+#: src/gtk/entityview.cc:592
+#, fuzzy
+#| msgid "Check for new versions of packages"
+msgid "The version number of the package."
+msgstr "Sjå etter nye versjonar av pakkar"
+
+#: src/gtk/entityview.cc:607
+msgid "The package archives that contain this version."
+msgstr ""
+
+#: src/gtk/filesview.cc:293
+#, c-format
+msgid ""
+"This file list pertains to the currently installed version \"%s\", not the "
+"selected version \"%s\"."
+msgstr ""
+
+#: src/gtk/filesview.cc:307
+msgid "Files list is only available for installed packages."
+msgstr ""
+
+#: src/gtk/gui.cc:73
#, fuzzy
#| msgid "not installed"
msgid "Not installed"
msgstr "ikkje installert"
-#: src/gtk/gui.cc:72
+#: src/gtk/gui.cc:74
#, fuzzy
msgid "Virtual"
msgstr "virtuell"
-#: src/gtk/gui.cc:73
+#: src/gtk/gui.cc:75
#, fuzzy
#| msgid "unpacked"
msgid "Unpacked"
msgstr "ikkje-pakka"
-#: src/gtk/gui.cc:74
+#: src/gtk/gui.cc:76
#, fuzzy
#| msgid "half-config"
msgid "Half-configured"
msgstr "halv.-oppsett"
-#: src/gtk/gui.cc:75
+#: src/gtk/gui.cc:77
#, fuzzy
#| msgid "half-install"
msgid "Half-installed"
msgstr "halv.-inst"
-#: src/gtk/gui.cc:76
+#: src/gtk/gui.cc:78
#, fuzzy
#| msgid "not installed (configuration files remain)"
msgid "Configuration files and data remain"
msgstr "ikkje installert (oppsettsfiler gjenstår)"
-#: src/gtk/gui.cc:77
+#: src/gtk/gui.cc:79
msgid "Triggers awaited"
msgstr ""
-#: src/gtk/gui.cc:78
+#: src/gtk/gui.cc:80
msgid "Triggers pending"
msgstr ""
-#: src/gtk/gui.cc:79
+#: src/gtk/gui.cc:81
#, fuzzy
msgid "Installed"
msgstr "installert"
-#: src/gtk/gui.cc:83
+#: src/gtk/gui.cc:85
#, fuzzy
msgid "Reinstall"
msgstr "installer på ny"
-#: src/gtk/gui.cc:85
+#: src/gtk/gui.cc:87 src/gtk/gui.cc:1141
#, fuzzy
msgid "Downgrade"
msgstr "nedgradert"
-#: src/gtk/gui.cc:87
+#: src/gtk/gui.cc:89
msgid "Remove and purge configuration/data"
msgstr ""
-#: src/gtk/gui.cc:88
-msgid "Hold (don't uprgade)"
-msgstr ""
-
#: src/gtk/gui.cc:90
#, fuzzy
+msgid "Hold (don't upgrade)"
+msgstr "%d oppgraderingar"
+
+#: src/gtk/gui.cc:92
+#, fuzzy
msgid "Unsatisfied dependencies"
msgstr "Klarer ikkje løysa pakkekrav."
-#: src/gtk/gui.cc:201
+#: src/gtk/gui.cc:203
msgid "Checking for updates"
msgstr ""
-#: src/gtk/gui.cc:217
+#: src/gtk/gui.cc:219
msgid "Insufficient privileges."
msgstr ""
-#: src/gtk/gui.cc:220
+#: src/gtk/gui.cc:222
#, fuzzy
#| msgid "Apply a filter to the package list"
msgid "You must be root to update the package lists."
msgstr "Bruk eit filter på pakkelista"
-#: src/gtk/gui.cc:228 src/gtk/gui.cc:299
+#: src/gtk/gui.cc:230 src/gtk/gui.cc:670
#, fuzzy
msgid "Download already running."
msgstr "Lastar ned ..."
-#: src/gtk/gui.cc:230 src/gtk/gui.cc:301 src/ui.cc:1462 src/ui.cc:1695
+#: src/gtk/gui.cc:232 src/gtk/gui.cc:672 src/ui.cc:1462 src/ui.cc:1695
msgid "A package-list update or install run is already taking place."
msgstr "Ei oppdatering av pakkelista eller ei installering er allereie igang."
-#: src/gtk/gui.cc:315 src/ui.cc:1206
-msgid "Downloading packages"
-msgstr "Lastar ned pakkar"
+#: src/gtk/gui.cc:291
+#, fuzzy, c-format
+#| msgid "List Update"
+msgid "Update %s?"
+msgstr "Listeoppdatering"
+
+#: src/gtk/gui.cc:317
+#, fuzzy, c-format
+#| msgid "Unable to replace %s with new configuration file"
+msgid ""
+"Replace configuration file\n"
+"'%s'?"
+msgstr "Klarer ikkje byta ut %s med ny oppsettsfil"
+
+#: src/gtk/gui.cc:321
+#, c-format
+msgid ""
+"The configuration file %s was modified (by you or by a script). An updated "
+"version is shipped in this package. If you want to keep your current "
+"version, choose 'No'. Do you want to replace the current file and install "
+"the new package maintainers version? "
+msgstr ""
+
+#: src/gtk/gui.cc:349
+#, c-format
+msgid "Comparing %s to %s..."
+msgstr ""
+
+#: src/gtk/gui.cc:508
+msgid ""
+"Interrupting this process could leave your system in an inconsistent state. "
+"Are you sure you want to stop applying your changes?"
+msgstr ""
-#: src/gtk/gui.cc:379
+#: src/gtk/gui.cc:532
#, fuzzy
-msgid "Resolver:"
-msgstr "^Fjern"
+#| msgid "%s changes"
+msgid "Done applying changes!"
+msgstr "%s endringar"
-#: src/gtk/gui.cc:384
+#: src/gtk/gui.cc:560
#, fuzzy
-#| msgid "Preview"
-msgid "Preview:"
-msgstr "Førehandsvising"
+#| msgid "%s changes"
+msgid "Applying changes..."
+msgstr "%s endringar"
+
+#: src/gtk/gui.cc:602
+#, fuzzy, c-format
+#| msgid "[%s] %s\n"
+msgid "%s: %s"
+msgstr "[%s] %s\n"
+
+#: src/gtk/gui.cc:605
+#, fuzzy, c-format
+msgid "Error in package %s"
+msgstr "- for å fjerne pakkar"
+
+#: src/gtk/gui.cc:633
+#, fuzzy, c-format
+#| msgid "Unable to replace %s with new configuration file"
+msgid "Asking whether to replace the configuration file %s"
+msgstr "Klarer ikkje byta ut %s med ny oppsettsfil"
+
+#: src/gtk/gui.cc:686 src/ui.cc:1206
+msgid "Downloading packages"
+msgstr "Lastar ned pakkar"
-#: src/gtk/gui.cc:389
+#: src/gtk/gui.cc:760
#, fuzzy
msgid "Broken packages"
msgstr "- for å fjerne pakkar"
-#: src/gtk/gui.cc:423
+#: src/gtk/gui.cc:793
#, fuzzy
msgid "Show broken packages"
msgstr "- for å fjerne pakkar"
-#: src/gtk/gui.cc:427
+#: src/gtk/gui.cc:797
#, fuzzy
msgid "Resolve dependencies"
msgstr "Klarer ikkje løysa pakkekrav."
-#: src/gtk/gui.cc:455
+#: src/gtk/gui.cc:825
#, fuzzy, c-format
#| msgid "No packages are broken."
msgid "%d package is broken"
-msgstr "Ingen pakkar er øydelagde."
+msgid_plural "%d packages are broken."
+msgstr[0] "Ingen pakkar er øydelagde."
+msgstr[1] "Ingen pakkar er øydelagde."
-#: src/gtk/gui.cc:456
-#, fuzzy, c-format
-#| msgid "No packages are broken."
-msgid "%d packages are broken."
-msgstr "Ingen pakkar er øydelagde."
-
-#: src/gtk/gui.cc:499
+#: src/gtk/gui.cc:869
#, fuzzy
#| msgid "%s changes"
msgid "View changes"
msgstr "%s endringar"
-#: src/gtk/gui.cc:503
+#: src/gtk/gui.cc:873
#, fuzzy
#| msgid "%s changes"
msgid "Apply changes"
@@ -3606,76 +3836,93 @@ msgstr "%s endringar"
#. ForTranslators: any numbers in this
#. string will be displayed in a larger
#. font.
-#: src/gtk/gui.cc:542
+#: src/gtk/gui.cc:912
#, fuzzy, c-format
msgid "%d package to install"
-msgstr "%d installeringar"
-
-#: src/gtk/gui.cc:543
-#, fuzzy, c-format
-msgid "%d packages to install"
-msgstr "%d installeringar"
+msgid_plural "%d packages to install"
+msgstr[0] "%d installeringar"
+msgstr[1] "%d installeringar"
#. ForTranslators: any numbers in this
#. string will be displayed in a larger
#. font.
-#: src/gtk/gui.cc:557
+#: src/gtk/gui.cc:927
#, fuzzy, c-format
msgid "%d package to remove"
-msgstr "Klarer ikkje opna %s"
-
-#: src/gtk/gui.cc:558
-#, fuzzy, c-format
-#| msgid "No packages are broken."
-msgid "%d packages to remove"
-msgstr "Ingen pakkar er øydelagde."
+msgid_plural "%d packages to remove"
+msgstr[0] "Klarer ikkje opna %s"
+msgstr[1] "Klarer ikkje opna %s"
-#: src/gtk/gui.cc:596
+#: src/gtk/gui.cc:966
#, fuzzy, c-format
#| msgid "DownloadSize"
msgid "Download size: %sB."
msgstr "Nedlast.Str"
-#: src/gtk/gui.cc:646
+#: src/gtk/gui.cc:1016
#, c-format
msgid "Tags of %s:\n"
msgstr ""
-#: src/gtk/gui.cc:680
+#: src/gtk/gui.cc:1078
#, fuzzy
-#| msgid "Packages"
-msgid "Packages:"
-msgstr "Pakkar"
+#| msgid "not installed"
+msgid "Not implemented"
+msgstr "ikkje installert"
-#: src/gtk/gui.cc:789 src/gtk/gui.cc:794
-msgid "Dashboard:"
+#: src/gtk/gui.cc:1081
+msgid "This feature is not implemented, yet."
msgstr ""
-#: src/gtk/gui.cc:913
+#: src/gtk/gui.cc:1130 src/gtk/gui.cc:1149
+#, fuzzy
+msgid "Install/Upgrade"
+msgstr "installert"
+
+#: src/gtk/gui.cc:1172
+msgid "Set as automatic"
+msgstr ""
+
+#: src/gtk/gui.cc:1177
+#, fuzzy
+msgid "Set as manual"
+msgstr "^Brukarvegleiing"
+
+#: src/gtk/gui.cc:1182
+msgid "Toggle automatic status"
+msgstr ""
+
+#: src/gtk/gui.cc:1490
#, c-format
msgid "Unable to load the user interface definition file %s/aptitude.glade."
msgstr ""
-#: src/gtk/info.cc:157 src/gtk/pkgview.cc:162
+#: src/gtk/info.cc:160 src/gtk/pkgview.cc:166
msgid "Current status"
msgstr ""
-#: src/gtk/info.cc:159 src/gtk/pkgview.cc:164
+#: src/gtk/info.cc:162 src/gtk/pkgview.cc:168
msgid "Selected status"
msgstr ""
-#: src/gtk/info.cc:482
+#: src/gtk/info.cc:495
#, fuzzy
#| msgid "Not Installed"
msgid "Not available"
msgstr "Ikkje installert"
-#: src/gtk/info.cc:528
-msgid "Please wait; reloading cache..."
+#: src/gtk/info.cc:540
+msgid "Package information: version list"
msgstr ""
-#: src/gtk/info.cc:673
-msgid "Info:"
+#: src/gtk/info.cc:550
+#, fuzzy
+#| msgid "Packages which depend on %s"
+msgid "Package information: dependency list"
+msgstr "Pakkar som krev %s"
+
+#: src/gtk/info.cc:592
+msgid "Please wait; reloading cache..."
msgstr ""
#: src/gtk/packageinformation.cc:104 src/gtk/packageinformation.cc:106
@@ -3686,121 +3933,156 @@ msgstr ""
msgid "Unknown"
msgstr "Ukjend"
-#: src/gtk/packagestab.cc:57
+#: src/gtk/packagestab.cc:60
+msgid "Parse error"
+msgstr ""
+
+#: src/gtk/packagestab.cc:148
#, fuzzy, c-format
msgid "No packages matched \"%s\"."
msgstr "Ingen pakkar passa med mønsteret «%s»."
-#: src/gtk/packagestab.cc:88
+#: src/gtk/packagestab.cc:258
msgid "Enter a search and click \"Find\" to display packages."
msgstr ""
-#: src/gtk/packagestab.cc:142
+#: src/gtk/packagestab.cc:356
#, fuzzy
#| msgid "Package: "
msgid "Packages: "
msgstr "Pakke: "
-#: src/gtk/packagestab.cc:202
+#: src/gtk/packagestab.cc:433
#, fuzzy, c-format
#| msgid "%s versions"
msgid "Upgrade to %s version %s"
msgstr "%s-versjonar"
-#: src/gtk/packagestab.cc:210
+#: src/gtk/packagestab.cc:441
#, fuzzy, c-format
#| msgid "%s versions"
msgid "Install %s version %s"
msgstr "%s-versjonar"
-#: src/gtk/packagestab.cc:218
+#: src/gtk/packagestab.cc:449
#, fuzzy, c-format
msgid "Downgrade to %s version %s"
msgstr "«libsigc++»-versjon: %s\n"
-#: src/gtk/packagestab.cc:229
+#: src/gtk/packagestab.cc:460
#, fuzzy, c-format
msgid "Don't hold %s at its current version."
msgstr "%BHald%b desse pakkane på noverande versjon: %n"
-#: src/gtk/packagestab.cc:232 src/gtk/packagestab.cc:252
-#: src/gtk/packagestab.cc:255
+#: src/gtk/packagestab.cc:463 src/gtk/packagestab.cc:483
+#: src/gtk/packagestab.cc:486
#, fuzzy, c-format
msgid "Cancel any actions on %s."
msgstr "Pakkar som krev %s"
-#: src/gtk/packagestab.cc:237
+#: src/gtk/packagestab.cc:468
#, fuzzy, c-format
msgid "Cancel the purge of %s."
msgstr "hald fram med installasjonen"
-#: src/gtk/packagestab.cc:239
+#: src/gtk/packagestab.cc:470
#, fuzzy, c-format
msgid "Cancel the removal of %s."
msgstr "hald fram med installasjonen"
-#: src/gtk/packagestab.cc:244
+#: src/gtk/packagestab.cc:475
#, fuzzy, c-format
msgid "Cancel the upgrade of %s."
msgstr "hald fram med installasjonen"
-#: src/gtk/packagestab.cc:246
+#: src/gtk/packagestab.cc:477
#, fuzzy, c-format
msgid "Cancel the installation of %s."
msgstr "hald fram med installasjonen"
-#: src/gtk/packagestab.cc:248
+#: src/gtk/packagestab.cc:479
#, fuzzy, c-format
msgid "Cancel the downgrade of %s."
msgstr "hald fram med installasjonen"
-#: src/gtk/packagestab.cc:250
+#: src/gtk/packagestab.cc:481
#, fuzzy, c-format
msgid "Cancel the reinstallation of %s."
msgstr "hald fram med installasjonen"
-#: src/gtk/packagestab.cc:335
-#, fuzzy, c-format
-#| msgid "\"%s\" is a virtual package provided by:\n"
-msgid "%s is a virtual package provided by:\n"
-msgstr "«%s» er ein virtuell pakke gjeven av:\n"
-
-#: src/gtk/packagestab.cc:399 src/gtk/previewtab.cc:200
-msgid "(more info...)"
-msgstr ""
-
-#: src/gtk/packagestab.cc:452
+#: src/gtk/packagestab.cc:522
#, fuzzy, c-format
msgid "Remove %s"
msgstr "^Fjern"
-#: src/gtk/packagestab.cc:456
+#: src/gtk/packagestab.cc:526
#, fuzzy, c-format
#| msgid "^Purge"
msgid "Purge %s"
msgstr "^Reinsk ut"
-#: src/gtk/packagestab.cc:464
+#: src/gtk/packagestab.cc:534
#, c-format
msgid "Hold %s at its current version."
msgstr ""
-#: src/gtk/pkgview.cc:335
+#: src/gtk/packagestab.cc:539
+#, fuzzy, c-format
+#| msgid "'&M' to mark packages as automatically installed"
+msgid "Mark %s as automatically installed."
+msgstr "&M for å merkje pakkar som automatisk installerte"
+
+#: src/gtk/packagestab.cc:544
+#, fuzzy, c-format
+msgid "Mark %s as manually installed."
+msgstr "&m for å merkje pakkar som manuelt installerte"
+
+#: src/gtk/packagestab.cc:586
+#, fuzzy, c-format
+#| msgid "\"%s\" is a virtual package provided by:\n"
+msgid "%s is a virtual package provided by:\n"
+msgstr "«%s» er ein virtuell pakke gjeven av:\n"
+
+#: src/gtk/packagestab.cc:650 src/gtk/previewtab.cc:210
+msgid "(more info...)"
+msgstr ""
+
+#: src/gtk/pkgview.cc:221
+#, fuzzy, c-format
+msgid "%s was installed automatically."
+msgstr "%s; versjon %s vil bli installert automatisk"
+
+#: src/gtk/pkgview.cc:224
+#, fuzzy, c-format
+msgid "%s is being installed automatically."
+msgstr "%s; versjon %s vil bli installert automatisk"
+
+#: src/gtk/pkgview.cc:232
+#, fuzzy, c-format
+msgid "%s was installed manually."
+msgstr "%s; versjon %s vil bli installert automatisk"
+
+#: src/gtk/pkgview.cc:235
+#, fuzzy, c-format
+msgid "%s is being installed manually."
+msgstr "%s; versjon %s vil bli installert automatisk"
+
+#: src/gtk/pkgview.cc:390
msgid "Cache reloading, please wait..."
msgstr ""
-#: src/gtk/pkgview.cc:373 src/gtk/pkgview.cc:389 src/pkg_tree.cc:204
+#: src/gtk/pkgview.cc:422 src/gtk/pkgview.cc:438 src/pkg_tree.cc:204
#: src/pkg_tree.cc:215 src/pkg_tree.cc:226 src/pkg_tree.cc:238
msgid "Building view"
msgstr "Byggjer vising"
-#: src/gtk/pkgview.cc:379 src/gtk/pkgview.cc:395
+#: src/gtk/pkgview.cc:428 src/gtk/pkgview.cc:444
#, fuzzy
#| msgid "Building view"
msgid "Finalizing view"
msgstr "Byggjer vising"
-#: src/gtk/previewtab.cc:95 src/pkg_grouppolicy.cc:637
+#: src/gtk/previewtab.cc:96 src/pkg_grouppolicy.cc:637
msgid ""
"Packages with unsatisfied dependencies\n"
" The dependency requirements of these packages will be unmet after the "
@@ -3816,7 +4098,7 @@ msgstr ""
" At dette treet er her, kan bety at noko er øydelagt, anten på systemet ditt "
"eller i Debianarkivet."
-#: src/gtk/previewtab.cc:96 src/pkg_grouppolicy.cc:638
+#: src/gtk/previewtab.cc:97 src/pkg_grouppolicy.cc:638
msgid ""
"Packages being removed because they are no longer used\n"
" These packages are being deleted because they were automatically installed "
@@ -3829,7 +4111,7 @@ msgstr ""
"ikkje vil vera nokon installerte pakkar som har eit «vikig» pakkekrav på "
"dei.\n"
-#: src/gtk/previewtab.cc:97 src/pkg_grouppolicy.cc:639
+#: src/gtk/previewtab.cc:98 src/pkg_grouppolicy.cc:639
msgid ""
"Packages being automatically held in their current state\n"
" These packages could be upgraded, but they have been kept in their current "
@@ -3839,7 +4121,7 @@ msgstr ""
" Desse pakkane kan oppgraderast, men dei er blitt haldt tilbake i deira "
"noverande tilstand for å unngå å øydeleggja pakkekrav."
-#: src/gtk/previewtab.cc:98 src/pkg_grouppolicy.cc:640
+#: src/gtk/previewtab.cc:99 src/pkg_grouppolicy.cc:640
msgid ""
"Packages being automatically installed to satisfy dependencies\n"
" These packages are being installed because they are required by another "
@@ -3849,7 +4131,7 @@ msgstr ""
" Desse pakkane vert installert fordi nokon andre pakkar som du har valt å "
"installera krev dei."
-#: src/gtk/previewtab.cc:99 src/pkg_grouppolicy.cc:641
+#: src/gtk/previewtab.cc:100 src/pkg_grouppolicy.cc:641
msgid ""
"Packages being deleted due to unsatisfied dependencies\n"
" These packages are being deleted because one or more of their dependencies "
@@ -3860,7 +4142,7 @@ msgstr ""
"pakkane krev ikkje lenger er tilgjengeleg eller fordi andre pakkar er i "
"konflikt med dei."
-#: src/gtk/previewtab.cc:100 src/pkg_grouppolicy.cc:642
+#: src/gtk/previewtab.cc:101 src/pkg_grouppolicy.cc:642
msgid ""
"Packages to be downgraded\n"
" An older version of these packages than is currently installed will be "
@@ -3870,7 +4152,7 @@ msgstr ""
" Ein eldre versjon av desse pakkane enn kva som no er installert vil bli "
"installert."
-#: src/gtk/previewtab.cc:101 src/pkg_grouppolicy.cc:643
+#: src/gtk/previewtab.cc:102 src/pkg_grouppolicy.cc:643
msgid ""
"Packages being held back\n"
" These packages could be upgraded, but you have asked for them to be held at "
@@ -3880,7 +4162,7 @@ msgstr ""
" Desse pakkane kan oppgraderast, men du har bede om å halda dei tilbake på "
"noverande versjon."
-#: src/gtk/previewtab.cc:102 src/pkg_grouppolicy.cc:644
+#: src/gtk/previewtab.cc:103 src/pkg_grouppolicy.cc:644
msgid ""
"Packages to be reinstalled\n"
" These packages will be reinstalled."
@@ -3888,7 +4170,7 @@ msgstr ""
"Pakkar som skal installerast på ny\n"
" Desse pakkane vil bli installert på ny."
-#: src/gtk/previewtab.cc:103 src/pkg_grouppolicy.cc:645
+#: src/gtk/previewtab.cc:104 src/pkg_grouppolicy.cc:645
msgid ""
"Packages to be installed\n"
" These packages have been manually selected for installation on your "
@@ -3897,7 +4179,7 @@ msgstr ""
"Pakkar som blir installert\n"
" Desse pakkane har du manuelt bede om å installera på maskina di."
-#: src/gtk/previewtab.cc:104 src/pkg_grouppolicy.cc:646
+#: src/gtk/previewtab.cc:105 src/pkg_grouppolicy.cc:646
msgid ""
"Packages to be removed\n"
" These packages have been manually selected for removal."
@@ -3905,7 +4187,7 @@ msgstr ""
"Pakkar som skal fjernast\n"
" Desse pakkane har du bede om å fjerna frå maskina."
-#: src/gtk/previewtab.cc:105 src/pkg_grouppolicy.cc:647
+#: src/gtk/previewtab.cc:106 src/pkg_grouppolicy.cc:647
msgid ""
"Packages to be upgraded\n"
" These packages will be upgraded to a newer version."
@@ -3913,7 +4195,7 @@ msgstr ""
"Pakkar som skal oppgraderast\n"
" Desse pakkane vil bli oppdatert til ein nyare versjon."
-#: src/gtk/previewtab.cc:106 src/pkg_grouppolicy.cc:648
+#: src/gtk/previewtab.cc:107 src/pkg_grouppolicy.cc:648
#, fuzzy
msgid ""
"Packages that are partially installed\n"
@@ -3924,19 +4206,19 @@ msgstr ""
" Desse pakkane vert installert fordi nokon andre pakkar som du har valt å "
"installera krev dei."
-#: src/gtk/previewtab.cc:164
+#: src/gtk/previewtab.cc:174
#, fuzzy
#| msgid "Preview"
msgid "Preview: "
msgstr "Førehandsvising"
-#: src/gtk/resolver.cc:53
+#: src/gtk/resolver.cc:58
#, fuzzy, c-format
#| msgid "Error while dumping resolver state"
msgid "Error in dependency resolver: %s"
msgstr "Feil ved lagring av løysingstilstanden"
-#: src/gtk/resolver.cc:56
+#: src/gtk/resolver.cc:61
#, c-format
msgid ""
"Fatal error in dependency resolver. You can continue searching, but some "
@@ -3945,123 +4227,161 @@ msgid ""
"%s"
msgstr ""
-#: src/gtk/resolver.cc:156 src/pkg_columnizer.cc:92
+#: src/gtk/resolver.cc:160 src/pkg_columnizer.cc:92
msgid "Action"
msgstr "Handling"
-#: src/gtk/resolver.cc:256 src/solution_fragment.cc:106
+#: src/gtk/resolver.cc:266 src/solution_fragment.cc:106
#, fuzzy, c-format
msgid "%s depends upon %s"
msgstr "krev"
-#: src/gtk/resolver.cc:259 src/solution_fragment.cc:109
+#: src/gtk/resolver.cc:269 src/solution_fragment.cc:109
#, fuzzy, c-format
msgid "%s pre-depends upon %s"
msgstr "krev på førehand"
-#: src/gtk/resolver.cc:262 src/solution_fragment.cc:112
+#: src/gtk/resolver.cc:272 src/solution_fragment.cc:112
#, fuzzy, c-format
msgid "%s suggests %s"
msgstr "føreslår"
-#: src/gtk/resolver.cc:265 src/solution_fragment.cc:115
+#: src/gtk/resolver.cc:275 src/solution_fragment.cc:115
#: src/solution_item.cc:602
#, fuzzy, c-format
msgid "%s recommends %s"
msgstr "tilrår"
-#: src/gtk/resolver.cc:268 src/solution_fragment.cc:118
+#: src/gtk/resolver.cc:278 src/solution_fragment.cc:118
#, fuzzy, c-format
msgid "%s conflicts with %s"
msgstr "konflikt med"
-#: src/gtk/resolver.cc:271 src/solution_fragment.cc:121
+#: src/gtk/resolver.cc:281 src/solution_fragment.cc:121
#, fuzzy, c-format
msgid "%s breaks %s"
msgstr "erstattar"
-#: src/gtk/resolver.cc:274 src/solution_fragment.cc:124
+#: src/gtk/resolver.cc:284 src/solution_fragment.cc:124
#, fuzzy, c-format
msgid "%s replaces %s"
msgstr "erstattar"
-#: src/gtk/resolver.cc:277 src/solution_fragment.cc:127
+#: src/gtk/resolver.cc:287 src/solution_fragment.cc:127
#, fuzzy, c-format
msgid "%s obsoletes %s"
msgstr "forelda"
-#: src/gtk/resolver.cc:292
-#, fuzzy
-msgid "Nothing to do: there are no broken packages."
-msgstr "- for å fjerne pakkar"
-
-#: src/gtk/resolver.cc:299
-#, fuzzy
-#| msgid "No resolution found."
-msgid "No resolutions found."
-msgstr "Inga løysing funne."
-
-#: src/gtk/resolver.cc:314 src/solution_screen.cc:515
-#, c-format
-msgid "open: %d; closed: %d; defer: %d; conflict: %d"
-msgstr ""
-
-#: src/gtk/resolver.cc:405 src/solution_screen.cc:248
+#: src/gtk/resolver.cc:367 src/solution_screen.cc:248
#, fuzzy
msgid "Remove the following packages:"
msgstr "%BFjern%b desse pakkane: %n"
-#: src/gtk/resolver.cc:420 src/solution_screen.cc:270
+#: src/gtk/resolver.cc:382 src/solution_screen.cc:270
#, fuzzy
msgid "Install the following packages:"
msgstr "%BInstaller%b desse pakkane: %n"
-#: src/gtk/resolver.cc:437
+#: src/gtk/resolver.cc:399
#, fuzzy
msgid "Keep the following packages:"
msgstr "%BFjern%b desse pakkane: %n"
-#: src/gtk/resolver.cc:447 src/solution_fragment.cc:251
+#: src/gtk/resolver.cc:409 src/solution_fragment.cc:251
msgid "Not Installed"
msgstr "Ikkje installert"
-#: src/gtk/resolver.cc:463 src/solution_screen.cc:281
+#: src/gtk/resolver.cc:425 src/solution_screen.cc:281
#, fuzzy
msgid "Upgrade the following packages:"
msgstr "%BOppgrader%b desse pakkane: %n"
-#: src/gtk/resolver.cc:482 src/solution_screen.cc:292
+#: src/gtk/resolver.cc:444 src/solution_screen.cc:292
#, fuzzy
msgid "Downgrade the following packages:"
msgstr "%BNedgrader%b desse pakkane: %n"
-#: src/gtk/resolver.cc:503
+#: src/gtk/resolver.cc:465
#, fuzzy
msgid "Leave the following dependencies unresolved:"
msgstr "%BFjern%b desse pakkane: %n"
-#: src/gtk/resolver.cc:522
+#: src/gtk/resolver.cc:523
+#, fuzzy, c-format
+msgid "Remove %s [%s (%s)]"
+msgstr "^Fjern"
+
+#: src/gtk/resolver.cc:530
+#, fuzzy, c-format
+#| msgid "%s versions"
+msgid "Install %s [%s (%s)]"
+msgstr "%s-versjonar"
+
+#: src/gtk/resolver.cc:538
+#, fuzzy, c-format
+msgid "Cancel the installation of %s"
+msgstr "hald fram med installasjonen"
+
+#: src/gtk/resolver.cc:541
+#, fuzzy, c-format
+msgid "Cancel the removal of %s"
+msgstr "hald fram med installasjonen"
+
+#: src/gtk/resolver.cc:544
+#, fuzzy, c-format
+msgid "Keep %s at version %s (%s)"
+msgstr ""
+"\n"
+"Curses-versjon: %s\n"
+
+#: src/gtk/resolver.cc:551
+#, fuzzy, c-format
+msgid "Upgrade %s [%s (%s) -> %s (%s)]"
+msgstr "Lasta ned %sB på %s (%sB/s)."
+
+#: src/gtk/resolver.cc:560
+#, fuzzy, c-format
+msgid "Downgrade %s [%s (%s) -> %s (%s)]"
+msgstr "Lasta ned %sB på %s (%sB/s)."
+
+#: src/gtk/resolver.cc:589
+#, fuzzy
+msgid "Nothing to do: there are no broken packages."
+msgstr "- for å fjerne pakkar"
+
+#: src/gtk/resolver.cc:596
+#, fuzzy
+#| msgid "No resolution found."
+msgid "No resolutions found."
+msgstr "Inga løysing funne."
+
+#: src/gtk/resolver.cc:611 src/solution_screen.cc:515
+#, c-format
+msgid "open: %d; closed: %d; defer: %d; conflict: %d"
+msgstr ""
+
+#: src/gtk/resolver.cc:650
#, fuzzy
#| msgid "No more solutions."
msgid "No solutions."
msgstr "Ingen fleire løysingar."
-#: src/gtk/resolver.cc:522
+#: src/gtk/resolver.cc:650
#, fuzzy
#| msgid "No more solutions."
msgid "No solutions yet."
msgstr "Ingen fleire løysingar."
-#: src/gtk/resolver.cc:524
+#: src/gtk/resolver.cc:652
#, c-format
msgid "Solution %d of %d (score: %d)"
msgstr ""
-#: src/gtk/resolver.cc:618 src/ui.cc:2093
+#: src/gtk/resolver.cc:746 src/ui.cc:2093
msgid "Unable to find a solution to apply."
msgstr "Klarer ikkje å finne ei løysing som kan brukast."
-#: src/gtk/resolver.cc:623 src/ui.cc:2099
+#: src/gtk/resolver.cc:751 src/ui.cc:2099
msgid "Ran out of time while trying to find a solution."
msgstr "Brukte opp tida på å finne ei løysing."
@@ -4526,28 +4846,39 @@ msgstr " -h Denne hjelpeteksten\n"
#: src/main.cc:172
#, c-format
+msgid ""
+" --gui Use the GTK GUI even if disabled in the configuration.\n"
+msgstr ""
+
+#: src/main.cc:173
+#, c-format
+msgid " --no-gui Do not use the GTK GUI even if available.\n"
+msgstr ""
+
+#: src/main.cc:174
+#, c-format
msgid " -s Simulate actions, but do not actually perform them.\n"
msgstr " -s Simuler handlingar, men ikkje utfør dei.\n"
-#: src/main.cc:173
+#: src/main.cc:175
#, c-format
msgid ""
" -d Only download packages, do not install or remove anything.\n"
msgstr ""
" -d Berre lasta ned pakkar, ikkje installer eller fjern noko.\n"
-#: src/main.cc:174
+#: src/main.cc:176
#, c-format
msgid " -P Always prompt for confirmation or actions\n"
msgstr " -P Spør alltid om stadfesting eller handlingar\n"
-#: src/main.cc:175
+#: src/main.cc:177
#, c-format
msgid ""
" -y Assume that the answer to simple yes/no questions is 'yes'\n"
msgstr " -y Forutset at svaret på enkle ja/nei-spørsmål er «Ja»\n"
-#: src/main.cc:176
+#: src/main.cc:178
#, c-format
msgid ""
" -F format Specify a format for displaying search results; see the "
@@ -4555,7 +4886,7 @@ msgid ""
msgstr ""
" -F format Oppgje eit format for vising av søkjeresultat; sjå manualen\n"
-#: src/main.cc:177
+#: src/main.cc:179
#, c-format
msgid ""
" -O order Specify how search results should be sorted; see the manual\n"
@@ -4563,62 +4894,62 @@ msgstr ""
" -O rekkjefølgje Oppgjev korleis eit søkjeresultat skal sorterast; sjå "
"manualen\n"
-#: src/main.cc:178
+#: src/main.cc:180
#, c-format
msgid ""
" -w width Specify the display width for formatting search results\n"
msgstr ""
" -w breidde Oppgje visingsbreidde for formatering av søkjeresultat\n"
-#: src/main.cc:179
+#: src/main.cc:181
#, c-format
msgid " -f Aggressively try to fix broken packages.\n"
msgstr " -f Prøv hardt å reparere øydelagde pakkar.\n"
-#: src/main.cc:180
+#: src/main.cc:182
#, c-format
msgid " -V Show which versions of packages are to be installed.\n"
msgstr ""
" -V Vis kva for versjonar av pakkar som skal installerast.\n"
-#: src/main.cc:181
+#: src/main.cc:183
#, c-format
msgid ""
" -D Show the dependencies of automatically changed packages.\n"
msgstr " -D Vis pakkekrava til automatisk endra pakkar.\n"
-#: src/main.cc:182
+#: src/main.cc:184
#, c-format
msgid " -Z Show the change in installed size of each package.\n"
msgstr " -Z\t\t Vis endringane på installert storleik på kvar pakke.\n"
-#: src/main.cc:183
+#: src/main.cc:185
#, c-format
msgid ""
" -v Display extra information. (may be supplied multiple times)\n"
msgstr ""
" -v Vis ekstra informasjon. (kan tilføyast fleire gongar)\n"
-#: src/main.cc:184
+#: src/main.cc:186
#, c-format
msgid ""
" -t [release] Set the release from which packages should be installed\n"
msgstr ""
" -t [sleppversjon] Set sleppversjonen som pakkar skal installerast frå\n"
-#: src/main.cc:185
+#: src/main.cc:187
#, c-format
msgid ""
" -q In command-line mode, suppress the incremental progress\n"
" indicators.\n"
msgstr ""
-#: src/main.cc:187
+#: src/main.cc:189
#, c-format
msgid " -o key=val Directly set the configuration option named 'key'\n"
msgstr " -o nøkkel=verdi Set direkte oppsettsvalet som heiter «nøkkel»\n"
-#: src/main.cc:188
+#: src/main.cc:190
#, c-format
msgid ""
" --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -4627,81 +4958,81 @@ msgstr ""
" --with(out)-recommends\tOppgje om tilrådde og/eller føreslåtte pakkar skal\n"
" handterast som strenge pakkekrav\n"
-#: src/main.cc:190
+#: src/main.cc:192
#, c-format
msgid " -S fname Read the aptitude extended status info from fname.\n"
msgstr " -S fnamn: Les den utvida statusinfo-fila for aptitude frå fnamn.\n"
-#: src/main.cc:191
+#: src/main.cc:193
#, c-format
msgid " -u Download new package lists on startup.\n"
msgstr " -u Last ned ny pakkeliste ved oppstart.\n"
-#: src/main.cc:192
+#: src/main.cc:194
#, c-format
msgid " -i Perform an install run on startup.\n"
msgstr " -i Utfør ei installasjonskøyring ved oppstart.\n"
-#: src/main.cc:194
+#: src/main.cc:196
#, c-format
msgid " This aptitude does not have Super Cow Powers.\n"
msgstr " Denne aptituden har ikkje Super Cow Powers.\n"
-#: src/main.cc:397
+#: src/main.cc:399
#, fuzzy, c-format
msgid "Expected a number after -q=\n"
msgstr "Klarer ikkje opna %s"
-#: src/main.cc:406
+#: src/main.cc:408
#, fuzzy, c-format
msgid "Expected a number after -q=, got %s\n"
msgstr "Klarer ikkje opna %s"
-#: src/main.cc:430
+#: src/main.cc:432
#, fuzzy, c-format
msgid "-o requires an argument of the form key=value, got %s\n"
msgstr "-o krev eit argument på forma nøkkel=verdi, fekk %s"
-#: src/main.cc:530
+#: src/main.cc:532
#, c-format
msgid "No comma following tag name \"%s\".\n"
msgstr ""
-#: src/main.cc:571 src/main.cc:580
+#: src/main.cc:573 src/main.cc:582
msgid "WEIRDNESS: unknown option code received\n"
msgstr "MERKJELEG: mottok ein ukjent valkode\n"
-#: src/main.cc:600
+#: src/main.cc:602
msgid "Only one of -u and -i may be specified\n"
msgstr "Berre ein av -u og -i kan oppgjevast\n"
-#: src/main.cc:608
+#: src/main.cc:610
msgid ""
"-u and -i may not be specified in command-line mode (eg, with 'install')"
msgstr "-u og -i kan ikkje oppgjevast i kommandolinjemodus (dvs, med «install»)"
-#: src/main.cc:629
+#: src/main.cc:631
msgid "-u and -i may not be specified with a command"
msgstr "-u og -i kan ikkje oppgjevast med ein kommando"
-#: src/main.cc:691
+#: src/main.cc:693
#, c-format
msgid ""
"The options --safe-resolver and --full-resolver are not meaningful\n"
"for %s, which always uses the safe resolver.\n"
msgstr ""
-#: src/main.cc:748
+#: src/main.cc:750
#, c-format
msgid "Unknown command \"%s\"\n"
msgstr "Ukjent kommando «%s»\n"
-#: src/main.cc:760 src/main.cc:825
+#: src/main.cc:762 src/main.cc:827
#, c-format
msgid "Uncaught exception: %s\n"
msgstr ""
-#: src/main.cc:764 src/main.cc:829
+#: src/main.cc:766 src/main.cc:831
#, c-format
msgid ""
"Backtrace:\n"
@@ -4717,7 +5048,7 @@ msgstr "Søk etter: "
msgid "Search backwards for: "
msgstr "Søk etter: "
-#: src/mine/cmine.cc:114 src/mine/cmine.cc:156 src/ui.cc:1700
+#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1700
msgid "Minesweeper"
msgstr "Minesveiper"
@@ -4726,144 +5057,144 @@ msgstr "Minesveiper"
msgid "%i/%i mines %d %s"
msgstr "%i/%i miner %d %s"
-#: src/mine/cmine.cc:124 src/mine/cmine.cc:131
+#: src/mine/cmine.cc:124 src/mine/cmine.cc:129
msgid "second"
msgstr "sekund"
-#: src/mine/cmine.cc:124 src/mine/cmine.cc:131
+#: src/mine/cmine.cc:124 src/mine/cmine.cc:129
msgid "seconds"
msgstr "sekund"
-#: src/mine/cmine.cc:128
+#: src/mine/cmine.cc:126
#, fuzzy, c-format
msgid " %s in %d %s"
msgstr "Minesveipar %s på %d %s"
-#: src/mine/cmine.cc:129
+#: src/mine/cmine.cc:127
msgid "Won"
msgstr "Vunne"
-#: src/mine/cmine.cc:129
+#: src/mine/cmine.cc:127
msgid "Lost"
msgstr "Tapt"
-#: src/mine/cmine.cc:173 src/mine/cmine.cc:217
+#: src/mine/cmine.cc:169 src/mine/cmine.cc:209
#, c-format
msgid "Could not open file \"%s\""
msgstr "Klarte ikkje opna fila «%s»"
-#: src/mine/cmine.cc:188
+#: src/mine/cmine.cc:182
#, c-format
msgid "Could not load game from %s"
msgstr "Klarte ikkje lasta spel frå %s"
-#: src/mine/cmine.cc:255
+#: src/mine/cmine.cc:247
#, fuzzy
msgid "The board height must be a positive integer"
msgstr "Høgda på brettet må vera eit tal"
-#: src/mine/cmine.cc:267
+#: src/mine/cmine.cc:259
#, fuzzy
msgid "The board width must be a positive integer"
msgstr "Breidda på brettet må vera eit tal"
-#: src/mine/cmine.cc:279
+#: src/mine/cmine.cc:271
#, fuzzy
msgid "Invalid mine count; please enter a positive integer"
msgstr "Ugyldig respons. Skriv «j» eller «n»."
-#: src/mine/cmine.cc:299
+#: src/mine/cmine.cc:291
msgid "Setup custom game"
msgstr "Set opp eit tilpassa spel"
-#: src/mine/cmine.cc:301
+#: src/mine/cmine.cc:293
msgid "Height of board: "
msgstr "Høgda på brettet: "
-#: src/mine/cmine.cc:304
+#: src/mine/cmine.cc:296
msgid "Width of board: "
msgstr "Breidda på brettet: "
-#: src/mine/cmine.cc:307
+#: src/mine/cmine.cc:299
msgid "Number of mines: "
msgstr "Tal på miner: "
-#: src/mine/cmine.cc:310 src/mine/cmine.cc:375 src/ui.cc:285 src/ui.cc:357
+#: src/mine/cmine.cc:302 src/mine/cmine.cc:367 src/ui.cc:285 src/ui.cc:357
msgid "Ok"
msgstr "Ok"
-#: src/mine/cmine.cc:368
+#: src/mine/cmine.cc:360
msgid "Choose difficulty level"
msgstr "Vel vanskegrad"
-#: src/mine/cmine.cc:370
+#: src/mine/cmine.cc:362
msgid "Easy"
msgstr "Lett"
-#: src/mine/cmine.cc:371
+#: src/mine/cmine.cc:363
msgid "Medium"
msgstr "Middels"
-#: src/mine/cmine.cc:372
+#: src/mine/cmine.cc:364
msgid "Hard"
msgstr "Vanskeleg"
-#: src/mine/cmine.cc:373
+#: src/mine/cmine.cc:365
msgid "Custom"
msgstr "Tilpassa"
-#: src/mine/cmine.cc:471
+#: src/mine/cmine.cc:463
msgid "You have won."
msgstr "Du har vunne."
-#: src/mine/cmine.cc:474
+#: src/mine/cmine.cc:466
msgid "You lose!"
msgstr "Du tapte!"
-#: src/mine/cmine.cc:479
+#: src/mine/cmine.cc:471
msgid "You die... --More--"
msgstr "Du dør ... --Meir--"
-#: src/mine/cmine.cc:492
+#: src/mine/cmine.cc:484
#, fuzzy
msgid "The spikes were poisoned! The poison was deadly... --More--"
msgstr "Spyda var forgifta! Gifta var dødeleg ... --Meir--"
-#: src/mine/cmine.cc:495
+#: src/mine/cmine.cc:487
msgid "You land on a set of sharp iron spikes! --More--"
msgstr "Du landa på nokre skarpe jernspyd! --Meir--"
-#: src/mine/cmine.cc:498
+#: src/mine/cmine.cc:490
msgid "You fall into a pit! --More--"
msgstr "Du datt ned i eit hol! --Meir--"
-#: src/mine/cmine.cc:501
+#: src/mine/cmine.cc:493
msgid "KABOOM! You step on a land mine. --More--"
msgstr "KABOOM! Du trakka på ei landmine. --Meir--"
-#: src/mine/cmine.cc:506
+#: src/mine/cmine.cc:498
msgid "The dart was poisoned! The poison was deadly... --More--"
msgstr "Pila var forgifta! Gifta var dødeleg ... --Meir--"
-#: src/mine/cmine.cc:508
+#: src/mine/cmine.cc:500
msgid ""
"A little dart shoots out at you! You are hit by a little dart! --More--"
msgstr "Ei lita pil skyt i mot deg! Du bli treft av den vesle pila! --Meir--"
-#: src/mine/cmine.cc:512
+#: src/mine/cmine.cc:504
msgid "You turn to stone... --More--"
msgstr "Du blir til stein ... --Meir--"
-#: src/mine/cmine.cc:514
+#: src/mine/cmine.cc:506
msgid "Touching the cockatrice corpse was a fatal mistake. --More--"
msgstr ""
"Det var ein dødeleg feil å ta borti kadaveret til basilisken. --Meir--"
-#: src/mine/cmine.cc:516
+#: src/mine/cmine.cc:508
msgid "You feel here a cockatrice corpse. --More--"
msgstr "Her kan du kjenne kadaveret til ein basilisk. --Meir--"
-#: src/mine/cmine.cc:520
+#: src/mine/cmine.cc:512
msgid ""
"Click! You trigger a rolling boulder trap! You are hit by a boulder! --"
"More--"
@@ -4871,60 +5202,60 @@ msgstr ""
"Klikk! Du utløyste ein rullande kampestein! Du blir truffe av den store "
"steinen! --Meir--"
-#: src/mine/cmine.cc:530
+#: src/mine/cmine.cc:522
msgid "sleep"
msgstr "sove"
-#: src/mine/cmine.cc:533
+#: src/mine/cmine.cc:525
msgid "striking"
msgstr "angrep"
-#: src/mine/cmine.cc:536
+#: src/mine/cmine.cc:528
msgid "death"
msgstr "død"
-#: src/mine/cmine.cc:539
+#: src/mine/cmine.cc:531
msgid "polymorph"
msgstr "mangeforma"
-#: src/mine/cmine.cc:542
+#: src/mine/cmine.cc:534
msgid "magic missile"
msgstr "magisk missil"
-#: src/mine/cmine.cc:545
+#: src/mine/cmine.cc:537
msgid "secret door detection"
msgstr "oppdaging av hemmelege dører"
-#: src/mine/cmine.cc:548
+#: src/mine/cmine.cc:540
msgid "invisibility"
msgstr "usynleg"
-#: src/mine/cmine.cc:551
+#: src/mine/cmine.cc:543
msgid "cold"
msgstr "kald"
-#: src/mine/cmine.cc:557
+#: src/mine/cmine.cc:547
#, c-format
msgid "Your wand of %s breaks apart and explodes! --More--"
msgstr "Tryllestaven din frå %s går i stykker og eksploderer! --Meir--"
-#: src/mine/cmine.cc:563
+#: src/mine/cmine.cc:553
msgid "You are jolted by a surge of electricity! --More--"
msgstr "Du får eit elektrisk støt! --Meir--"
-#: src/mine/cmine.cc:667
+#: src/mine/cmine.cc:657
msgid "Enter the filename to load: "
msgstr "Skriv inn namnet på fila som skal lastast: "
-#: src/mine/cmine.cc:674
+#: src/mine/cmine.cc:664
msgid "Enter the filename to save: "
msgstr "Skriv inn namnet på fila som skal lagrast: "
-#: src/mine/cmine.cc:684
+#: src/mine/cmine.cc:672
msgid "mine-help.txt"
msgstr "mine-hjelp.txt"
-#: src/mine/cmine.cc:686
+#: src/mine/cmine.cc:674
msgid "Encoding of mine-help.txt|UTF-8"
msgstr ""
@@ -4976,10 +5307,6 @@ msgstr "Seksjon"
msgid "RC"
msgstr "RC"
-#: src/pkg_columnizer.cc:102
-msgid "Auto"
-msgstr "Auto"
-
#: src/pkg_columnizer.cc:103
msgid "Tag"
msgstr "Merke"
@@ -6277,18 +6604,35 @@ msgstr "Bli ^root"
msgid "^Quit"
msgstr "^Avslutt"
+#: src/ui.cc:2270 src/ui.cc:2650
+msgid "Undo"
+msgstr "Angra"
+
#: src/ui.cc:2279
msgid "^Install"
msgstr "^Installer"
+#: src/ui.cc:2280
+msgid "Flag the currently selected package for installation or upgrade"
+msgstr "Merkjer den valde pakke for installasjon eller oppgradering"
+
#: src/ui.cc:2283
msgid "^Remove"
msgstr "^Fjern"
+#: src/ui.cc:2284
+msgid "Flag the currently selected package for removal"
+msgstr "Merkjer den valde pakke for fjerning"
+
#: src/ui.cc:2287
msgid "^Purge"
msgstr "^Reinsk ut"
+#: src/ui.cc:2288
+msgid ""
+"Flag the currently selected package and its configuration files for removal"
+msgstr "Merkjer den valde pakken for fjerning av programfiler og oppsettsfiler"
+
#: src/ui.cc:2291
msgid "^Keep"
msgstr "^Ta vare på"
@@ -6301,18 +6645,50 @@ msgstr "Avbryt handlingane på den valde pakken"
msgid "^Hold"
msgstr "^Hald tilbake"
+#: src/ui.cc:2296
+msgid ""
+"Cancel any action on the selected package, and protect it from future "
+"upgrades"
+msgstr ""
+"Avbryt handlinar på den valde pakken og vernar han mot framtidige "
+"oppgraderingar."
+
#: src/ui.cc:2299
msgid "Mark ^Auto"
msgstr "Merk ^Auto"
+#: src/ui.cc:2300
+msgid ""
+"Mark the selected package as having been automatically installed; it will "
+"automatically be removed if no other packages depend on it"
+msgstr ""
+"Merk den valde pakken som om han er automatisk installert. Pakken vil "
+"automatisk bli fjerna viss ingen andre pakkar treng han."
+
#: src/ui.cc:2303
msgid "Mark ^Manual"
msgstr "Merk ^Manuell"
+#: src/ui.cc:2304
+msgid ""
+"Mark the selected package as having been manually installed; it will not be "
+"removed unless you manually remove it"
+msgstr ""
+"Merk den valde pakken som om han var manuelt installert. Pakken vil ikkje "
+"bli fjerna viss du ikkje fjernar han manuelt."
+
#: src/ui.cc:2307
msgid "^Forbid Version"
msgstr "^Forby versjon"
+#: src/ui.cc:2308
+msgid ""
+"Forbid the candidate version of the selected package from being installed; "
+"newer versions of the package will be installed as usual"
+msgstr ""
+"Forby denne versjonen av den valde pakken frå å bli installert.\n"
+"Nyare versjonar av pakken vil bli installert som vanleg"
+
#: src/ui.cc:2312
msgid "I^nformation"
msgstr "I^nformasjon"
@@ -6686,14 +7062,82 @@ msgstr "%s endringar"
msgid "View the list of changes made to this Debian package."
msgstr "Vis dei viktige endringane som er gjort i kvar versjon av "
-#: src/view_changelog.cc:388
+#: src/view_changelog.cc:369
+msgid "You can only view changelogs of official Debian packages."
+msgstr "Du kan berre lesa endringsloggar for offisielle debianpakkar."
+
+#: src/view_changelog.cc:389
msgid "Downloading Changelog"
msgstr "Lastar ned endringslogg"
-#: src/view_changelog.cc:390
+#: src/view_changelog.cc:391
msgid "Download Changelog"
msgstr "Last ned endringslogg"
+#, fuzzy
+#~ msgid "_Install"
+#~ msgstr "^Installer"
+
+#, fuzzy
+#~ msgid "_Remove"
+#~ msgstr "^Fjern"
+
+#, fuzzy
+#~| msgid "^Purge"
+#~ msgid "_Purge"
+#~ msgstr "^Reinsk ut"
+
+#, fuzzy
+#~ msgid "_Keep"
+#~ msgstr "^Ta vare på"
+
+#, fuzzy
+#~ msgid "_Hold"
+#~ msgstr "^Hald tilbake"
+
+#, fuzzy
+#~| msgid "Mark ^Auto"
+#~ msgid "Mark _Auto"
+#~ msgstr "Merk ^Auto"
+
+#, fuzzy
+#~| msgid "Mark ^Manual"
+#~ msgid "Mark _Manual"
+#~ msgstr "Merk ^Manuell"
+
+#, fuzzy
+#~| msgid "^Forbid Version"
+#~ msgid "_Forbid Version"
+#~ msgstr "^Forby versjon"
+
+#, fuzzy
+#~ msgid "Resolver:"
+#~ msgstr "^Fjern"
+
+#, fuzzy
+#~| msgid "Preview"
+#~ msgid "Preview:"
+#~ msgstr "Førehandsvising"
+
+#, fuzzy
+#~| msgid "No packages are broken."
+#~ msgid "%d packages are broken."
+#~ msgstr "Ingen pakkar er øydelagde."
+
+#, fuzzy
+#~ msgid "%d packages to install"
+#~ msgstr "%d installeringar"
+
+#, fuzzy
+#~| msgid "No packages are broken."
+#~ msgid "%d packages to remove"
+#~ msgstr "Ingen pakkar er øydelagde."
+
+#, fuzzy
+#~| msgid "Packages"
+#~ msgid "Packages:"
+#~ msgstr "Pakkar"
+
#~ msgid "Yes"
#~ msgstr "Ja"
@@ -6741,10 +7185,6 @@ msgstr "Last ned endringslogg"
#~ msgstr "Foreldar"
#, fuzzy
-#~ msgid "The package \"%s\" is manually installed.\n"
-#~ msgstr "&m for å merkje pakkar som manuelt installerte"
-
-#, fuzzy
#~ msgid ""
#~ " - why one or more packages would require the given package\n"
#~ msgstr ""