[opensuse-translation-commit] r95404 - trunk/lcn/nb/po

7 Dec 2015

Author: minton
Date: 2015-12-07 20:15:29 +0100 (Mon, 07 Dec 2015)
New Revision: 95404

Modified:
   trunk/lcn/nb/po/zypp.nb.po
Log:
Merged zypp.pot for nb

Modified: trunk/lcn/nb/po/zypp.nb.po
===================================================================

--- trunk/lcn/nb/po/zypp.nb.po	2015-12-07 19:15:28 UTC (rev 95403)
+++ trunk/lcn/nb/po/zypp.nb.po	2015-12-07 19:15:29 UTC (rev 95404)
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: zypp\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-05 01:13+0200\n"
+"POT-Creation-Date: 2015-11-16 12:34+0100\n"
 "PO-Revision-Date: 2013-10-04 20:05+0200\n"
 "Last-Translator: Olav Pettershagen <olpetter@bbnett.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -23,7 +23,7 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: zypp/solver/detail/SATResolver.cc:1102
+#: zypp/solver/detail/SATResolver.cc:1080
 msgid ""
 "\n"
 "uninstallable providers: "
@@ -32,103 +32,112 @@
 "uinstallerbare nødvendige pakker: "
 
 #: zypp/media/MediaException.cc:223
-#, c-format
+#, c-format, boost-format
 msgid " SSL certificate problem, verify that the CA cert is OK for '%s'."
 msgstr " SSL-sertifikatproblem, bekreft at CA-sertifikat er OK for '%s'."
 
-#: zypp/target/TargetImpl.cc:442
+#: zypp/target/TargetImpl.cc:453
 msgid " executed"
 msgstr " kjørt"
 
-#: zypp/target/TargetImpl.cc:464
+#: zypp/target/TargetImpl.cc:475
 msgid " execution failed"
 msgstr " kjøring mislyktes"
 
-#: zypp/target/TargetImpl.cc:591
+#: zypp/target/TargetImpl.cc:602
 msgid " execution skipped while aborting"
 msgstr " kjøring ikke utført under avbrudd"
 
 #. translators: We may find the same script content in files with different names.
 #. Only the first occurence is executed, subsequent ones are skipped. It's a one-line
 #. message for a log file. Preferably start translation with "%s"
-#: zypp/target/TargetImpl.cc:581
-#, c-format
+#: zypp/target/TargetImpl.cc:592
+#, c-format, boost-format
 msgid "%s already executed as %s)"
 msgstr "%s allerede kjørt som %s)"
 
-#: zypp/solver/detail/SATResolver.cc:1044
-#, c-format
+#: zypp/solver/detail/SATResolver.cc:1022
+#, c-format, boost-format
 msgid "%s conflicts with %s provided by %s"
 msgstr "%s er i konflikt med %s fra %s"
 
-#: zypp/solver/detail/SATResolver.cc:997
-#, c-format
+#: zypp/solver/detail/SATResolver.cc:975
+#, c-format, boost-format
 msgid "%s does not belong to a distupgrade repository"
 msgstr "%s tilhører ikke en pakkebrønn for distribusjonsoppgradering"
 
-#: zypp/solver/detail/SATResolver.cc:1001
-#, c-format
+#: zypp/solver/detail/SATResolver.cc:979
+#, c-format, boost-format
 msgid "%s has inferior architecture"
 msgstr "%s har foreldet arkitektur"
 
-#: zypp/solver/detail/SATResolver.cc:1029
-#, c-format
+#: zypp/solver/detail/SATResolver.cc:1007
+#, c-format, boost-format
 msgid "%s is not installable"
 msgstr "%s kan ikke installeres"
 
-#: zypp/solver/detail/SATResolver.cc:1025
-#, c-format
+#: zypp/solver/detail/SATResolver.cc:1003
+#, c-format, boost-format
 msgid "%s is provided by the system and cannot be erased"
 msgstr "%s er beskyttet av systemet, og kan ikke slettes."
 
-#: zypp/solver/detail/SATResolver.cc:1049
-#, c-format
+#: zypp/solver/detail/SATResolver.cc:1027
+#, c-format, boost-format
 msgid "%s obsoletes %s provided by %s"
 msgstr "%s foreldede pakker %s fra %s"
 
-#: zypp/solver/detail/SATResolver.cc:1090
-#, c-format
+#: zypp/solver/detail/SATResolver.cc:1068
+#, c-format, boost-format
 msgid "%s requires %s, but this requirement cannot be provided"
 msgstr "%s krever %s, men denne nødvendige filen finnes ikke"
 
 #. translators: an annotation to a gpg keys expiry date
-#: zypp/PublicKey.cc:122
+#: zypp/PublicKey.cc:125
 msgid "(EXPIRED)"
 msgstr "(UTLØPT)"
 
 #. translators: an annotation to a gpg keys expiry date
-#: zypp/PublicKey.cc:113
+#: zypp/PublicKey.cc:116
 msgid "(does not expire)"
 msgstr "(utløper ikke)"
 
 #. translators: an annotation to a gpg keys expiry date
-#: zypp/PublicKey.cc:126
+#: zypp/PublicKey.cc:133
+#, fuzzy, c-format, boost-format
+#| msgid "(expires within 24h)"
+msgid "(expires in %d day)"
+msgid_plural "(expires in %d days)"
+msgstr[0] "(utløper innen 24 t)"
+msgstr[1] "(utløper innen 24 t)"
+
+#. translators: an annotation to a gpg keys expiry date
+#: zypp/PublicKey.cc:129
 msgid "(expires within 24h)"
 msgstr "(utløper innen 24 t)"
 
 # AZ
 #. language code: abk ab
-#: zypp/LanguageCode.cc:208
+#: zypp/LanguageCode.cc:163
 msgid "Abkhazian"
 msgstr "Abkhasisk"
 
 #. language code: ace
-#: zypp/LanguageCode.cc:210
+#: zypp/LanguageCode.cc:165
 msgid "Achinese"
 msgstr "Akinesisk"
 
 #. language code: ach
-#: zypp/LanguageCode.cc:212
+#: zypp/LanguageCode.cc:167
 msgid "Acoli"
 msgstr "Acoli"
 
 #. language code: ada
-#: zypp/LanguageCode.cc:214
+#: zypp/LanguageCode.cc:169
 msgid "Adangme"
 msgstr "Adangme"
 
-#: zypp/RepoManager.cc:1406
-#, c-format
+#: zypp/RepoManager.cc:1541
+#, c-format, boost-format
 msgid "Adding repository '%s'"
 msgstr "Legger til pakkebrønn '%s'"
 
@@ -138,101 +147,101 @@
 
 #. report additional rpm output in finish
 #. TranslatorExplanation Text is followed by a ':'  and the actual output.
-#: zypp/target/rpm/RpmDb.cc:1977 zypp/target/rpm/RpmDb.cc:2124
+#: zypp/target/rpm/RpmDb.cc:2057 zypp/target/rpm/RpmDb.cc:2203
 msgid "Additional rpm output"
 msgstr "Flere rpm-resultater"
 
 #. language code: ady
-#: zypp/LanguageCode.cc:216
+#: zypp/LanguageCode.cc:171
 msgid "Adyghe"
 msgstr "Adyghe"
 
 #. language code: aar aa
-#: zypp/LanguageCode.cc:206
+#: zypp/LanguageCode.cc:161
 msgid "Afar"
 msgstr "Afar"
 
 #. :ARE:784:
-#: zypp/CountryCode.cc:204
+#: zypp/CountryCode.cc:160
 msgid "Afghanistan"
 msgstr "Afghanistan"
 
 #. language code: afh
-#: zypp/LanguageCode.cc:220
+#: zypp/LanguageCode.cc:175
 msgid "Afrihili"
 msgstr "Afrihili"
 
 #. language code: afr af
-#: zypp/LanguageCode.cc:222
+#: zypp/LanguageCode.cc:177
 msgid "Afrikaans"
 msgstr "Afrikansk"
 
 #. language code: afa
-#: zypp/LanguageCode.cc:218
+#: zypp/LanguageCode.cc:173
 msgid "Afro-Asiatic (Other)"
 msgstr "Afro-asiatisk (annet)"
 
 #. language code: ain
-#: zypp/LanguageCode.cc:224
+#: zypp/LanguageCode.cc:179
 msgid "Ainu"
 msgstr "Ainu"
 
 # AZ
 #. language code: aka ak
-#: zypp/LanguageCode.cc:226
+#: zypp/LanguageCode.cc:181
 msgid "Akan"
 msgstr "Akansk"
 
 # AZ
 #. language code: akk
-#: zypp/LanguageCode.cc:228
+#: zypp/LanguageCode.cc:183
 msgid "Akkadian"
 msgstr "Akkadisk"
 
 #. :ABW:533:
-#: zypp/CountryCode.cc:217
+#: zypp/CountryCode.cc:173
 msgid "Aland Islands"
 msgstr "Åland"
 
 #. :AIA:660:
-#: zypp/CountryCode.cc:207
+#: zypp/CountryCode.cc:163
 msgid "Albania"
 msgstr "Albania"
 
 #. language code: alb sqi sq
-#: zypp/LanguageCode.cc:230 zypp/LanguageCode.cc:232
+#: zypp/LanguageCode.cc:185 zypp/LanguageCode.cc:187
 msgid "Albanian"
 msgstr "Albansk"
 
 #. language code: ale
-#: zypp/LanguageCode.cc:234
+#: zypp/LanguageCode.cc:189
 msgid "Aleut"
 msgstr "Aleutisk"
 
 #. :DOM:214:
-#: zypp/CountryCode.cc:261
+#: zypp/CountryCode.cc:217
 msgid "Algeria"
 msgstr "Algerie"
 
 #. language code: alg
-#: zypp/LanguageCode.cc:236
+#: zypp/LanguageCode.cc:191
 msgid "Algonquian Languages"
 msgstr "Algonquianske språk"
 
 #. language code: tut
-#: zypp/LanguageCode.cc:1118
+#: zypp/LanguageCode.cc:1073
 msgid "Altaic (Other)"
 msgstr "Altaisk (annet)"
 
 # AS
 # fuzzy
 #. :ARG:032:
-#: zypp/CountryCode.cc:213
+#: zypp/CountryCode.cc:169
 msgid "American Samoa"
 msgstr "Amerika, Nord"
 
 #. language code: amh am
-#: zypp/LanguageCode.cc:240
+#: zypp/LanguageCode.cc:195
 msgid "Amharic"
 msgstr "Amharisk"
 
@@ -240,175 +249,175 @@
 msgid "An additional customer contract is necessary for getting support."
 msgstr "Brukerstøtte krever en tilleggskundekontrakt."
 
-#: zypp/CountryCode.cc:202
+#: zypp/CountryCode.cc:158
 msgid "Andorra"
 msgstr "Andorra"
 
 #. :ANT:530:
-#: zypp/CountryCode.cc:210
+#: zypp/CountryCode.cc:166
 msgid "Angola"
 msgstr "Angola"
 
 #. :ATG:028:
-#: zypp/CountryCode.cc:206
+#: zypp/CountryCode.cc:162
 msgid "Anguilla"
 msgstr "Anguilla"
 
 #. :AGO:024:
-#: zypp/CountryCode.cc:211
+#: zypp/CountryCode.cc:167
 msgid "Antarctica"
 msgstr "Antarktis"
 
 # AG
 #. :AFG:004:
-#: zypp/CountryCode.cc:205
+#: zypp/CountryCode.cc:161
 msgid "Antigua and Barbuda"
 msgstr "Antigua og Barbuda"
 
 #. language code: apa
-#: zypp/LanguageCode.cc:244
+#: zypp/LanguageCode.cc:199
 msgid "Apache Languages"
 msgstr "Apache-språk"
 
 #. language code: ara ar
-#: zypp/LanguageCode.cc:246
+#: zypp/LanguageCode.cc:201
 msgid "Arabic"
 msgstr "Arabisk"
 
 #. language code: arg an
-#: zypp/LanguageCode.cc:250
+#: zypp/LanguageCode.cc:205
 msgid "Aragonese"
 msgstr "Aragonesisk"
 
 #. language code: arc
-#: zypp/LanguageCode.cc:248
+#: zypp/LanguageCode.cc:203
 msgid "Aramaic"
 msgstr "Arameisk"
 
 #. language code: arp
-#: zypp/LanguageCode.cc:258
+#: zypp/LanguageCode.cc:213
 msgid "Arapaho"
 msgstr "Arapaho"
 
 #. language code: arn
-#: zypp/LanguageCode.cc:256
+#: zypp/LanguageCode.cc:211
 msgid "Araucanian"
 msgstr "Araucaniansk"
 
 #. language code: arw
-#: zypp/LanguageCode.cc:262
+#: zypp/LanguageCode.cc:217
 msgid "Arawak"
 msgstr "Arawak"
 
 #. :ATA:010:
-#: zypp/CountryCode.cc:212
+#: zypp/CountryCode.cc:168
 msgid "Argentina"
 msgstr "Argentina"
 
 # AM
 # fuzzy
 #. :ALB:008:
-#: zypp/CountryCode.cc:208
+#: zypp/CountryCode.cc:164
 msgid "Armenia"
 msgstr "Argentina"
 
 # AM
 # fuzzy
 #. language code: arm hye hy
-#: zypp/LanguageCode.cc:252 zypp/LanguageCode.cc:254
+#: zypp/LanguageCode.cc:207 zypp/LanguageCode.cc:209
 msgid "Armenian"
 msgstr "Armensk"
 
 #. language code: art
-#: zypp/LanguageCode.cc:260
+#: zypp/LanguageCode.cc:215
 msgid "Artificial (Other)"
 msgstr "Kunstspråk (annet)"
 
 # CU
 # fuzzy
 #. :AUS:036:
-#: zypp/CountryCode.cc:216
+#: zypp/CountryCode.cc:172
 msgid "Aruba"
 msgstr "Aruba"
 
 #. language code: asm as
-#: zypp/LanguageCode.cc:264
+#: zypp/LanguageCode.cc:219
 msgid "Assamese"
 msgstr "Assamesisk"
 
 #. language code: ast
-#: zypp/LanguageCode.cc:266
+#: zypp/LanguageCode.cc:221
 msgid "Asturian"
 msgstr "Asturiansk"
 
 #. language code: ath
-#: zypp/LanguageCode.cc:268
+#: zypp/LanguageCode.cc:223
 msgid "Athapascan Languages"
 msgstr "Athapascanske språk"
 
 #. :AUT:040:
-#: zypp/CountryCode.cc:215
+#: zypp/CountryCode.cc:171
 msgid "Australia"
 msgstr "Australia"
 
 #. language code: aus
-#: zypp/LanguageCode.cc:270
+#: zypp/LanguageCode.cc:225
 msgid "Australian Languages"
 msgstr "Australske språk"
 
 #. :ASM:016:
-#: zypp/CountryCode.cc:214
+#: zypp/CountryCode.cc:170
 msgid "Austria"
 msgstr "Østerrike"
 
 #. language code: map
-#: zypp/LanguageCode.cc:762
+#: zypp/LanguageCode.cc:717
 msgid "Austronesian (Other)"
 msgstr "Austronesisk (annet)"
 
 #. !\todo add comma to the message for the next release
-#: zypp/media/MediaCIFS.cc:430 zypp/media/MediaCurl.cc:1689
-#, c-format
+#: zypp/media/MediaCIFS.cc:430 zypp/media/MediaCurl.cc:1692
+#, c-format, boost-format
 msgid "Authentication required for '%s'"
 msgstr "Autentisering kreves for '%s'"
 
 #. language code: ava av
-#: zypp/LanguageCode.cc:272
+#: zypp/LanguageCode.cc:227
 msgid "Avaric"
 msgstr "Avarisk"
 
 #. language code: ave ae
-#: zypp/LanguageCode.cc:274
+#: zypp/LanguageCode.cc:229
 msgid "Avestan"
 msgstr "Avestasisk"
 
 # SZ
 # fuzzy
 #. language code: awa
-#: zypp/LanguageCode.cc:276
+#: zypp/LanguageCode.cc:231
 msgid "Awadhi"
 msgstr "Awadhi"
 
 # MM
 # fuzzy
 #. language code: aym ay
-#: zypp/LanguageCode.cc:278
+#: zypp/LanguageCode.cc:233
 msgid "Aymara"
 msgstr "Aymara"
 
 # AZ
 #. :ALA:248:
-#: zypp/CountryCode.cc:218
+#: zypp/CountryCode.cc:174
 msgid "Azerbaijan"
 msgstr "Aserbadjan"
 
 #. language code: aze az
-#: zypp/LanguageCode.cc:280
+#: zypp/LanguageCode.cc:235
 msgid "Azerbaijani"
 msgstr "Aserbadjansk"
 
 #: zypp/media/MediaException.cc:47
-#, c-format
+#, c-format, boost-format
 msgid "Bad file name: %s"
 msgstr "Ugyldig filnavn: %s"
 
@@ -419,280 +428,280 @@
 # BS
 # fuzzy
 #. :BRA:076:
-#: zypp/CountryCode.cc:232
+#: zypp/CountryCode.cc:188
 msgid "Bahamas"
 msgstr "Bahamas"
 
 #. :BGR:100:
-#: zypp/CountryCode.cc:225
+#: zypp/CountryCode.cc:181
 msgid "Bahrain"
 msgstr "Bahrain"
 
 #. language code: ban
-#: zypp/LanguageCode.cc:292
+#: zypp/LanguageCode.cc:247
 msgid "Balinese"
 msgstr "Balinesisk"
 
 #. language code: bat
-#: zypp/LanguageCode.cc:300
+#: zypp/LanguageCode.cc:255
 msgid "Baltic (Other)"
 msgstr "Baltisk (annet)"
 
 #. language code: bal
-#: zypp/LanguageCode.cc:288
+#: zypp/LanguageCode.cc:243
 msgid "Baluchi"
 msgstr "Baluchi"
 
 #. language code: bam bm
-#: zypp/LanguageCode.cc:290
+#: zypp/LanguageCode.cc:245
 msgid "Bambara"
 msgstr "Bambara"
 
 #. language code: bai
-#: zypp/LanguageCode.cc:284
+#: zypp/LanguageCode.cc:239
 msgid "Bamileke Languages"
 msgstr "Bamileke-språk"
 
 #. language code: bad
-#: zypp/LanguageCode.cc:282
+#: zypp/LanguageCode.cc:237
 msgid "Banda"
 msgstr "Banda"
 
 #. :BRB:052:
-#: zypp/CountryCode.cc:221
+#: zypp/CountryCode.cc:177
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
 #. language code: bnt
-#: zypp/LanguageCode.cc:324
+#: zypp/LanguageCode.cc:279
 msgid "Bantu (Other)"
 msgstr "Bantu (annet)"
 
 #. :BIH:070:
-#: zypp/CountryCode.cc:220
+#: zypp/CountryCode.cc:176
 msgid "Barbados"
 msgstr "Barbados"
 
 #. language code: bas
-#: zypp/LanguageCode.cc:298
+#: zypp/LanguageCode.cc:253
 msgid "Basa"
 msgstr "Basa"
 
 #. language code: bak ba
-#: zypp/LanguageCode.cc:286
+#: zypp/LanguageCode.cc:241
 msgid "Bashkir"
 msgstr "Bashkirisk"
 
 #. language code: baq eus eu
-#: zypp/LanguageCode.cc:294 zypp/LanguageCode.cc:296
+#: zypp/LanguageCode.cc:249 zypp/LanguageCode.cc:251
 msgid "Basque"
 msgstr "Baskisk"
 
 #. language code: btk
-#: zypp/LanguageCode.cc:332
+#: zypp/LanguageCode.cc:287
 msgid "Batak (Indonesia)"
 msgstr "Batak (Indonesia)"
 
 #. language code: bej
-#: zypp/LanguageCode.cc:302
+#: zypp/LanguageCode.cc:257
 msgid "Beja"
 msgstr "Beja"
 
 #. :BWA:072:
-#: zypp/CountryCode.cc:236
+#: zypp/CountryCode.cc:192
 msgid "Belarus"
 msgstr "Hviterussland"
 
 #. language code: bel be
-#: zypp/LanguageCode.cc:304
+#: zypp/LanguageCode.cc:259
 msgid "Belarusian"
 msgstr "Hviterussisk"
 
 #. :BGD:050:
-#: zypp/CountryCode.cc:222
+#: zypp/CountryCode.cc:178
 msgid "Belgium"
 msgstr "Belgia"
 
 # BZ
 # fuzzy
 #. :BLR:112:
-#: zypp/CountryCode.cc:237
+#: zypp/CountryCode.cc:193
 msgid "Belize"
 msgstr "Belgia"
 
 #. language code: bem
-#: zypp/LanguageCode.cc:306
+#: zypp/LanguageCode.cc:261
 msgid "Bemba"
 msgstr "Bemba"
 
 #. language code: ben bn
-#: zypp/LanguageCode.cc:308
+#: zypp/LanguageCode.cc:263
 msgid "Bengali"
 msgstr "Bengalsk"
 
 #. :BDI:108:
-#: zypp/CountryCode.cc:227
+#: zypp/CountryCode.cc:183
 msgid "Benin"
 msgstr "Benin"
 
 #. language code: ber
-#: zypp/LanguageCode.cc:310
+#: zypp/LanguageCode.cc:265
 msgid "Berber (Other)"
 msgstr "Berber-språk (annet)"
 
 #. :BEN:204:
-#: zypp/CountryCode.cc:228
+#: zypp/CountryCode.cc:184
 msgid "Bermuda"
 msgstr "Bermuda"
 
 #. language code: bho
-#: zypp/LanguageCode.cc:312
+#: zypp/LanguageCode.cc:267
 msgid "Bhojpuri"
 msgstr "Bhojpuri"
 
 #. :BHS:044:
-#: zypp/CountryCode.cc:233
+#: zypp/CountryCode.cc:189
 msgid "Bhutan"
 msgstr "Bhutan"
 
 #. language code: bih bh
-#: zypp/LanguageCode.cc:314
+#: zypp/LanguageCode.cc:269
 msgid "Bihari"
 msgstr "Bihari"
 
 #. language code: bik
-#: zypp/LanguageCode.cc:316
+#: zypp/LanguageCode.cc:271
 msgid "Bikol"
 msgstr "Bikol"
 
 #. language code: bin
-#: zypp/LanguageCode.cc:318
+#: zypp/LanguageCode.cc:273
 msgid "Bini"
 msgstr "Bini"
 
 #. language code: bis bi
-#: zypp/LanguageCode.cc:320
+#: zypp/LanguageCode.cc:275
 msgid "Bislama"
 msgstr "Bislama"
 
 #. language code: byn
-#: zypp/LanguageCode.cc:344
+#: zypp/LanguageCode.cc:299
 msgid "Blin"
 msgstr "Blin"
 
 #. :BRN:096:
-#: zypp/CountryCode.cc:230
+#: zypp/CountryCode.cc:186
 msgid "Bolivia"
 msgstr "Bolivia"
 
 #. :AZE:031:
-#: zypp/CountryCode.cc:219
+#: zypp/CountryCode.cc:175
 msgid "Bosnia and Herzegovina"
 msgstr "Bosnia og Hercegovina"
 
 #. language code: bos bs
-#: zypp/LanguageCode.cc:326
+#: zypp/LanguageCode.cc:281
 msgid "Bosnian"
 msgstr "Bosnisk"
 
 #. :BVT:074:
-#: zypp/CountryCode.cc:235
+#: zypp/CountryCode.cc:191
 msgid "Botswana"
 msgstr "Botswana"
 
 #. :BTN:064:
-#: zypp/CountryCode.cc:234
+#: zypp/CountryCode.cc:190
 msgid "Bouvet Island"
 msgstr "Bouvetøya"
 
 # BR
 #. language code: bra
-#: zypp/LanguageCode.cc:328
+#: zypp/LanguageCode.cc:283
 msgid "Braj"
 msgstr "Braj"
 
 # BR
 #. :BOL:068:
-#: zypp/CountryCode.cc:231
+#: zypp/CountryCode.cc:187
 msgid "Brazil"
 msgstr "Brasil"
 
 #. language code: bre br
-#: zypp/LanguageCode.cc:330
+#: zypp/LanguageCode.cc:285
 msgid "Breton"
 msgstr "Bretonsk"
 
 #. :IND:356:
-#: zypp/CountryCode.cc:306
+#: zypp/CountryCode.cc:262
 msgid "British Indian Ocean Territory"
 msgstr "Britisk territorium i Indiahavet"
 
 # VI
 # fuzzy
 #. :VEN:862:
-#: zypp/CountryCode.cc:437
+#: zypp/CountryCode.cc:393
 msgid "British Virgin Islands"
 msgstr "Jomfruøyene"
 
 #. :BMU:060:
-#: zypp/CountryCode.cc:229
+#: zypp/CountryCode.cc:185
 msgid "Brunei Darussalam"
 msgstr "Brunei Darussalam"
 
 #. language code: bug
-#: zypp/LanguageCode.cc:336
+#: zypp/LanguageCode.cc:291
 msgid "Buginese"
 msgstr "Buginesisk"
 
-#: zypp/RepoManager.cc:1107
-#, c-format
+#: zypp/RepoManager.cc:1212
+#, c-format, boost-format
 msgid "Building repository '%s' cache"
 msgstr "Bygger pakkebrønnmellomlager '%s'"
 
 #. :BFA:854:
-#: zypp/CountryCode.cc:224
+#: zypp/CountryCode.cc:180
 msgid "Bulgaria"
 msgstr "Bulgaria"
 
 #. language code: bul bg
-#: zypp/LanguageCode.cc:338
+#: zypp/LanguageCode.cc:293
 msgid "Bulgarian"
 msgstr "Bulgarsk"
 
 #. language code: bua
-#: zypp/LanguageCode.cc:334
+#: zypp/LanguageCode.cc:289
 msgid "Buriat"
 msgstr "Buriat"
 
 #. :BEL:056:
-#: zypp/CountryCode.cc:223
+#: zypp/CountryCode.cc:179
 msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
 #. language code: bur mya my
-#: zypp/LanguageCode.cc:340 zypp/LanguageCode.cc:342
+#: zypp/LanguageCode.cc:295 zypp/LanguageCode.cc:297
 msgid "Burmese"
 msgstr "Burmesisk"
 
 #. :BHR:048:
-#: zypp/CountryCode.cc:226
+#: zypp/CountryCode.cc:182
 msgid "Burundi"
 msgstr "Burundi"
 
 #. language code: cad
-#: zypp/LanguageCode.cc:346
+#: zypp/LanguageCode.cc:301
 msgid "Caddo"
 msgstr "Caddo"
 
 # KH
 # fuzzy
 #. :KGZ:417:
-#: zypp/CountryCode.cc:317
+#: zypp/CountryCode.cc:273
 msgid "Cambodia"
 msgstr "Kambodsja"
 
 #. :CHL:152:
-#: zypp/CountryCode.cc:247
+#: zypp/CountryCode.cc:203
 msgid "Cameroon"
 msgstr "Kamerun"
 
@@ -704,57 +713,57 @@
 msgid "Can't acquire the mutex lock"
 msgstr "Kan ikke oppnå mutekslås"
 
-#: zypp/ExternalProgram.cc:351
-#, c-format
+#: zypp/ExternalProgram.cc:361
+#, c-format, boost-format
 msgid "Can't chdir to '%s' (%s)."
 msgstr "Kan ikke kjøre chdir til «%s» (%s)."
 
-#: zypp/ExternalProgram.cc:350
-#, c-format
+#: zypp/ExternalProgram.cc:360
+#, c-format, boost-format
 msgid "Can't chdir to '%s' inside chroot '%s' (%s)."
 msgstr "Kan ikke kjøre chdir til «%s» fra chroot «%s» (%s)."
 
-#: zypp/ExternalProgram.cc:340
-#, c-format
+#: zypp/ExternalProgram.cc:350
+#, c-format, boost-format
 msgid "Can't chroot to '%s' (%s)."
 msgstr "Kan ikke kjøre chroot til '%s' (%s)."
 
-#: zypp/RepoManager.cc:964 zypp/RepoManager.cc:1071 zypp/RepoManager.cc:1121
-#, c-format
+#: zypp/RepoManager.cc:1062 zypp/RepoManager.cc:1170 zypp/RepoManager.cc:1226
+#, c-format, boost-format
 msgid "Can't create %s"
 msgstr "Kan ikke opprette %s"
 
-#: zypp/RepoManager.cc:1127
-#, c-format
+#: zypp/RepoManager.cc:1232
+#, c-format, boost-format
 msgid "Can't create cache at %s - no writing permissions."
 msgstr "Kan ikke opprette mellomlager på %s - skrivebeskyttet."
 
-#: zypp/RepoManager.cc:972
+#: zypp/RepoManager.cc:1070
 msgid "Can't create metadata cache directory."
 msgstr "Kan ikke opprette katalog for metadatamellomlager."
 
 #. TranslatorExplanation '%s' is a filename
-#: zypp/RepoManager.cc:1583 zypp/RepoManager.cc:1772
-#, c-format
+#: zypp/RepoManager.cc:1718 zypp/RepoManager.cc:1915
+#, c-format, boost-format
 msgid "Can't delete '%s'"
 msgstr "Kan ikke slette '%s'"
 
 #. don't want to get here
-#: zypp/ExternalProgram.cc:363
-#, c-format
+#: zypp/ExternalProgram.cc:373
+#, c-format, boost-format
 msgid "Can't exec '%s' (%s)."
 msgstr "Kan ikke kjøre '%s' (%s)."
 
-#: zypp/RepoManager.cc:1571 zypp/RepoManager.cc:1647
+#: zypp/RepoManager.cc:1706 zypp/RepoManager.cc:1782
 msgid "Can't figure out where the repo is stored."
 msgstr "Finner ikke ut hvor pakkebrønnen er lagret."
 
-#: zypp/RepoManager.cc:1760 zypp/RepoManager.cc:2111
+#: zypp/RepoManager.cc:1903 zypp/RepoManager.cc:2336
 msgid "Can't figure out where the service is stored."
 msgstr "Finner ikke ut hvor tjenesten er lagret."
 
-#: zypp/ExternalProgram.cc:371
-#, c-format
+#: zypp/ExternalProgram.cc:381
+#, c-format, boost-format
 msgid "Can't fork (%s)."
 msgstr "Kan ikke splitte (%s)."
 
@@ -767,29 +776,29 @@
 msgstr "Kan ikke initialisere rekursiv muteks"
 
 #. TranslatorExplanation '%s' is a filename
-#: zypp/RepoManager.cc:575 zypp/RepoManager.cc:1445 zypp/RepoManager.cc:1527
-#: zypp/RepoManager.cc:1601 zypp/RepoManager.cc:1666 zypp/RepoManager.cc:1784
-#, c-format
+#: zypp/RepoManager.cc:652 zypp/RepoManager.cc:1580 zypp/RepoManager.cc:1662
+#: zypp/RepoManager.cc:1736 zypp/RepoManager.cc:1801 zypp/RepoManager.cc:1927
+#, c-format, boost-format
 msgid "Can't open file '%s' for writing."
 msgstr "Kan ikke åpne filen '%s' for å skrive til den."
 
 #: zypp/base/InterProcessMutex.cc:83
-#, c-format
+#, c-format, boost-format
 msgid "Can't open lock file: %s"
 msgstr "Kan ikke åpne låsefil: %s"
 
-#: zypp/ExternalProgram.cc:266
-#, c-format
+#: zypp/ExternalProgram.cc:269
+#, c-format, boost-format
 msgid "Can't open pipe (%s)."
 msgstr "Kan ikke åpne pipe (%s)."
 
-#: zypp/ExternalProgram.cc:255
-#, c-format
+#: zypp/ExternalProgram.cc:258
+#, c-format, boost-format
 msgid "Can't open pty (%s)."
 msgstr "Kunne ikke åpne pty: %s."
 
 #: zypp/repo/RepoProvideFile.cc:259
-#, c-format
+#, c-format, boost-format
 msgid "Can't provide file '%s' from repository '%s'"
 msgstr "Kan ikke hente filen '%s' i pakkebrønnen '%s'"
 
@@ -802,7 +811,7 @@
 msgstr "Kan ikke angi rekursive muteksattributter"
 
 #. :BLZ:084:
-#: zypp/CountryCode.cc:238
+#: zypp/CountryCode.cc:194
 msgid "Canada"
 msgstr "Canada"
 
@@ -811,202 +820,212 @@
 msgstr "Kan ikke løse ut medium"
 
 #: zypp/media/MediaException.cc:184
-#, c-format
+#, c-format, boost-format
 msgid "Cannot eject media '%s'"
 msgstr "Kan ikke løse ut mediet '%s'"
 
 #: zypp/media/MediaException.cc:231
-#, c-format
+#, c-format, boost-format
 msgid "Cannot find available loop device to mount the image file from '%s'"
 msgstr "Kan ikke finne noen tilgjengelig loop-enhet for å montere diskbildefilen fra '%s'"
 
+#: zypp/RepoManager.cc:227
+#, boost-format
+msgid "Cannot read repo directory '%1%': Permission denied"
+msgstr ""
+
+#: zypp/RepoManager.cc:245
+#, boost-format
+msgid "Cannot read repo file '%1%': Permission denied"
+msgstr ""
+
 #: zypp/media/MediaException.cc:67
-#, c-format
+#, c-format, boost-format
 msgid "Cannot write file '%s'."
 msgstr "Kan ikke lagre filen '%s'."
 
 #. :CUB:192:
-#: zypp/CountryCode.cc:252
+#: zypp/CountryCode.cc:208
 msgid "Cape Verde"
 msgstr "Kapp Verde"
 
 #. language code: car
-#: zypp/LanguageCode.cc:350
+#: zypp/LanguageCode.cc:305
 msgid "Carib"
 msgstr "Karibisk"
 
 #. language code: cat ca
-#: zypp/LanguageCode.cc:352
+#: zypp/LanguageCode.cc:307
 msgid "Catalan"
 msgstr "Katalansk"
 
 #. language code: cau
-#: zypp/LanguageCode.cc:354
+#: zypp/LanguageCode.cc:309
 msgid "Caucasian (Other)"
 msgstr "Kaukasisk (annet)"
 
 #. :KWT:414:
-#: zypp/CountryCode.cc:324
+#: zypp/CountryCode.cc:280
 msgid "Cayman Islands"
 msgstr "Caymanøyene"
 
 #. language code: ceb
-#: zypp/LanguageCode.cc:356
+#: zypp/LanguageCode.cc:311
 msgid "Cebuano"
 msgstr "Cebuano"
 
 #. language code: cel
-#: zypp/LanguageCode.cc:358
+#: zypp/LanguageCode.cc:313
 msgid "Celtic (Other)"
 msgstr "Keltisk (annet)"
 
 # CF
 # fuzzy
 #. :COD:180:
-#: zypp/CountryCode.cc:241
+#: zypp/CountryCode.cc:197
 msgid "Central African Republic"
 msgstr "Den sentralafrikanske republikken"
 
 #. language code: cai
-#: zypp/LanguageCode.cc:348
+#: zypp/LanguageCode.cc:303
 msgid "Central American Indian (Other)"
 msgstr "Mellomamerikansk indiansk (annet)"
 
 # TD
 # fuzzy
 #. :TCA:796:
-#: zypp/CountryCode.cc:413
+#: zypp/CountryCode.cc:369
 msgid "Chad"
 msgstr "Tsjad"
 
 #. language code: chg
-#: zypp/LanguageCode.cc:366
+#: zypp/LanguageCode.cc:321
 msgid "Chagatai"
 msgstr "Chagatai"
 
 #. language code: cmc
-#: zypp/LanguageCode.cc:390
+#: zypp/LanguageCode.cc:345
 msgid "Chamic Languages"
 msgstr "Chamiske språk"
 
 #. language code: cha ch
-#: zypp/LanguageCode.cc:360
+#: zypp/LanguageCode.cc:315
 msgid "Chamorro"
 msgstr "Chamorro"
 
 #. Translator: %s = name of an rpm package. A list of diffs follows
 #. this message.
-#: zypp/target/rpm/RpmDb.cc:1769
-#, c-format
+#: zypp/target/rpm/RpmDb.cc:1849
+#, c-format, boost-format
 msgid "Changed configuration files for %s:"
 msgstr "Endrede konfigurasjonsfiler for %s:"
 
 #. language code: che ce
-#: zypp/LanguageCode.cc:364
+#: zypp/LanguageCode.cc:319
 msgid "Chechen"
 msgstr "Tsjetsjensk"
 
 #. language code: chr
-#: zypp/LanguageCode.cc:382
+#: zypp/LanguageCode.cc:337
 msgid "Cherokee"
 msgstr "Cherokee"
 
 #. language code: chy
-#: zypp/LanguageCode.cc:388
+#: zypp/LanguageCode.cc:343
 msgid "Cheyenne"
 msgstr "Cheyenne"
 
 #. language code: chb
-#: zypp/LanguageCode.cc:362
+#: zypp/LanguageCode.cc:317
 msgid "Chibcha"
 msgstr "Chibcha"
 
 #. language code: nya ny
-#: zypp/LanguageCode.cc:864
+#: zypp/LanguageCode.cc:819
 msgid "Chichewa"
 msgstr "Chichewa"
 
 #. :COK:184:
-#: zypp/CountryCode.cc:246
+#: zypp/CountryCode.cc:202
 msgid "Chile"
 msgstr "Chile"
 
 #. :CMR:120:
-#: zypp/CountryCode.cc:248
+#: zypp/CountryCode.cc:204
 msgid "China"
 msgstr "Kina"
 
 #. language code: chi zho zh
-#: zypp/LanguageCode.cc:368 zypp/LanguageCode.cc:370
+#: zypp/LanguageCode.cc:323 zypp/LanguageCode.cc:325
 msgid "Chinese"
 msgstr "Kinesisk"
 
 #. language code: chn
-#: zypp/LanguageCode.cc:376
+#: zypp/LanguageCode.cc:331
 msgid "Chinook Jargon"
 msgstr "Chinook-sjargong"
 
 #. language code: chp
-#: zypp/LanguageCode.cc:380
+#: zypp/LanguageCode.cc:335
 msgid "Chipewyan"
 msgstr "Chipewyan"
 
 #. language code: cho
-#: zypp/LanguageCode.cc:378
+#: zypp/LanguageCode.cc:333
 msgid "Choctaw"
 msgstr "Choctaw"
 
 #. :CPV:132:
-#: zypp/CountryCode.cc:253
+#: zypp/CountryCode.cc:209
 msgid "Christmas Island"
 msgstr "Christmasøya"
 
 #. language code: chu cu
-#: zypp/LanguageCode.cc:384
+#: zypp/LanguageCode.cc:339
 msgid "Church Slavic"
 msgstr "Kirkeslavisk"
 
 #. language code: chk
-#: zypp/LanguageCode.cc:372
+#: zypp/LanguageCode.cc:327
 msgid "Chuukese"
 msgstr "Chuukese"
 
 #. language code: chv cv
-#: zypp/LanguageCode.cc:386
+#: zypp/LanguageCode.cc:341
 msgid "Chuvash"
 msgstr "Chuvash"
 
 #. language code: nwc
-#: zypp/LanguageCode.cc:862
+#: zypp/LanguageCode.cc:817
 msgid "Classical Newari"
 msgstr "Klassisk Newari"
 
 #. :CAN:124:
-#: zypp/CountryCode.cc:239
+#: zypp/CountryCode.cc:195
 msgid "Cocos (Keeling) Islands"
 msgstr "Kokosøyene"
 
 #. :CHN:156:
-#: zypp/CountryCode.cc:249
+#: zypp/CountryCode.cc:205
 msgid "Colombia"
 msgstr "Colombia"
 
-#: zypp/ExternalProgram.cc:497
-#, c-format
+#: zypp/ExternalProgram.cc:507
+#, c-format, boost-format
 msgid "Command exited with status %d."
 msgstr "Kommandoen ble avsluttet med status %d."
 
-#: zypp/ExternalProgram.cc:522
+#: zypp/ExternalProgram.cc:532
 msgid "Command exited with unknown error."
 msgstr "Kommandoen ble avsluttet med en ukjent feil."
 
-#: zypp/ExternalProgram.cc:517
-#, c-format
+#: zypp/ExternalProgram.cc:527
+#, c-format, boost-format
 msgid "Command was killed by signal %d (%s)."
 msgstr "Kommandoen ble drept av signalet %d (%s)."
 
 #. :KIR:296:
-#: zypp/CountryCode.cc:319
+#: zypp/CountryCode.cc:275
 msgid "Comoros"
 msgstr "Komorene"
 
@@ -1016,179 +1035,179 @@
 
 #. :CCK:166:
 #. :CAF:140:
-#: zypp/CountryCode.cc:240 zypp/CountryCode.cc:242
+#: zypp/CountryCode.cc:196 zypp/CountryCode.cc:198
 msgid "Congo"
 msgstr "Kongo"
 
 #. :CIV:384:
-#: zypp/CountryCode.cc:245
+#: zypp/CountryCode.cc:201
 msgid "Cook Islands"
 msgstr "Cookøyene"
 
 #. language code: cop
-#: zypp/LanguageCode.cc:392
+#: zypp/LanguageCode.cc:347
 msgid "Coptic"
 msgstr "Koptisk"
 
 #. language code: cor kw
-#: zypp/LanguageCode.cc:394
+#: zypp/LanguageCode.cc:349
 msgid "Cornish"
 msgstr "Kornisk"
 
 #. language code: cos co
-#: zypp/LanguageCode.cc:396
+#: zypp/LanguageCode.cc:351
 msgid "Corsican"
 msgstr "Korsikansk"
 
 #. :COL:170:
-#: zypp/CountryCode.cc:250
+#: zypp/CountryCode.cc:206
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
 #. :CHE:756:
-#: zypp/CountryCode.cc:244
+#: zypp/CountryCode.cc:200
 msgid "Cote D'Ivoire"
 msgstr "Elfenbenskysten"
 
 #. language code: cre cr
-#: zypp/LanguageCode.cc:404
+#: zypp/LanguageCode.cc:359
 msgid "Cree"
 msgstr "Cree"
 
 #. language code: mus
-#: zypp/LanguageCode.cc:810
+#: zypp/LanguageCode.cc:765
 msgid "Creek"
 msgstr "Creek"
 
 #. language code: crp
-#: zypp/LanguageCode.cc:408
+#: zypp/LanguageCode.cc:363
 msgid "Creoles and Pidgins (Other)"
 msgstr "Kreolsk og pidgin (annet)"
 
 #. language code: cpe
-#: zypp/LanguageCode.cc:398
+#: zypp/LanguageCode.cc:353
 msgid "Creoles and Pidgins, English-Based (Other)"
 msgstr "Kreolsk og pidgin, engelskbasert (annet)"
 
 #. language code: cpf
-#: zypp/LanguageCode.cc:400
+#: zypp/LanguageCode.cc:355
 msgid "Creoles and Pidgins, French-Based (Other)"
 msgstr "Kreolsk og pidgin, franskbasert (annet)"
 
 #. language code: cpp
-#: zypp/LanguageCode.cc:402
+#: zypp/LanguageCode.cc:357
 msgid "Creoles and Pidgins, Portuguese-Based (Other)"
 msgstr "Kreolsk og pidgin, portugisiskbasert (annet)"
 
 #. language code: crh
-#: zypp/LanguageCode.cc:406
+#: zypp/LanguageCode.cc:361
 msgid "Crimean Tatar"
 msgstr "Krim-tatar"
 
 #. :HND:340:
-#: zypp/CountryCode.cc:298
+#: zypp/CountryCode.cc:254
 msgid "Croatia"
 msgstr "Kroatia"
 
 #. language code: scr hrv hr
-#: zypp/LanguageCode.cc:976 zypp/LanguageCode.cc:978
+#: zypp/LanguageCode.cc:931 zypp/LanguageCode.cc:933
 msgid "Croatian"
 msgstr "Kroatisk"
 
 # CU
 # fuzzy
 #. :CRI:188:
-#: zypp/CountryCode.cc:251
+#: zypp/CountryCode.cc:207
 msgid "Cuba"
 msgstr "Cuba"
 
 #. language code: cus
-#: zypp/LanguageCode.cc:412
+#: zypp/LanguageCode.cc:367
 msgid "Cushitic (Other)"
 msgstr "Cushitisk (annet)"
 
 #. :CXR:162:
-#: zypp/CountryCode.cc:254
+#: zypp/CountryCode.cc:210
 msgid "Cyprus"
 msgstr "Kypros"
 
 #. language code: cze ces cs
-#: zypp/LanguageCode.cc:414 zypp/LanguageCode.cc:416
+#: zypp/LanguageCode.cc:369 zypp/LanguageCode.cc:371
 msgid "Czech"
 msgstr "Tsjekkisk"
 
 #. :CYP:196:
-#: zypp/CountryCode.cc:255
+#: zypp/CountryCode.cc:211
 msgid "Czech Republic"
 msgstr "Tsjekkia"
 
 #. language code: dak
-#: zypp/LanguageCode.cc:418
+#: zypp/LanguageCode.cc:373
 msgid "Dakota"
 msgstr "Dakota"
 
 #. language code: dan da
-#: zypp/LanguageCode.cc:420
+#: zypp/LanguageCode.cc:375
 msgid "Danish"
 msgstr "Dansk"
 
 #. language code: dar
-#: zypp/LanguageCode.cc:422
+#: zypp/LanguageCode.cc:377
 msgid "Dargwa"
 msgstr "Dargwa"
 
 #. language code: day
-#: zypp/LanguageCode.cc:424
+#: zypp/LanguageCode.cc:379
 msgid "Dayak"
 msgstr "Dayak"
 
 #. language code: del
-#: zypp/LanguageCode.cc:426
+#: zypp/LanguageCode.cc:381
 msgid "Delaware"
 msgstr "Delaware"
 
 #. :DJI:262:
-#: zypp/CountryCode.cc:258
+#: zypp/CountryCode.cc:214
 msgid "Denmark"
 msgstr "Danmark"
 
 #. language code: din
-#: zypp/LanguageCode.cc:432
+#: zypp/LanguageCode.cc:387
 msgid "Dinka"
 msgstr "Dinka"
 
 #. language code: div dv
-#: zypp/LanguageCode.cc:434
+#: zypp/LanguageCode.cc:389
 msgid "Divehi"
 msgstr "Divehi"
 
 #. :DEU:276:
-#: zypp/CountryCode.cc:257
+#: zypp/CountryCode.cc:213
 msgid "Djibouti"
 msgstr "Djibouti"
 
 #. language code: doi
-#: zypp/LanguageCode.cc:436
+#: zypp/LanguageCode.cc:391
 msgid "Dogri"
 msgstr "Dogri"
 
 #. language code: dgr
-#: zypp/LanguageCode.cc:430
+#: zypp/LanguageCode.cc:385
 msgid "Dogrib"
 msgstr "Dogrib"
 
 #. :DNK:208:
-#: zypp/CountryCode.cc:259
+#: zypp/CountryCode.cc:215
 msgid "Dominica"
 msgstr "Dominica"
 
 #. :DMA:212:
-#: zypp/CountryCode.cc:260
+#: zypp/CountryCode.cc:216
 msgid "Dominican Republic"
 msgstr "Den dominikanske republikk"
 
 #: zypp/media/MediaException.cc:152
-#, c-format
+#, c-format, boost-format
 msgid ""
 "Download (curl) error for '%s':\n"
 "Error code: %s\n"
@@ -1200,83 +1219,83 @@
 
 #. TranslatorExplanation: curl is the name of a library, don't translate
 #: zypp/media/MediaException.cc:84
-#, c-format
+#, c-format, boost-format
 msgid "Download (curl) initialization failed for '%s'"
 msgstr "Initialisering av nedlasting (curl) mislyktes for '%s'"
 
 #. language code: dra
-#: zypp/LanguageCode.cc:438
+#: zypp/LanguageCode.cc:393
 msgid "Dravidian (Other)"
 msgstr "Dravidisk (annet)"
 
 #. language code: dua
-#: zypp/LanguageCode.cc:442
+#: zypp/LanguageCode.cc:397
 msgid "Duala"
 msgstr "Duala"
 
 #. dubious: Throw on malformed known types, otherwise log a warning.
-#: zypp/CheckSum.cc:95
-#, c-format
+#: zypp/CheckSum.cc:136
+#, c-format, boost-format
 msgid "Dubious type '%s' for %u byte checksum '%s'"
 msgstr "Tvilsom type '%s' for %u byte-kontrollsum '%s'"
 
 #. language code: dut nld nl
-#: zypp/LanguageCode.cc:446 zypp/LanguageCode.cc:448
+#: zypp/LanguageCode.cc:401 zypp/LanguageCode.cc:403
 msgid "Dutch"
 msgstr "Nederlandsk"
 
 #. language code: dum
-#: zypp/LanguageCode.cc:444
+#: zypp/LanguageCode.cc:399
 msgid "Dutch, Middle (ca.1050-1350)"
 msgstr "Mellomnederlandsk (ca. 1050-1350)"
 
 #. language code: dyu
-#: zypp/LanguageCode.cc:450
+#: zypp/LanguageCode.cc:405
 msgid "Dyula"
 msgstr "Dyula"
 
 #. language code: dzo dz
-#: zypp/LanguageCode.cc:452
+#: zypp/LanguageCode.cc:407
 msgid "Dzongkha"
 msgstr "Dzongkha"
 
 #. :TON:776:
-#: zypp/CountryCode.cc:422
+#: zypp/CountryCode.cc:378
 msgid "East Timor"
 msgstr "Øst-Timor"
 
 #. :DZA:012:
-#: zypp/CountryCode.cc:262
+#: zypp/CountryCode.cc:218
 msgid "Ecuador"
 msgstr "Ecuador"
 
 #. language code: efi
-#: zypp/LanguageCode.cc:454
+#: zypp/LanguageCode.cc:409
 msgid "Efik"
 msgstr "Efik"
 
 #. :EST:233:
-#: zypp/CountryCode.cc:264
+#: zypp/CountryCode.cc:220
 msgid "Egypt"
 msgstr "Egypt"
 
 #. language code: egy
-#: zypp/LanguageCode.cc:456
+#: zypp/LanguageCode.cc:411
 msgid "Egyptian (Ancient)"
 msgstr "Egyptisk (gammelt)"
 
 #. language code: eka
-#: zypp/LanguageCode.cc:458
+#: zypp/LanguageCode.cc:413
 msgid "Ekajuk"
 msgstr "Ekajuk"
 
 #. :STP:678:
-#: zypp/CountryCode.cc:409
+#: zypp/CountryCode.cc:365
 msgid "El Salvador"
 msgstr "El Salvador"
 
 #. language code: elx
-#: zypp/LanguageCode.cc:460
+#: zypp/LanguageCode.cc:415
 msgid "Elamite"
 msgstr "Elamitisk"
 
@@ -1297,17 +1316,17 @@
 msgstr "Kodet streng inneholder nullbyte"
 
 #. language code: eng en
-#: zypp/LanguageCode.cc:462
+#: zypp/LanguageCode.cc:417
 msgid "English"
 msgstr "Engelsk"
 
 #. language code: enm
-#: zypp/LanguageCode.cc:464
+#: zypp/LanguageCode.cc:419
 msgid "English, Middle (1100-1500)"
 msgstr "Engelsk, mellomengelsk (1100-1500)"
 
 #. language code: ang
-#: zypp/LanguageCode.cc:242
+#: zypp/LanguageCode.cc:197
 msgid "English, Old (ca.450-1100)"
 msgstr "Engelsk, gammelengelsk (ca. 450-1100)"
 
@@ -1316,24 +1335,24 @@
 msgstr "Forbedringer"
 
 #. :GLP:312:
-#: zypp/CountryCode.cc:288
+#: zypp/CountryCode.cc:244
 msgid "Equatorial Guinea"
 msgstr "Ekvatorial-Guinea"
 
 #. :ESH:732:
-#: zypp/CountryCode.cc:266
+#: zypp/CountryCode.cc:222
 msgid "Eritrea"
 msgstr "Eritrea"
 
 #. TranslatorExplanation: curl is the name of a library, don't translate
 #: zypp/media/MediaException.cc:161
-#, c-format
+#, c-format, boost-format
 msgid "Error occurred while setting download (curl) options for '%s':"
 msgstr "Feil under definisjon av nedlastingsvalg (curl) for '%s':"
 
-#: zypp/target/TargetImpl.cc:646 zypp/target/TargetImpl.cc:666
-#: zypp/target/TargetImpl.cc:694 zypp/target/TargetImpl.cc:731
-#: zypp/target/TargetImpl.cc:739
+#: zypp/target/TargetImpl.cc:657 zypp/target/TargetImpl.cc:677
+#: zypp/target/TargetImpl.cc:705 zypp/target/TargetImpl.cc:742
+#: zypp/target/TargetImpl.cc:750
 msgid "Error sending update message notification."
 msgstr "Feil ved sending av melding om oppdatering."
 
@@ -1343,134 +1362,135 @@
 #. on ftp file-not-found(bnc #335906). Instead we'll check another types
 #. before throwing.
 #. TranslatorExplanation '%s' is an URL
-#: zypp/RepoManager.cc:1231 zypp/RepoManager.cc:2177
-#, c-format
+#: zypp/RepoManager.cc:1344 zypp/RepoManager.cc:2402
+#, c-format, boost-format
 msgid "Error trying to read from '%s'"
 msgstr "Feil under lesing fra '%s'"
 
 # SY
 # fuzzy
 #. language code: myv
-#: zypp/LanguageCode.cc:818
+#: zypp/LanguageCode.cc:773
 msgid "Erzya"
 msgstr "Erzya"
 
 #. language code: epo eo
-#: zypp/LanguageCode.cc:466
+#: zypp/LanguageCode.cc:421
 msgid "Esperanto"
 msgstr "Esperanto"
 
 #. :ECU:218:
-#: zypp/CountryCode.cc:263
+#: zypp/CountryCode.cc:219
 msgid "Estonia"
 msgstr "Estland"
 
 #. language code: est et
-#: zypp/LanguageCode.cc:468
+#: zypp/LanguageCode.cc:423
 msgid "Estonian"
 msgstr "Estisk"
 
 # ET
 # fuzzy
 #. :ESP:724:
-#: zypp/CountryCode.cc:268
+#: zypp/CountryCode.cc:224
 msgid "Ethiopia"
 msgstr "Estonia"
 
 #. language code: ewe ee
-#: zypp/LanguageCode.cc:470
+#: zypp/LanguageCode.cc:425
 msgid "Ewe"
 msgstr "Ewe"
 
 #. language code: ewo
-#: zypp/LanguageCode.cc:472
+#: zypp/LanguageCode.cc:427
 msgid "Ewondo"
 msgstr "Ewondo"
 
-#: zypp/RepoManager.cc:1191
-#, c-format
+#: zypp/RepoManager.cc:1296
+#, c-format, boost-format
 msgid "Failed to cache repo (%d)."
 msgstr "Kunne ikke mellomlagre pakkebrønn (%d)."
 
-#: zypp/KeyRing.cc:555
+#: zypp/KeyRing.cc:568
 msgid "Failed to delete key."
 msgstr "Kunne ikke slette nøkkel."
 
-#: zypp/target/rpm/RpmDb.cc:1123
-#, c-format
+#: zypp/target/rpm/RpmDb.cc:1127
+#, c-format, boost-format
 msgid "Failed to import public key from file %s: %s"
 msgstr "Kunne ikke importere offentlig nøkkel fra filen %s: %s"
 
 #: zypp/media/MediaException.cc:31
-#, c-format
+#, c-format, boost-format
 msgid "Failed to mount %s on %s"
 msgstr "Kunne ikke montere %s på %s"
 
 #. TranslatorExplanation %s = name of the package being processed.
-#: zypp/repo/PackageProvider.cc:255
-#, c-format
+#: zypp/repo/PackageProvider.cc:386
+#, c-format, boost-format
 msgid "Failed to provide Package %s. Do you want to retry retrieval?"
 msgstr "Kunne ikke hente pakken %s. Vil du førsøke å hente den på nytt?"
 
 #. TranslatorExplanation '%s' is a pathname
-#: zypp/RepoManager.cc:227 zypp/RepoManager.cc:620 zypp/RepoManager.cc:1318
+#: zypp/RepoManager.cc:235 zypp/RepoManager.cc:697 zypp/RepoManager.cc:1453
 #: zypp/repo/PluginServices.cc:49
-#, c-format
+#, c-format, boost-format
 msgid "Failed to read directory '%s'"
 msgstr "Kunnne ikke lese katalogen: '%s'."
 
-#: zypp/target/rpm/RpmDb.cc:1194
-#, c-format
+#: zypp/target/rpm/RpmDb.cc:1198
+#, c-format, boost-format
 msgid "Failed to remove public key %s: %s"
 msgstr "Kunne ikke fjerne offentlig nøkkel %s: %s"
 
 #: zypp/media/MediaException.cc:41
-#, c-format
+#, c-format, boost-format
 msgid "Failed to unmount %s"
 msgstr "Kunne ikke avmontere %s"
 
 #. :FJI:242:
-#: zypp/CountryCode.cc:271
+#: zypp/CountryCode.cc:227
 msgid "Falkland Islands (Malvinas)"
 msgstr "Falklandsøyene (Malvinas)"
 
 #. language code: fan
-#: zypp/LanguageCode.cc:474
+#: zypp/LanguageCode.cc:429
 msgid "Fang"
 msgstr "Fang"
 
 #. language code: fat
-#: zypp/LanguageCode.cc:478
+#: zypp/LanguageCode.cc:433
 msgid "Fanti"
 msgstr "Fanti"
 
 #. :FSM:583:
-#: zypp/CountryCode.cc:273
+#: zypp/CountryCode.cc:229
 msgid "Faroe Islands"
 msgstr "Færøyene"
 
 #. language code: fao fo
-#: zypp/LanguageCode.cc:476
+#: zypp/LanguageCode.cc:431
 msgid "Faroese"
 msgstr "Færøyisk"
 
 #. :FLK:238:
-#: zypp/CountryCode.cc:272
+#: zypp/CountryCode.cc:228
 msgid "Federated States of Micronesia"
 msgstr "Mikronesiaføderasjonen"
 
 #. :FIN:246:
-#: zypp/CountryCode.cc:270
+#: zypp/CountryCode.cc:226
 msgid "Fiji"
 msgstr "Fiji"
 
 #. language code: fij fj
-#: zypp/LanguageCode.cc:480
+#: zypp/LanguageCode.cc:435
 msgid "Fijian"
 msgstr "Fiji"
 
 #. TranslatorExplanation %1%(filename1) %2%(package1) %3%(filename2) %4%(package2)
 #: zypp/sat/FileConflicts.cc:94
+#, boost-format
 msgid ""
 "File %1%\n"
 "  from install of\n"
@@ -1483,6 +1503,7 @@
 
 #. TranslatorExplanation %1%(filename1) %2%(package1) %3%(filename2) %4%(package2)
 #: zypp/sat/FileConflicts.cc:86
+#, boost-format
 msgid ""
 "File %1%\n"
 "  from install of\n"
@@ -1495,6 +1516,7 @@
 
 #. TranslatorExplanation %1%(filename) %2%(package1) %3%(package2)
 #: zypp/sat/FileConflicts.cc:53
+#, boost-format
 msgid ""
 "File %1%\n"
 "  from install of\n"
@@ -1505,6 +1527,7 @@
 
 #. TranslatorExplanation %1%(filename) %2%(package1) %3%(package2)
 #: zypp/sat/FileConflicts.cc:47
+#, boost-format
 msgid ""
 "File %1%\n"
 "  from install of\n"
@@ -1515,6 +1538,7 @@
 
 #. TranslatorExplanation %1%(filename1) %2%(package1) %3%(filename2) %4%(package2)
 #: zypp/sat/FileConflicts.cc:77
+#, boost-format
 msgid ""
 "File %1%\n"
 "  from package\n"
@@ -1528,6 +1552,7 @@
 #. [lhs][rhs] 0 = installed; 1 = to be installed
 #. TranslatorExplanation %1%(filename1) %2%(package1) %%3%(filename2) 4%(package2)
 #: zypp/sat/FileConflicts.cc:69
+#, boost-format
 msgid ""
 "File %1%\n"
 "  from package\n"
@@ -1540,6 +1565,7 @@
 
 #. TranslatorExplanation %1%(filename) %2%(package1) %3%(package2)
 #: zypp/sat/FileConflicts.cc:40
+#, boost-format
 msgid ""
 "File %1%\n"
 "  from package\n"
@@ -1551,6 +1577,7 @@
 #. [lhs][rhs] 0 = installed; 1 = to be installed
 #. TranslatorExplanation %1%(filename) %2%(package1) %3%(package2)
 #: zypp/sat/FileConflicts.cc:34
+#, boost-format
 msgid ""
 "File %1%\n"
 "  from package\n"
@@ -1560,303 +1587,307 @@
 msgstr ""
 
 #: zypp/media/MediaException.cc:60
-#, c-format
+#, c-format, boost-format
 msgid "File '%s' not found on medium '%s'"
 msgstr "Filen '%s' ikke funnet på medium '%s'"
 
+#. translators: possible rpm package signature check result [brief]
+#: zypp/target/rpm/RpmDb.cc:2376
+msgid "File does not exist or signature can't be checked"
+msgstr ""
+
 #. language code: fil
-#: zypp/LanguageCode.cc:482
+#: zypp/LanguageCode.cc:437
 msgid "Filipino"
 msgstr "Filippinsk"
 
 #. :ETH:231:
-#: zypp/CountryCode.cc:269
+#: zypp/CountryCode.cc:225
 msgid "Finland"
 msgstr "Finland"
 
 #. language code: fin fi
-#: zypp/LanguageCode.cc:484
+#: zypp/LanguageCode.cc:439
 msgid "Finnish"
 msgstr "Finsk"
 
 #. language code: fiu
-#: zypp/LanguageCode.cc:486
+#: zypp/LanguageCode.cc:441
 msgid "Finno-Ugrian (Other)"
 msgstr "Finsk-ugrisk (annet)"
 
-#: zypp/solver/detail/ProblemSolutionCombi.cc:85
-#: zypp/solver/detail/ProblemSolutionCombi.cc:104
+#: zypp/ProblemSolution.cc:114
 msgid "Following actions will be done:"
 msgstr "Følgende handlinger vil bli utført:"
 
 #. language code: fon
-#: zypp/LanguageCode.cc:488
+#: zypp/LanguageCode.cc:443
 msgid "Fon"
 msgstr "Fon"
 
 #. :FRO:234:
-#: zypp/CountryCode.cc:274
+#: zypp/CountryCode.cc:230
 msgid "France"
 msgstr "Frankrike"
 
 #. language code: fre fra fr
-#: zypp/LanguageCode.cc:490 zypp/LanguageCode.cc:492
+#: zypp/LanguageCode.cc:445 zypp/LanguageCode.cc:447
 msgid "French"
 msgstr "Fransk"
 
 #. :GEO:268:
-#: zypp/CountryCode.cc:280
+#: zypp/CountryCode.cc:236
 msgid "French Guiana"
 msgstr "Fransk Guiana"
 
 #. :PER:604:
-#: zypp/CountryCode.cc:375
+#: zypp/CountryCode.cc:331
 msgid "French Polynesia"
 msgstr "Fransk Polynesia"
 
 #. :TCD:148:
-#: zypp/CountryCode.cc:414
+#: zypp/CountryCode.cc:370
 msgid "French Southern Territories"
 msgstr "Sørlige franske territorier"
 
 #. language code: frm
-#: zypp/LanguageCode.cc:494
+#: zypp/LanguageCode.cc:449
 msgid "French, Middle (ca.1400-1600)"
 msgstr "Fransk, mellomfransk (ca. 1400-1600)"
 
 #. language code: fro
-#: zypp/LanguageCode.cc:496
+#: zypp/LanguageCode.cc:451
 msgid "French, Old (842-ca.1400)"
 msgstr "Fransk, gammelfransk (842-ca. 1400)"
 
 #. language code: fry fy
-#: zypp/LanguageCode.cc:498
+#: zypp/LanguageCode.cc:453
 msgid "Frisian"
 msgstr "Frisisk"
 
 #. language code: fur
-#: zypp/LanguageCode.cc:502
+#: zypp/LanguageCode.cc:457
 msgid "Friulian"
 msgstr "Friuliansk"
 
 #. language code: ful ff
-#: zypp/LanguageCode.cc:500
+#: zypp/LanguageCode.cc:455
 msgid "Fulah"
 msgstr "Fulah"
 
 #. language code: gaa
-#: zypp/LanguageCode.cc:504
+#: zypp/LanguageCode.cc:459
 msgid "Ga"
 msgstr "Ga"
 
 # GH
 # fuzzy
 #. :FXX:249:
-#: zypp/CountryCode.cc:276
+#: zypp/CountryCode.cc:232
 msgid "Gabon"
 msgstr "Gabon"
 
 #. language code: gla gd
-#: zypp/LanguageCode.cc:524
+#: zypp/LanguageCode.cc:479
 msgid "Gaelic"
 msgstr "Gælisk"
 
 #. language code: glg gl
-#: zypp/LanguageCode.cc:528
+#: zypp/LanguageCode.cc:483
 msgid "Galician"
 msgstr "Galisisk"
 
 # GM
 # fuzzy
 #. :GRL:304:
-#: zypp/CountryCode.cc:285
+#: zypp/CountryCode.cc:241
 msgid "Gambia"
 msgstr "Jamaica"
 
 # GH
 # fuzzy
 #. language code: lug lg
-#: zypp/LanguageCode.cc:730
+#: zypp/LanguageCode.cc:685
 msgid "Ganda"
 msgstr "Ganda"
 
 # GH
 # fuzzy
 #. language code: gay
-#: zypp/LanguageCode.cc:506
+#: zypp/LanguageCode.cc:461
 msgid "Gayo"
 msgstr "Gayo"
 
 #. language code: gba
-#: zypp/LanguageCode.cc:508
+#: zypp/LanguageCode.cc:463
 msgid "Gbaya"
 msgstr "Gbaya"
 
 #. language code: gez
-#: zypp/LanguageCode.cc:520
+#: zypp/LanguageCode.cc:475
 msgid "Geez"
 msgstr "Geez"
 
 #. :GRD:308:
-#: zypp/CountryCode.cc:279
+#: zypp/CountryCode.cc:235
 msgid "Georgia"
 msgstr "Georgia"
 
 #. language code: geo kat ka
-#: zypp/LanguageCode.cc:512 zypp/LanguageCode.cc:514
+#: zypp/LanguageCode.cc:467 zypp/LanguageCode.cc:469
 msgid "Georgian"
 msgstr "Georgisk"
 
 #. language code: ger deu de
-#: zypp/LanguageCode.cc:516 zypp/LanguageCode.cc:518
+#: zypp/LanguageCode.cc:471 zypp/LanguageCode.cc:473
 msgid "German"
 msgstr "Tysk"
 
 #. language code: gmh
-#: zypp/LanguageCode.cc:532
+#: zypp/LanguageCode.cc:487
 msgid "German, Middle High (ca.1050-1500)"
 msgstr "Tysk, mellomhøytysk (ca. 1050-1500)"
 
 #. language code: goh
-#: zypp/LanguageCode.cc:534
+#: zypp/LanguageCode.cc:489
 msgid "German, Old High (ca.750-1050)"
 msgstr "Tysk, gammelhøytysk (ca. 750-1050)"
 
 #. language code: gem
-#: zypp/LanguageCode.cc:510
+#: zypp/LanguageCode.cc:465
 msgid "Germanic (Other)"
 msgstr "Germansk (annet)"
 
 #. :CZE:203:
-#: zypp/CountryCode.cc:256
+#: zypp/CountryCode.cc:212
 msgid "Germany"
 msgstr "Tyskland"
 
 # GH
 # fuzzy
-#: zypp/CountryCode.cc:282
+#: zypp/CountryCode.cc:238
 msgid "Ghana"
 msgstr "Ghana"
 
 #. :GHA:288:
-#: zypp/CountryCode.cc:283
+#: zypp/CountryCode.cc:239
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
 #. language code: gil
-#: zypp/LanguageCode.cc:522
+#: zypp/LanguageCode.cc:477
 msgid "Gilbertese"
 msgstr "Gilbertesisk"
 
 #. language code: gon
-#: zypp/LanguageCode.cc:536
+#: zypp/LanguageCode.cc:491
 msgid "Gondi"
 msgstr "Gondi"
 
 #. language code: gor
-#: zypp/LanguageCode.cc:538
+#: zypp/LanguageCode.cc:493
 msgid "Gorontalo"
 msgstr "Gorontalo"
 
 #. language code: got
-#: zypp/LanguageCode.cc:540
+#: zypp/LanguageCode.cc:495
 msgid "Gothic"
 msgstr "Gotisk"
 
 #. language code: grb
-#: zypp/LanguageCode.cc:542
+#: zypp/LanguageCode.cc:497
 msgid "Grebo"
 msgstr "Grebo"
 
 #. :GNQ:226:
-#: zypp/CountryCode.cc:289
+#: zypp/CountryCode.cc:245
 msgid "Greece"
 msgstr "Hellas"
 
 #. language code: grc
-#: zypp/LanguageCode.cc:544
+#: zypp/LanguageCode.cc:499
 msgid "Greek, Ancient (to 1453)"
 msgstr "Gresk, gammelgresk (til 1453)"
 
 #. language code: gre ell el
-#: zypp/LanguageCode.cc:546 zypp/LanguageCode.cc:548
+#: zypp/LanguageCode.cc:501 zypp/LanguageCode.cc:503
 msgid "Greek, Modern (1453-)"
 msgstr "Gresk, moderne (1453-)"
 
 #. :GIB:292:
-#: zypp/CountryCode.cc:284
+#: zypp/CountryCode.cc:240
 msgid "Greenland"
 msgstr "Grønland"
 
 #. :GBR:826:
-#: zypp/CountryCode.cc:278
+#: zypp/CountryCode.cc:234
 msgid "Grenada"
 msgstr "Grenada"
 
 #. :GIN:324:
-#: zypp/CountryCode.cc:287
+#: zypp/CountryCode.cc:243
 msgid "Guadeloupe"
 msgstr "Guadeloupe"
 
 #. :GTM:320:
-#: zypp/CountryCode.cc:292
+#: zypp/CountryCode.cc:248
 msgid "Guam"
 msgstr "Guam"
 
 #. language code: grn gn
-#: zypp/LanguageCode.cc:550
+#: zypp/LanguageCode.cc:505
 msgid "Guarani"
 msgstr "Guarani"
 
 #. :SGS:239:
-#: zypp/CountryCode.cc:291
+#: zypp/CountryCode.cc:247
 msgid "Guatemala"
 msgstr "Guatemala"
 
 #. :GUF:254:
-#: zypp/CountryCode.cc:281
+#: zypp/CountryCode.cc:237
 msgid "Guernsey"
 msgstr "Guernsey"
 
 #. :GMB:270:
-#: zypp/CountryCode.cc:286
+#: zypp/CountryCode.cc:242
 msgid "Guinea"
 msgstr "Guinea"
 
 #. :GUM:316:
-#: zypp/CountryCode.cc:293
+#: zypp/CountryCode.cc:249
 msgid "Guinea-Bissau"
 msgstr "Guinea-Bissau"
 
 #. language code: guj gu
-#: zypp/LanguageCode.cc:552
+#: zypp/LanguageCode.cc:507
 msgid "Gujarati"
 msgstr "Gujarati"
 
 # GH
 # fuzzy
 #. :GNB:624:
-#: zypp/CountryCode.cc:294
+#: zypp/CountryCode.cc:250
 msgid "Guyana"
 msgstr "Guyana"
 
 #. language code: gwi
-#: zypp/LanguageCode.cc:554
+#: zypp/LanguageCode.cc:509
 msgid "Gwich'in"
 msgstr "Gwich'in"
 
 #. language code: hai
-#: zypp/LanguageCode.cc:556
+#: zypp/LanguageCode.cc:511
 msgid "Haida"
 msgstr "Haida"
 
 #. :HRV:191:
-#: zypp/CountryCode.cc:299
+#: zypp/CountryCode.cc:255
 msgid "Haiti"
 msgstr "Haiti"
 
 #. language code: hat ht
-#: zypp/LanguageCode.cc:558
+#: zypp/LanguageCode.cc:513
 msgid "Haitian"
 msgstr "Haitisk"
 
@@ -1878,52 +1909,51 @@
 msgstr "HalVolume ikke initialisert"
 
 #. language code: hau ha
-#: zypp/LanguageCode.cc:560
+#: zypp/LanguageCode.cc:515
 msgid "Hausa"
 msgstr "Hausa"
 
-#: zypp/solver/detail/SATResolver.cc:1015
-#: zypp/solver/detail/SATResolver.cc:1019
+#: zypp/solver/detail/SATResolver.cc:993 zypp/solver/detail/SATResolver.cc:997
 msgid "Have you enabled all requested repositories?"
 msgstr "Har du aktivert alle nødvendige pakkebrønner?"
 
 #. language code: haw
-#: zypp/LanguageCode.cc:562
+#: zypp/LanguageCode.cc:517
 msgid "Hawaiian"
 msgstr "Hawaiiansk"
 
 #. :HKG:344:
-#: zypp/CountryCode.cc:296
+#: zypp/CountryCode.cc:252
 msgid "Heard Island and McDonald Islands"
 msgstr "Heardøya og Mcdonaldøyene"
 
 #. language code: heb he
-#: zypp/LanguageCode.cc:564
+#: zypp/LanguageCode.cc:519
 msgid "Hebrew"
 msgstr "Hebraisk"
 
 #. language code: her hz
-#: zypp/LanguageCode.cc:566
+#: zypp/LanguageCode.cc:521
 msgid "Herero"
 msgstr "Herero"
 
 #. language code: hil
-#: zypp/LanguageCode.cc:568
+#: zypp/LanguageCode.cc:523
 msgid "Hiligaynon"
 msgstr "Hiligaynon"
 
 #. language code: him
-#: zypp/LanguageCode.cc:570
+#: zypp/LanguageCode.cc:525
 msgid "Himachali"
 msgstr "Himachali"
 
 #. language code: hin hi
-#: zypp/LanguageCode.cc:572
+#: zypp/LanguageCode.cc:527
 msgid "Hindi"
 msgstr "Hindi"
 
 #. language code: hmo ho
-#: zypp/LanguageCode.cc:578
+#: zypp/LanguageCode.cc:533
 msgid "Hiri Motu"
 msgstr "Hirimotu"
 
@@ -1933,154 +1963,154 @@
 msgstr "Historie:"
 
 #. language code: hit
-#: zypp/LanguageCode.cc:574
+#: zypp/LanguageCode.cc:529
 msgid "Hittite"
 msgstr "Hittitisk"
 
 #. language code: hmn
-#: zypp/LanguageCode.cc:576
+#: zypp/LanguageCode.cc:531
 msgid "Hmong"
 msgstr "Hmong"
 
 #. :UZB:860:
-#: zypp/CountryCode.cc:434
+#: zypp/CountryCode.cc:390
 msgid "Holy See (Vatican City State)"
 msgstr "Vatikanstaten"
 
 #. :HMD:334:
-#: zypp/CountryCode.cc:297
+#: zypp/CountryCode.cc:253
 msgid "Honduras"
 msgstr "Honduras"
 
 #. :GUY:328:
-#: zypp/CountryCode.cc:295
+#: zypp/CountryCode.cc:251
 msgid "Hong Kong"
 msgstr "Hong Kong"
 
 #. language code: hun hu
-#: zypp/LanguageCode.cc:582
+#: zypp/LanguageCode.cc:537
 msgid "Hungarian"
 msgstr "Ungarsk"
 
 #. :HTI:332:
-#: zypp/CountryCode.cc:300
+#: zypp/CountryCode.cc:256
 msgid "Hungary"
 msgstr "Ungarn"
 
 #. language code: hup
-#: zypp/LanguageCode.cc:584
+#: zypp/LanguageCode.cc:539
 msgid "Hupa"
 msgstr "Hupa"
 
 # IR
 # fuzzy
 #. language code: iba
-#: zypp/LanguageCode.cc:586
+#: zypp/LanguageCode.cc:541
 msgid "Iban"
 msgstr "Iban"
 
 #. :IRN:364:
-#: zypp/CountryCode.cc:309
+#: zypp/CountryCode.cc:265
 msgid "Iceland"
 msgstr "Island"
 
 #. language code: ice isl is
-#: zypp/LanguageCode.cc:590 zypp/LanguageCode.cc:592
+#: zypp/LanguageCode.cc:545 zypp/LanguageCode.cc:547
 msgid "Icelandic"
 msgstr "Islandsk"
 
 #. language code: ido io
-#: zypp/LanguageCode.cc:594
+#: zypp/LanguageCode.cc:549
 msgid "Ido"
 msgstr "Ido"
 
 #. language code: ibo ig
-#: zypp/LanguageCode.cc:588
+#: zypp/LanguageCode.cc:543
 msgid "Igbo"
 msgstr "Igbo"
 
 #. language code: ijo
-#: zypp/LanguageCode.cc:598
+#: zypp/LanguageCode.cc:553
 msgid "Ijo"
 msgstr "Ijo"
 
 #. language code: ilo
-#: zypp/LanguageCode.cc:604
+#: zypp/LanguageCode.cc:559
 msgid "Iloko"
 msgstr "Iloko"
 
 #. language code: smn
-#: zypp/LanguageCode.cc:1014
+#: zypp/LanguageCode.cc:969
 msgid "Inari Sami"
 msgstr "Enaresamisk"
 
-#: zypp/CountryCode.cc:305
+#: zypp/CountryCode.cc:261
 msgid "India"
 msgstr "India"
 
 #. language code: inc
-#: zypp/LanguageCode.cc:608
+#: zypp/LanguageCode.cc:563
 msgid "Indic (Other)"
 msgstr "Indisk (annet)"
 
 #. language code: ine
-#: zypp/LanguageCode.cc:612
+#: zypp/LanguageCode.cc:567
 msgid "Indo-European (Other)"
 msgstr "Indoeuropeisk (annet)"
 
 #. :HUN:348:
-#: zypp/CountryCode.cc:301
+#: zypp/CountryCode.cc:257
 msgid "Indonesia"
 msgstr "Indonesia"
 
 #. language code: ind id
-#: zypp/LanguageCode.cc:610
+#: zypp/LanguageCode.cc:565
 msgid "Indonesian"
 msgstr "Indonesisk"
 
 #. language code: inh
-#: zypp/LanguageCode.cc:614
+#: zypp/LanguageCode.cc:569
 msgid "Ingush"
 msgstr "Ingusj"
 
-#: zypp/target/TargetImpl.cc:1360 zypp/target/TargetImpl.cc:1429
-#: zypp/target/TargetImpl.cc:1758
-#: zypp/target/TargetImpl.commitFindFileConflicts.cc:163
+#: zypp/target/TargetImpl.cc:1377 zypp/target/TargetImpl.cc:1446
+#: zypp/target/TargetImpl.cc:1798
+#: zypp/target/TargetImpl.commitFindFileConflicts.cc:166
 msgid "Installation has been aborted as directed."
 msgstr "Installasjonen er avbrutt som angitt."
 
 #. language code: ina ia
-#: zypp/LanguageCode.cc:606
+#: zypp/LanguageCode.cc:561
 msgid "Interlingua (International Auxiliary Language Association)"
 msgstr "Interlingua (International Auxiliary Language Association)"
 
 #. language code: ile ie
-#: zypp/LanguageCode.cc:602
+#: zypp/LanguageCode.cc:557
 msgid "Interlingue"
 msgstr "Interlingue"
 
 #. language code: iku iu
-#: zypp/LanguageCode.cc:600
+#: zypp/LanguageCode.cc:555
 msgid "Inuktitut"
 msgstr "Inuktitut"
 
 #. language code: ipk ik
-#: zypp/LanguageCode.cc:616
+#: zypp/LanguageCode.cc:571
 msgid "Inupiaq"
 msgstr "Inupiaq"
 
 #: zypp/url/UrlBase.cc:180
-#, c-format
+#, c-format, boost-format
 msgid "Invalid %s component"
 msgstr "Ugyldig %s komponent"
 
 #: zypp/url/UrlBase.cc:173
-#, c-format
+#, c-format, boost-format
 msgid "Invalid %s component '%s'"
 msgstr "Ugyldig %s komponent %s"
 
 #: zypp/Url.cc:153
-#, c-format
+#, c-format, boost-format
 msgid "Invalid LDAP URL query parameter '%s'"
 msgstr "Ugyldig LDAP URL-spørringsparameter %s"
 
@@ -2088,8 +2118,8 @@
 msgid "Invalid LDAP URL query string"
 msgstr "Ugyldig LDAP URL-spørringsstreng"
 
-#: zypp/url/UrlBase.cc:826
-#, c-format
+#: zypp/url/UrlBase.cc:830
+#, c-format, boost-format
 msgid "Invalid Url scheme '%s'"
 msgstr "Ugyldig adressestrategi %s"
 
@@ -2097,8 +2127,8 @@
 msgid "Invalid empty Url object reference"
 msgstr "Ugyldig referanse til tomt URL-objekt"
 
-#: zypp/url/UrlBase.cc:1045
-#, c-format
+#: zypp/url/UrlBase.cc:1049
+#, c-format, boost-format
 msgid "Invalid host component '%s'"
 msgstr "Ugyldig vertskomponent %s"
 
@@ -2114,386 +2144,386 @@
 msgid "Invalid parameter map split separator character"
 msgstr "Ugyldig skilletegn for deling av parametertilordning"
 
-#: zypp/url/UrlBase.cc:1077
-#, c-format
+#: zypp/url/UrlBase.cc:1081
+#, c-format, boost-format
 msgid "Invalid port component '%s'"
 msgstr "Ugyldig portkomponent %s"
 
-#: zypp/base/StrMatcher.cc:157
-#, c-format
+#: zypp/base/StrMatcher.cc:158
+#, c-format, boost-format
 msgid "Invalid regular expression '%s'"
 msgstr "Ugyldig regulært uttrykk '%s'"
 
-#: zypp/base/StrMatcher.cc:156
-#, c-format
+#: zypp/base/StrMatcher.cc:157
+#, c-format, boost-format
 msgid "Invalid regular expression '%s': regcomp returned %d"
 msgstr "Ugyldig regulært uttrykk '%s': tilbakemelding 'regcomp'  %d"
 
 #. TranslatorExplanation '%s' is an URL
-#: zypp/RepoManager.cc:1513
-#, c-format
+#: zypp/RepoManager.cc:1648
+#, c-format, boost-format
 msgid "Invalid repo file name at '%s'"
 msgstr "Ugyldig pakkebrønnfilnavn på '%s'"
 
 # IR
 # fuzzy
 #. :IRQ:368:
-#: zypp/CountryCode.cc:308
+#: zypp/CountryCode.cc:264
 msgid "Iran"
 msgstr "Israel"
 
 #. language code: ira
-#: zypp/LanguageCode.cc:618
+#: zypp/LanguageCode.cc:573
 msgid "Iranian (Other)"
 msgstr "Iransk (annet)"
 
 #. :IOT:086:
-#: zypp/CountryCode.cc:307
+#: zypp/CountryCode.cc:263
 msgid "Iraq"
 msgstr "Irak"
 
 #. :IDN:360:
-#: zypp/CountryCode.cc:302
+#: zypp/CountryCode.cc:258
 msgid "Ireland"
 msgstr "Irland"
 
 #. language code: gle ga
-#: zypp/LanguageCode.cc:526
+#: zypp/LanguageCode.cc:481
 msgid "Irish"
 msgstr "Irsk"
 
 #. language code: mga
-#: zypp/LanguageCode.cc:778
+#: zypp/LanguageCode.cc:733
 msgid "Irish, Middle (900-1200)"
 msgstr "Irsk, mellomirsk (900-1200)"
 
 #. language code: sga
-#: zypp/LanguageCode.cc:984
+#: zypp/LanguageCode.cc:939
 msgid "Irish, Old (to 900)"
 msgstr "Irsk, gammelirsk (til 900)"
 
 #. language code: iro
-#: zypp/LanguageCode.cc:620
+#: zypp/LanguageCode.cc:575
 msgid "Iroquoian Languages"
 msgstr "Irokesiske språk"
 
 #. :ISR:376:
-#: zypp/CountryCode.cc:304
+#: zypp/CountryCode.cc:260
 msgid "Isle of Man"
 msgstr "Isle of Man"
 
 #. :IRL:372:
-#: zypp/CountryCode.cc:303
+#: zypp/CountryCode.cc:259
 msgid "Israel"
 msgstr "Israel"
 
 #. language code: ita it
-#: zypp/LanguageCode.cc:622
+#: zypp/LanguageCode.cc:577
 msgid "Italian"
 msgstr "Italiensk"
 
 #. :ISL:352:
-#: zypp/CountryCode.cc:310
+#: zypp/CountryCode.cc:266
 msgid "Italy"
 msgstr "Italia"
 
-#: zypp/CountryCode.cc:312
+#: zypp/CountryCode.cc:268
 msgid "Jamaica"
 msgstr "Jamaica"
 
 #. :JOR:400:
-#: zypp/CountryCode.cc:314
+#: zypp/CountryCode.cc:270
 msgid "Japan"
 msgstr "Japan"
 
 #. language code: jpn ja
-#: zypp/LanguageCode.cc:628
+#: zypp/LanguageCode.cc:583
 msgid "Japanese"
 msgstr "Japansk"
 
 #. language code: jav jv
-#: zypp/LanguageCode.cc:624
+#: zypp/LanguageCode.cc:579
 msgid "Javanese"
 msgstr "Javanesisk"
 
 #. :ITA:380:
-#: zypp/CountryCode.cc:311
+#: zypp/CountryCode.cc:267
 msgid "Jersey"
 msgstr "Jersey"
 
 #. :JAM:388:
-#: zypp/CountryCode.cc:313
+#: zypp/CountryCode.cc:269
 msgid "Jordan"
 msgstr "Jordan"
 
 #. language code: jrb
-#: zypp/LanguageCode.cc:632
+#: zypp/LanguageCode.cc:587
 msgid "Judeo-Arabic"
 msgstr "Judeoarabisk"
 
 #. language code: jpr
-#: zypp/LanguageCode.cc:630
+#: zypp/LanguageCode.cc:585
 msgid "Judeo-Persian"
 msgstr "Judeopersisk"
 
 #. language code: kbd
-#: zypp/LanguageCode.cc:656
+#: zypp/LanguageCode.cc:611
 msgid "Kabardian"
 msgstr "Kabardiansk"
 
 #. language code: kab
-#: zypp/LanguageCode.cc:636
+#: zypp/LanguageCode.cc:591
 msgid "Kabyle"
 msgstr "Kabyle"
 
 #. language code: kac
-#: zypp/LanguageCode.cc:638
+#: zypp/LanguageCode.cc:593
 msgid "Kachin"
 msgstr "Kachin"
 
 #. language code: kal kl
-#: zypp/LanguageCode.cc:640
+#: zypp/LanguageCode.cc:595
 msgid "Kalaallisut"
 msgstr "Kalaallisut"
 
 #. language code: xal
-#: zypp/LanguageCode.cc:1170
+#: zypp/LanguageCode.cc:1125
 msgid "Kalmyk"
 msgstr "Kalmyk"
 
 #. language code: kam
-#: zypp/LanguageCode.cc:642
+#: zypp/LanguageCode.cc:597
 msgid "Kamba"
 msgstr "Kamba"
 
 #. language code: kan kn
-#: zypp/LanguageCode.cc:644
+#: zypp/LanguageCode.cc:599
 msgid "Kannada"
 msgstr "Kannada"
 
 #. language code: kau kr
-#: zypp/LanguageCode.cc:650
+#: zypp/LanguageCode.cc:605
 msgid "Kanuri"
 msgstr "Kanuri"
 
 #. language code: kaa
-#: zypp/LanguageCode.cc:634
+#: zypp/LanguageCode.cc:589
 msgid "Kara-Kalpak"
 msgstr "Kara-kalpak"
 
 #. language code: krc
-#: zypp/LanguageCode.cc:686
+#: zypp/LanguageCode.cc:641
 msgid "Karachay-Balkar"
 msgstr "Karachay-balkar"
 
 #. language code: kar
-#: zypp/LanguageCode.cc:646
+#: zypp/LanguageCode.cc:601
 msgid "Karen"
 msgstr "Karen"
 
 #. language code: kas ks
-#: zypp/LanguageCode.cc:648
+#: zypp/LanguageCode.cc:603
 msgid "Kashmiri"
 msgstr "Kashmirsk"
 
 #. language code: csb
-#: zypp/LanguageCode.cc:410
+#: zypp/LanguageCode.cc:365
 msgid "Kashubian"
 msgstr "Kashubiansk"
 
 #. language code: kaw
-#: zypp/LanguageCode.cc:652
+#: zypp/LanguageCode.cc:607
 msgid "Kawi"
 msgstr "Kawi"
 
 # KZ
 # fuzzy
 #. language code: kaz kk
-#: zypp/LanguageCode.cc:654
+#: zypp/LanguageCode.cc:609
 msgid "Kazakh"
 msgstr "Kasakstansk"
 
 # KZ
 # fuzzy
 #. :CYM:136:
-#: zypp/CountryCode.cc:325
+#: zypp/CountryCode.cc:281
 msgid "Kazakhstan"
 msgstr "Kasakhstan"
 
 #. :JPN:392:
-#: zypp/CountryCode.cc:315
+#: zypp/CountryCode.cc:271
 msgid "Kenya"
 msgstr "Kenya"
 
 #. language code: kha
-#: zypp/LanguageCode.cc:658
+#: zypp/LanguageCode.cc:613
 msgid "Khasi"
 msgstr "Khasi"
 
 #. language code: khm km
-#: zypp/LanguageCode.cc:662
+#: zypp/LanguageCode.cc:617
 msgid "Khmer"
 msgstr "Khmer"
 
 #. language code: khi
-#: zypp/LanguageCode.cc:660
+#: zypp/LanguageCode.cc:615
 msgid "Khoisan (Other)"
 msgstr "Khoisan (annet)"
 
 #. language code: kho
-#: zypp/LanguageCode.cc:664
+#: zypp/LanguageCode.cc:619
 msgid "Khotanese"
 msgstr "Khotanesisk"
 
 #. language code: kik ki
-#: zypp/LanguageCode.cc:666
+#: zypp/LanguageCode.cc:621
 msgid "Kikuyu"
 msgstr "Kikuyu"
 
 #. language code: kmb
-#: zypp/LanguageCode.cc:672
+#: zypp/LanguageCode.cc:627
 msgid "Kimbundu"
 msgstr "Kimbundu"
 
 #. language code: kin rw
-#: zypp/LanguageCode.cc:668
+#: zypp/LanguageCode.cc:623
 msgid "Kinyarwanda"
 msgstr "Kinyarwanda"
 
 #. language code: kir ky
-#: zypp/LanguageCode.cc:670
+#: zypp/LanguageCode.cc:625
 msgid "Kirghiz"
 msgstr "Kirgisisk"
 
 #. :KHM:116:
-#: zypp/CountryCode.cc:318
+#: zypp/CountryCode.cc:274
 msgid "Kiribati"
 msgstr "Kiribati"
 
 #. language code: tlh
-#: zypp/LanguageCode.cc:1092
+#: zypp/LanguageCode.cc:1047
 msgid "Klingon"
 msgstr "Klingonsk"
 
 #. language code: kom kv
-#: zypp/LanguageCode.cc:676
+#: zypp/LanguageCode.cc:631
 msgid "Komi"
 msgstr "Komi"
 
 #. language code: kon kg
-#: zypp/LanguageCode.cc:678
+#: zypp/LanguageCode.cc:633
 msgid "Kongo"
 msgstr "Kongo"
 
 #. language code: kok
-#: zypp/LanguageCode.cc:674
+#: zypp/LanguageCode.cc:629
 msgid "Konkani"
 msgstr "Konkani"
 
 #. language code: kor ko
-#: zypp/LanguageCode.cc:680
+#: zypp/LanguageCode.cc:635
 msgid "Korean"
 msgstr "Koreansk"
 
 #. language code: kos
-#: zypp/LanguageCode.cc:682
+#: zypp/LanguageCode.cc:637
 msgid "Kosraean"
 msgstr "Kosraeansk"
 
 #. language code: kpe
-#: zypp/LanguageCode.cc:684
+#: zypp/LanguageCode.cc:639
 msgid "Kpelle"
 msgstr "Kpelle"
 
 #. language code: kro
-#: zypp/LanguageCode.cc:688
+#: zypp/LanguageCode.cc:643
 msgid "Kru"
 msgstr "Kru"
 
 #. language code: kua kj
-#: zypp/LanguageCode.cc:692
+#: zypp/LanguageCode.cc:647
 msgid "Kuanyama"
 msgstr "Kuanyama"
 
 #. language code: kum
-#: zypp/LanguageCode.cc:694
+#: zypp/LanguageCode.cc:649
 msgid "Kumyk"
 msgstr "Kumyk"
 
 #. language code: kur ku
-#: zypp/LanguageCode.cc:696
+#: zypp/LanguageCode.cc:651
 msgid "Kurdish"
 msgstr "Kurdisk"
 
 #. language code: kru
-#: zypp/LanguageCode.cc:690
+#: zypp/LanguageCode.cc:645
 msgid "Kurukh"
 msgstr "Kurukh"
 
 #. language code: kut
-#: zypp/LanguageCode.cc:698
+#: zypp/LanguageCode.cc:653
 msgid "Kutenai"
 msgstr "Kutenai"
 
 #. :KOR:410:
-#: zypp/CountryCode.cc:323
+#: zypp/CountryCode.cc:279
 msgid "Kuwait"
 msgstr "Kuwait"
 
 # KZ
 # fuzzy
 #. :KEN:404:
-#: zypp/CountryCode.cc:316
+#: zypp/CountryCode.cc:272
 msgid "Kyrgyzstan"
 msgstr "Kirgisistan"
 
 #. language code: lad
-#: zypp/LanguageCode.cc:700
+#: zypp/LanguageCode.cc:655
 msgid "Ladino"
 msgstr "Ladino"
 
 #. language code: lah
-#: zypp/LanguageCode.cc:702
+#: zypp/LanguageCode.cc:657
 msgid "Lahnda"
 msgstr "Lahnda"
 
 #. language code: lam
-#: zypp/LanguageCode.cc:704
+#: zypp/LanguageCode.cc:659
 msgid "Lamba"
 msgstr "Lamba"
 
 #. language code: lao lo
-#: zypp/LanguageCode.cc:706
+#: zypp/LanguageCode.cc:661
 msgid "Lao"
 msgstr "Laotisk"
 
 #. :KAZ:398:
-#: zypp/CountryCode.cc:326
+#: zypp/CountryCode.cc:282
 msgid "Lao People's Democratic Republic"
 msgstr "Laos"
 
 #. language code: lat la
-#: zypp/LanguageCode.cc:708
+#: zypp/LanguageCode.cc:663
 msgid "Latin"
 msgstr "Latin"
 
 #. :LUX:442:
-#: zypp/CountryCode.cc:335
+#: zypp/CountryCode.cc:291
 msgid "Latvia"
 msgstr "Latvia"
 
 #. language code: lav lv
-#: zypp/LanguageCode.cc:710
+#: zypp/LanguageCode.cc:665
 msgid "Latvian"
 msgstr "Latvisk"
 
 #. :LAO:418:
-#: zypp/CountryCode.cc:327
+#: zypp/CountryCode.cc:283
 msgid "Lebanon"
 msgstr "Libanon"
 
 #. :LBR:430:
-#: zypp/CountryCode.cc:332
+#: zypp/CountryCode.cc:288
 msgid "Lesotho"
 msgstr "Lesotho"
 
@@ -2510,189 +2540,189 @@
 msgstr "Nivå 3"
 
 #. language code: lez
-#: zypp/LanguageCode.cc:712
+#: zypp/LanguageCode.cc:667
 msgid "Lezghian"
 msgstr "Lezghiansk"
 
 # LR
 # fuzzy
 #. :LKA:144:
-#: zypp/CountryCode.cc:331
+#: zypp/CountryCode.cc:287
 msgid "Liberia"
 msgstr "Liberia"
 
 # LR
 # fuzzy
 #. :LVA:428:
-#: zypp/CountryCode.cc:336
+#: zypp/CountryCode.cc:292
 msgid "Libya"
 msgstr "Libya"
 
 #. :LCA:662:
-#: zypp/CountryCode.cc:329
+#: zypp/CountryCode.cc:285
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
 #. language code: lim li
-#: zypp/LanguageCode.cc:714
+#: zypp/LanguageCode.cc:669
 msgid "Limburgan"
 msgstr "Limburgansk"
 
 #. language code: lin ln
-#: zypp/LanguageCode.cc:716
+#: zypp/LanguageCode.cc:671
 msgid "Lingala"
 msgstr "Lingala"
 
 #. :LSO:426:
-#: zypp/CountryCode.cc:333
+#: zypp/CountryCode.cc:289
 msgid "Lithuania"
 msgstr "Litauen"
 
 #. language code: lit lt
-#: zypp/LanguageCode.cc:718
+#: zypp/LanguageCode.cc:673
 msgid "Lithuanian"
 msgstr "Litauisk"
 
 #: zypp/media/MediaException.cc:215
-#, c-format
+#, c-format, boost-format
 msgid "Location '%s' is temporarily unaccessible."
 msgstr "Plasseringen '%s' er midlertidig utilgjengelig."
 
 #. language code: jbo
-#: zypp/LanguageCode.cc:626
+#: zypp/LanguageCode.cc:581
 msgid "Lojban"
 msgstr "Lojban"
 
 #. language code: nds
-#: zypp/LanguageCode.cc:836
+#: zypp/LanguageCode.cc:791
 msgid "Low German"
 msgstr "Lavtysk"
 
 #. language code: dsb
-#: zypp/LanguageCode.cc:440
+#: zypp/LanguageCode.cc:395
 msgid "Lower Sorbian"
 msgstr "Sorbiansk, nedre"
 
 #. language code: loz
-#: zypp/LanguageCode.cc:722
+#: zypp/LanguageCode.cc:677
 msgid "Lozi"
 msgstr "Lozi"
 
 #. language code: lub lu
-#: zypp/LanguageCode.cc:728
+#: zypp/LanguageCode.cc:683
 msgid "Luba-Katanga"
 msgstr "Luba-Katanga"
 
 #. language code: lua
-#: zypp/LanguageCode.cc:726
+#: zypp/LanguageCode.cc:681
 msgid "Luba-Lulua"
 msgstr "Luba-Lulua"
 
 #. language code: lui
-#: zypp/LanguageCode.cc:732
+#: zypp/LanguageCode.cc:687
 msgid "Luiseno"
 msgstr "Luiseno"
 
 #. language code: smj
-#: zypp/LanguageCode.cc:1012
+#: zypp/LanguageCode.cc:967
 msgid "Lule Sami"
 msgstr "Lulesamisk"
 
 #. language code: lun
-#: zypp/LanguageCode.cc:734
+#: zypp/LanguageCode.cc:689
 msgid "Lunda"
 msgstr "Lunda"
 
 #. language code: luo
-#: zypp/LanguageCode.cc:736
+#: zypp/LanguageCode.cc:691
 msgid "Luo (Kenya and Tanzania)"
 msgstr "Luo (Kenya og Tanzania)"
 
 #. language code: lus
-#: zypp/LanguageCode.cc:738
+#: zypp/LanguageCode.cc:693
 msgid "Lushai"
 msgstr "Lushai"
 
 #. :LTU:440:
-#: zypp/CountryCode.cc:334
+#: zypp/CountryCode.cc:290
 msgid "Luxembourg"
 msgstr "Luxembourg"
 
 #. language code: ltz lb
-#: zypp/LanguageCode.cc:724
+#: zypp/LanguageCode.cc:679
 msgid "Luxembourgish"
 msgstr "Luxemburgisk"
 
 #. :MNG:496:
-#: zypp/CountryCode.cc:348
+#: zypp/CountryCode.cc:304
 msgid "Macao"
 msgstr "Macao"
 
 #. :MHL:584:
-#: zypp/CountryCode.cc:344
+#: zypp/CountryCode.cc:300
 msgid "Macedonia"
 msgstr "Makedonia"
 
 #. language code: mac mkd mk
-#: zypp/LanguageCode.cc:740 zypp/LanguageCode.cc:742
+#: zypp/LanguageCode.cc:695 zypp/LanguageCode.cc:697
 msgid "Macedonian"
 msgstr "Makedonsk"
 
-#: zypp/CountryCode.cc:342
+#: zypp/CountryCode.cc:298
 msgid "Madagascar"
 msgstr "Madagaskar"
 
 #. language code: mad
-#: zypp/LanguageCode.cc:744
+#: zypp/LanguageCode.cc:699
 msgid "Madurese"
 msgstr "Maduresisk"
 
 #. language code: mag
-#: zypp/LanguageCode.cc:746
+#: zypp/LanguageCode.cc:701
 msgid "Magahi"
 msgstr "Magahi"
 
 #. language code: mai
-#: zypp/LanguageCode.cc:750
+#: zypp/LanguageCode.cc:705
 msgid "Maithili"
 msgstr "Maithili"
 
 #. language code: mak
-#: zypp/LanguageCode.cc:752
+#: zypp/LanguageCode.cc:707
 msgid "Makasar"
 msgstr "Makasar"
 
 #. language code: mlg mg
-#: zypp/LanguageCode.cc:788
+#: zypp/LanguageCode.cc:743
 msgid "Malagasy"
 msgstr "Malagasisk"
 
 # MW
 # fuzzy
 #. :MDV:462:
-#: zypp/CountryCode.cc:356
+#: zypp/CountryCode.cc:312
 msgid "Malawi"
 msgstr "Malta"
 
 #. language code: may msa ms
-#: zypp/LanguageCode.cc:768 zypp/LanguageCode.cc:770
+#: zypp/LanguageCode.cc:723 zypp/LanguageCode.cc:725
 msgid "Malay"
 msgstr "Malayisk"
 
 #. language code: mal ml
-#: zypp/LanguageCode.cc:754
+#: zypp/LanguageCode.cc:709
 msgid "Malayalam"
 msgstr "Malayalamsk"
 
 #. :MEX:484:
-#: zypp/CountryCode.cc:358
+#: zypp/CountryCode.cc:314
 msgid "Malaysia"
 msgstr "Malaysia"
 
 # MV
 # fuzzy
 #. :MUS:480:
-#: zypp/CountryCode.cc:355
+#: zypp/CountryCode.cc:311
 msgid "Maldives"
 msgstr "Malta"
 
@@ -2703,125 +2733,125 @@
 # ML
 # fuzzy
 #. :MKD:807:
-#: zypp/CountryCode.cc:345
+#: zypp/CountryCode.cc:301
 msgid "Mali"
 msgstr "Malta"
 
 #. :MSR:500:
-#: zypp/CountryCode.cc:353
+#: zypp/CountryCode.cc:309
 msgid "Malta"
 msgstr "Malta"
 
 #. language code: mlt mt
-#: zypp/LanguageCode.cc:790
+#: zypp/LanguageCode.cc:745
 msgid "Maltese"
 msgstr "Maltisk"
 
 #. language code: mnc
-#: zypp/LanguageCode.cc:792
+#: zypp/LanguageCode.cc:747
 msgid "Manchu"
 msgstr "Manchu"
 
 # MM
 # fuzzy
 #. language code: mdr
-#: zypp/LanguageCode.cc:774
+#: zypp/LanguageCode.cc:729
 msgid "Mandar"
 msgstr "Mandar"
 
 #. language code: man
-#: zypp/LanguageCode.cc:756
+#: zypp/LanguageCode.cc:711
 msgid "Mandingo"
 msgstr "Mandingo"
 
 #. language code: mni
-#: zypp/LanguageCode.cc:794
+#: zypp/LanguageCode.cc:749
 msgid "Manipuri"
 msgstr "Manipuri"
 
 #. language code: mno
-#: zypp/LanguageCode.cc:796
+#: zypp/LanguageCode.cc:751
 msgid "Manobo Languages"
 msgstr "Manobo-språk"
 
 #. language code: glv gv
-#: zypp/LanguageCode.cc:530
+#: zypp/LanguageCode.cc:485
 msgid "Manx"
 msgstr "Mansk"
 
 #. language code: mao mri mi
-#: zypp/LanguageCode.cc:758 zypp/LanguageCode.cc:760
+#: zypp/LanguageCode.cc:713 zypp/LanguageCode.cc:715
 msgid "Maori"
 msgstr "Maori"
 
 #. language code: mar mr
-#: zypp/LanguageCode.cc:764
+#: zypp/LanguageCode.cc:719
 msgid "Marathi"
 msgstr "Marathi"
 
 #. language code: chm
-#: zypp/LanguageCode.cc:374
+#: zypp/LanguageCode.cc:329
 msgid "Mari"
 msgstr "Mari"
 
 #. :MDG:450:
-#: zypp/CountryCode.cc:343
+#: zypp/CountryCode.cc:299
 msgid "Marshall Islands"
 msgstr "Marshalløyene"
 
 #. language code: mah mh
-#: zypp/LanguageCode.cc:748
+#: zypp/LanguageCode.cc:703
 msgid "Marshallese"
 msgstr "Marshallisk"
 
 #. :MNP:580:
-#: zypp/CountryCode.cc:350
+#: zypp/CountryCode.cc:306
 msgid "Martinique"
 msgstr "Martinique"
 
 #. language code: mwr
-#: zypp/LanguageCode.cc:814
+#: zypp/LanguageCode.cc:769
 msgid "Marwari"
 msgstr "Marwari"
 
 # MW
 # fuzzy
 #. language code: mas
-#: zypp/LanguageCode.cc:766
+#: zypp/LanguageCode.cc:721
 msgid "Masai"
 msgstr "Masai"
 
 # MR
 # fuzzy
 #. :MTQ:474:
-#: zypp/CountryCode.cc:351
+#: zypp/CountryCode.cc:307
 msgid "Mauritania"
 msgstr "Lituaisk"
 
 # MU
 # fuzzy
 #. :MLT:470:
-#: zypp/CountryCode.cc:354
+#: zypp/CountryCode.cc:310
 msgid "Mauritius"
 msgstr "Lituaisk"
 
 #. language code: myn
-#: zypp/LanguageCode.cc:816
+#: zypp/LanguageCode.cc:771
 msgid "Mayan Languages"
 msgstr "Maya-språk"
 
 #. :YEM:887:
-#: zypp/CountryCode.cc:444
+#: zypp/CountryCode.cc:400
 msgid "Mayotte"
 msgstr "Mayotte"
 
 #: zypp/media/MediaException.cc:169
-#, c-format
+#, c-format, boost-format
 msgid "Media source '%s' does not contain the desired medium"
 msgstr "Mediekilde '%s' inneholder ikke ønsket medium"
 
 #: zypp/media/MediaException.cc:175
-#, c-format
+#, c-format, boost-format
 msgid "Medium '%s' is in use by another instance"
 msgstr "Mediet '%s' benyttes av en annen prosess"
 
@@ -2830,267 +2860,267 @@
 msgstr "Medium ikke tilkoblet"
 
 #: zypp/media/MediaException.cc:53
-#, c-format
+#, c-format, boost-format
 msgid "Medium not opened when trying to perform action '%s'."
 msgstr "Mediet ble ikke åpnet da handlingen ble forsøkt utført '%s'."
 
 #. language code: men
-#: zypp/LanguageCode.cc:776
+#: zypp/LanguageCode.cc:731
 msgid "Mende"
 msgstr "Mende"
 
 #. :FRA:250:
-#: zypp/CountryCode.cc:275
+#: zypp/CountryCode.cc:231
 msgid "Metropolitan France"
 msgstr "Frankrike (Europa)"
 
 #. :MWI:454:
-#: zypp/CountryCode.cc:357
+#: zypp/CountryCode.cc:313
 msgid "Mexico"
 msgstr "Mexico"
 
 #. language code: mic
-#: zypp/LanguageCode.cc:780
+#: zypp/LanguageCode.cc:735
 msgid "Mi'kmaq"
 msgstr "Mi'kmaq"
 
 #. language code: min
-#: zypp/LanguageCode.cc:782
+#: zypp/LanguageCode.cc:737
 msgid "Minangkabau"
 msgstr "Minangkabau"
 
 # FM
 # fuzzy
 #. language code: mwl
-#: zypp/LanguageCode.cc:812
+#: zypp/LanguageCode.cc:767
 msgid "Mirandese"
 msgstr "Mirandesisk"
 
 #. language code: mis
-#: zypp/LanguageCode.cc:784
+#: zypp/LanguageCode.cc:739
 msgid "Miscellaneous Languages"
 msgstr "Diverse språk"
 
 #. language code: moh
-#: zypp/LanguageCode.cc:798
+#: zypp/LanguageCode.cc:753
 msgid "Mohawk"
 msgstr "Mohawk"
 
 #. language code: mdf
-#: zypp/LanguageCode.cc:772
+#: zypp/LanguageCode.cc:727
 msgid "Moksha"
 msgstr "Moksha"
 
 #. language code: mol mo
-#: zypp/LanguageCode.cc:800
+#: zypp/LanguageCode.cc:755
 msgid "Moldavian"
 msgstr "Moldovisk"
 
 #. :MCO:492:
-#: zypp/CountryCode.cc:339
+#: zypp/CountryCode.cc:295
 msgid "Moldova"
 msgstr "Moldova"
 
 #. language code: mkh
-#: zypp/LanguageCode.cc:786
+#: zypp/LanguageCode.cc:741
 msgid "Mon-Khmer (Other)"
 msgstr "Mon-Khmer (annet)"
 
 #. :MAR:504:
-#: zypp/CountryCode.cc:338
+#: zypp/CountryCode.cc:294
 msgid "Monaco"
 msgstr "Monaco"
 
 #. language code: lol
-#: zypp/LanguageCode.cc:720
+#: zypp/LanguageCode.cc:675
 msgid "Mongo"
 msgstr "Mongo"
 
 #. :MMR:104:
-#: zypp/CountryCode.cc:347
+#: zypp/CountryCode.cc:303
 msgid "Mongolia"
 msgstr "Mongolia"
 
 #. language code: mon mn
-#: zypp/LanguageCode.cc:802
+#: zypp/LanguageCode.cc:757
 msgid "Mongolian"
 msgstr "Mongolsk"
 
 #. :MDA:498:
-#: zypp/CountryCode.cc:340
+#: zypp/CountryCode.cc:296
 msgid "Montenegro"
 msgstr "Montenegro"
 
 #. :MRT:478:
-#: zypp/CountryCode.cc:352
+#: zypp/CountryCode.cc:308
 msgid "Montserrat"
 msgstr "Montserrat"
 
 #. :LBY:434:
-#: zypp/CountryCode.cc:337
+#: zypp/CountryCode.cc:293
 msgid "Morocco"
 msgstr "Marokko"
 
 #. language code: mos
-#: zypp/LanguageCode.cc:804
+#: zypp/LanguageCode.cc:759
 msgid "Mossi"
 msgstr "Mossi"
 
 #. :MYS:458:
-#: zypp/CountryCode.cc:359
+#: zypp/CountryCode.cc:315
 msgid "Mozambique"
 msgstr "Mosambik"
 
 #. language code: mul
-#: zypp/LanguageCode.cc:806
+#: zypp/LanguageCode.cc:761
 msgid "Multiple Languages"
 msgstr "Flere språk"
 
 #. language code: mun
-#: zypp/LanguageCode.cc:808
+#: zypp/LanguageCode.cc:763
 msgid "Munda languages"
 msgstr "Munda-språk"
 
 # MM
 # fuzzy
 #. :MLI:466:
-#: zypp/CountryCode.cc:346
+#: zypp/CountryCode.cc:302
 msgid "Myanmar"
 msgstr "Panama"
 
 #. language code: nah
-#: zypp/LanguageCode.cc:820
+#: zypp/LanguageCode.cc:775
 msgid "Nahuatl"
 msgstr "Nahuatl"
 
 # GM
 # fuzzy
 #. :MOZ:508:
-#: zypp/CountryCode.cc:360
+#: zypp/CountryCode.cc:316
 msgid "Namibia"
 msgstr "Namibia"
 
 #. :NPL:524:
 #. language code: nau na
-#: zypp/CountryCode.cc:369 zypp/LanguageCode.cc:826
+#: zypp/CountryCode.cc:325 zypp/LanguageCode.cc:781
 msgid "Nauru"
 msgstr "Nauru"
 
 #. language code: nav nv
-#: zypp/LanguageCode.cc:828
+#: zypp/LanguageCode.cc:783
 msgid "Navajo"
 msgstr "Navajo"
 
 #. language code: nde nd
-#: zypp/LanguageCode.cc:832
+#: zypp/LanguageCode.cc:787
 msgid "Ndebele, North"
 msgstr "Ndebele, nord"
 
 #. language code: nbl nr
-#: zypp/LanguageCode.cc:830
+#: zypp/LanguageCode.cc:785
 msgid "Ndebele, South"
 msgstr "Ndebele, sør"
 
 #. language code: ndo ng
-#: zypp/LanguageCode.cc:834
+#: zypp/LanguageCode.cc:789
 msgid "Ndonga"
 msgstr "Ndonga"
 
 #. language code: nap
-#: zypp/LanguageCode.cc:824
+#: zypp/LanguageCode.cc:779
 msgid "Neapolitan"
 msgstr "Napolitansk"
 
 #. :NOR:578:
-#: zypp/CountryCode.cc:368
+#: zypp/CountryCode.cc:324
 msgid "Nepal"
 msgstr "Nepal"
 
 #. language code: new
-#: zypp/LanguageCode.cc:840
+#: zypp/LanguageCode.cc:795
 msgid "Nepal Bhasa"
 msgstr "Nepalsk bhasa"
 
 #. language code: nep ne
-#: zypp/LanguageCode.cc:838
+#: zypp/LanguageCode.cc:793
 msgid "Nepali"
 msgstr "Nepalsk"
 
 #. :NIC:558:
-#: zypp/CountryCode.cc:366
+#: zypp/CountryCode.cc:322
 msgid "Netherlands"
 msgstr "Nederland"
 
 # AN
 # fuzzy
 #. :ARM:051:
-#: zypp/CountryCode.cc:209
+#: zypp/CountryCode.cc:165
 msgid "Netherlands Antilles"
 msgstr "Nederland"
 
 # NC
 # fuzzy
 #. :NAM:516:
-#: zypp/CountryCode.cc:361
+#: zypp/CountryCode.cc:317
 msgid "New Caledonia"
 msgstr "Ny-Caledonia"
 
 #. :NIU:570:
-#: zypp/CountryCode.cc:371
+#: zypp/CountryCode.cc:327
 msgid "New Zealand"
 msgstr "New Zealand"
 
-#: zypp/target/TargetImpl.cc:790
+#: zypp/target/TargetImpl.cc:801
 msgid "New update message"
 msgstr "Melding om ny oppdatering"
 
 #. language code: nia
-#: zypp/LanguageCode.cc:842
+#: zypp/LanguageCode.cc:797
 msgid "Nias"
 msgstr "Nias"
 
 #. :NGA:566:
-#: zypp/CountryCode.cc:365
+#: zypp/CountryCode.cc:321
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
 # NG
 # fuzzy
 #. :NCL:540:
-#: zypp/CountryCode.cc:362
+#: zypp/CountryCode.cc:318
 msgid "Niger"
 msgstr "Niger"
 
 #. language code: nic
-#: zypp/LanguageCode.cc:844
+#: zypp/LanguageCode.cc:799
 msgid "Niger-Kordofanian (Other)"
 msgstr "Niger-kordofaniansk (annet)"
 
 # NG
 # fuzzy
 #. :NFK:574:
-#: zypp/CountryCode.cc:364
+#: zypp/CountryCode.cc:320
 msgid "Nigeria"
 msgstr "Nigeria"
 
 #. language code: ssa
-#: zypp/LanguageCode.cc:1040
+#: zypp/LanguageCode.cc:995
 msgid "Nilo-Saharan (Other)"
 msgstr "Nilosaharansk (annet)"
 
 #. :NRU:520:
-#: zypp/CountryCode.cc:370
+#: zypp/CountryCode.cc:326
 msgid "Niue"
 msgstr "Niue"
 
 #. language code: niu
-#: zypp/LanguageCode.cc:846
+#: zypp/LanguageCode.cc:801
 msgid "Niuean"
 msgstr "Niueansk"
 
 #. Defined CountryCode constants
 #. Defined LanguageCode constants
-#: zypp/CountryCode.cc:193 zypp/LanguageCode.cc:193
+#: zypp/CountryCode.cc:149 zypp/LanguageCode.cc:148
 msgid "No Code"
 msgstr "Ingen kode"
 
@@ -3099,62 +3129,62 @@
 msgstr "Ingen nettadresse i pakkebrønn."
 
 #. language code: nog
-#: zypp/LanguageCode.cc:852
+#: zypp/LanguageCode.cc:807
 msgid "Nogai"
 msgstr "Nogai"
 
 #. :NER:562:
-#: zypp/CountryCode.cc:363
+#: zypp/CountryCode.cc:319
 msgid "Norfolk Island"
 msgstr "Norfolkøyene"
 
 #. language code: non
-#: zypp/LanguageCode.cc:854
+#: zypp/LanguageCode.cc:809
 msgid "Norse, Old"
 msgstr "Norrønt, gammelnorrønt"
 
 #. language code: nai
-#: zypp/LanguageCode.cc:822
+#: zypp/LanguageCode.cc:777
 msgid "North American Indian"
 msgstr "Nordamerikansk indiansk"
 
 #. :KNA:659:
-#: zypp/CountryCode.cc:321
+#: zypp/CountryCode.cc:277
 msgid "North Korea"
 msgstr "Nord-Korea"
 
 #. :MAC:446:
-#: zypp/CountryCode.cc:349
+#: zypp/CountryCode.cc:305
 msgid "Northern Mariana Islands"
 msgstr "Nord-Marianene"
 
 #. language code: sme se
-#: zypp/LanguageCode.cc:1008
+#: zypp/LanguageCode.cc:963
 msgid "Northern Sami"
 msgstr "Nordsamisk"
 
 #. language code: nso
-#: zypp/LanguageCode.cc:858
+#: zypp/LanguageCode.cc:813
 msgid "Northern Sotho"
 msgstr "Sotho, nordlig"
 
 #. :NLD:528:
-#: zypp/CountryCode.cc:367
+#: zypp/CountryCode.cc:323
 msgid "Norway"
 msgstr "Norge"
 
 #. language code: nor no
-#: zypp/LanguageCode.cc:856
+#: zypp/LanguageCode.cc:811
 msgid "Norwegian"
 msgstr "Norsk"
 
 #. language code: nob nb
-#: zypp/LanguageCode.cc:850
+#: zypp/LanguageCode.cc:805
 msgid "Norwegian Bokmal"
 msgstr "Norsk bokmål"
 
 #. language code: nno nn
-#: zypp/LanguageCode.cc:848
+#: zypp/LanguageCode.cc:803
 msgid "Norwegian Nynorsk"
 msgstr "Norsk nynorsk"
 
@@ -3163,27 +3193,27 @@
 msgstr "Ikke en CD-ROM-stasjon"
 
 #. language code: nub
-#: zypp/LanguageCode.cc:860
+#: zypp/LanguageCode.cc:815
 msgid "Nubian Languages"
 msgstr "Nubiske språk"
 
 #. language code: nym
-#: zypp/LanguageCode.cc:866
+#: zypp/LanguageCode.cc:821
 msgid "Nyamwezi"
 msgstr "Nyamwezi"
 
 #. language code: nyn
-#: zypp/LanguageCode.cc:868
+#: zypp/LanguageCode.cc:823
 msgid "Nyankole"
 msgstr "Nyankole"
 
 #. language code: nyo
-#: zypp/LanguageCode.cc:870
+#: zypp/LanguageCode.cc:825
 msgid "Nyoro"
 msgstr "Nyoro"
 
 #. language code: nzi
-#: zypp/LanguageCode.cc:872
+#: zypp/LanguageCode.cc:827
 msgid "Nzima"
 msgstr "Nzima"
 
@@ -3194,22 +3224,22 @@
 msgstr "behold den foreldede pakken %s"
 
 #. language code: oci oc
-#: zypp/LanguageCode.cc:874
+#: zypp/LanguageCode.cc:829
 msgid "Occitan (post 1500)"
 msgstr "Oksitansk (etter 1500)"
 
 #. language code: oji oj
-#: zypp/LanguageCode.cc:876
+#: zypp/LanguageCode.cc:831
 msgid "Ojibwa"
 msgstr "Ojibwa"
 
 #. :NZL:554:
-#: zypp/CountryCode.cc:372
+#: zypp/CountryCode.cc:328
 msgid "Oman"
 msgstr "Oman"
 
-#: zypp/parser/RepoindexFileReader.cc:199
-#, c-format
+#: zypp/parser/RepoindexFileReader.cc:209
+#, c-format, boost-format
 msgid "One or both of '%s' or '%s' attributes is required."
 msgstr "Én eller begge attributtene '%s' eller '%s' kreves."
 
@@ -3220,187 +3250,187 @@
 # SY
 # fuzzy
 #. language code: ori or
-#: zypp/LanguageCode.cc:878
+#: zypp/LanguageCode.cc:833
 msgid "Oriya"
 msgstr "Oriya"
 
 #. language code: orm om
-#: zypp/LanguageCode.cc:880
+#: zypp/LanguageCode.cc:835
 msgid "Oromo"
 msgstr "Oromo"
 
 #. language code: osa
-#: zypp/LanguageCode.cc:882
+#: zypp/LanguageCode.cc:837
 msgid "Osage"
 msgstr "Osage"
 
 #. language code: oss os
-#: zypp/LanguageCode.cc:884
+#: zypp/LanguageCode.cc:839
 msgid "Ossetian"
 msgstr "Ossetisk"
 
 #. language code: oto
-#: zypp/LanguageCode.cc:888
+#: zypp/LanguageCode.cc:843
 msgid "Otomian Languages"
 msgstr "Otomianske språk"
 
 #. TranslatorExplanation %s = package being checked for integrity
-#: zypp/repo/PackageProvider.cc:149
-#, c-format
+#: zypp/repo/PackageProvider.cc:157
+#, c-format, boost-format
 msgid "Package %s seems to be corrupted during transfer. Do you want to retry retrieval?"
 msgstr "Det ser ut til at pakken %s har blitt skadet under overføring. Vil du prøve å laste den ned på nytt?"
 
 #. language code: pal
-#: zypp/LanguageCode.cc:894
+#: zypp/LanguageCode.cc:849
 msgid "Pahlavi"
 msgstr "Pahlavi"
 
 #. :PHL:608:
-#: zypp/CountryCode.cc:378
+#: zypp/CountryCode.cc:334
 msgid "Pakistan"
 msgstr "Pakistan"
 
 #. :PRT:620:
-#: zypp/CountryCode.cc:385
+#: zypp/CountryCode.cc:341
 msgid "Palau"
 msgstr "Palau"
 
 #. language code: pau
-#: zypp/LanguageCode.cc:902
+#: zypp/LanguageCode.cc:857
 msgid "Palauan"
 msgstr "Palauansk"
 
 #. :PRI:630:
-#: zypp/CountryCode.cc:383
+#: zypp/CountryCode.cc:339
 msgid "Palestinian Territory"
 msgstr "Palestina"
 
 #. language code: pli pi
-#: zypp/LanguageCode.cc:914
+#: zypp/LanguageCode.cc:869
 msgid "Pali"
 msgstr "Pali"
 
 #. language code: pam
-#: zypp/LanguageCode.cc:896
+#: zypp/LanguageCode.cc:851
 msgid "Pampanga"
 msgstr "Pampanga"
 
 #. :OMN:512:
-#: zypp/CountryCode.cc:373
+#: zypp/CountryCode.cc:329
 msgid "Panama"
 msgstr "Panama"
 
 #. language code: pag
-#: zypp/LanguageCode.cc:892
+#: zypp/LanguageCode.cc:847
 msgid "Pangasinan"
 msgstr "Pangasinansk"
 
 #. language code: pan pa
-#: zypp/LanguageCode.cc:898
+#: zypp/LanguageCode.cc:853
 msgid "Panjabi"
 msgstr "Panjabi"
 
 #. language code: pap
-#: zypp/LanguageCode.cc:900
+#: zypp/LanguageCode.cc:855
 msgid "Papiamento"
 msgstr "Papiamento"
 
 #. :PYF:258:
-#: zypp/CountryCode.cc:376
+#: zypp/CountryCode.cc:332
 msgid "Papua New Guinea"
 msgstr "Papua Ny-Guinea"
 
 #. language code: paa
-#: zypp/LanguageCode.cc:890
+#: zypp/LanguageCode.cc:845
 msgid "Papuan (Other)"
 msgstr "Papuansk (annet)"
 
 #. :PLW:585:
-#: zypp/CountryCode.cc:386
+#: zypp/CountryCode.cc:342
 msgid "Paraguay"
 msgstr "Paraguay"
 
 #: zypp/media/MediaException.cc:106
-#, c-format
+#, c-format, boost-format
 msgid "Path '%s' on medium '%s' is not a directory."
 msgstr "Stien '%s' på mediet '%s' er ikke en katalog."
 
 #: zypp/media/MediaException.cc:98
-#, c-format
+#, c-format, boost-format
 msgid "Path '%s' on medium '%s' is not a file."
 msgstr "Stien '%s' på mediet '%s' er ikke en fil."
 
 #: zypp/media/MediaException.cc:199
-#, c-format
+#, c-format, boost-format
 msgid "Permission to access '%s' denied."
 msgstr "Tilgang til '%s' avvist."
 
 #. language code: per fas fa
-#: zypp/LanguageCode.cc:906 zypp/LanguageCode.cc:908
+#: zypp/LanguageCode.cc:861 zypp/LanguageCode.cc:863
 msgid "Persian"
 msgstr "Persisk"
 
 #. language code: peo
-#: zypp/LanguageCode.cc:904
+#: zypp/LanguageCode.cc:859
 msgid "Persian, Old (ca.600-400 B.C.)"
 msgstr "Persisk, gammelpersisk (ca. 600-400 B.C.)"
 
 #. :PAN:591:
-#: zypp/CountryCode.cc:374
+#: zypp/CountryCode.cc:330
 msgid "Peru"
 msgstr "Peru"
 
 #. language code: phi
-#: zypp/LanguageCode.cc:910
+#: zypp/LanguageCode.cc:865
 msgid "Philippine (Other)"
 msgstr "Filippinsk (annet)"
 
 #. :PNG:598:
-#: zypp/CountryCode.cc:377
+#: zypp/CountryCode.cc:333
 msgid "Philippines"
 msgstr "Filippinene"
 
 #. language code: phn
-#: zypp/LanguageCode.cc:912
+#: zypp/LanguageCode.cc:867
 msgid "Phoenician"
 msgstr "Fønisisk"
 
 #. :SPM:666:
-#: zypp/CountryCode.cc:381
+#: zypp/CountryCode.cc:337
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: zypp/misc/CheckAccessDeleted.cc:207
+#: zypp/misc/CheckAccessDeleted.cc:242
 msgid "Please install package 'lsof' first."
 msgstr "Installer pakken 'lsof' først."
 
 #. language code: pon
-#: zypp/LanguageCode.cc:918
+#: zypp/LanguageCode.cc:873
 msgid "Pohnpeian"
 msgstr "Pohnpeiansk"
 
 #. :PAK:586:
-#: zypp/CountryCode.cc:379
+#: zypp/CountryCode.cc:335
 msgid "Poland"
 msgstr "Polen"
 
 #. language code: pol pl
-#: zypp/LanguageCode.cc:916
+#: zypp/LanguageCode.cc:871
 msgid "Polish"
 msgstr "Polsk"
 
 #. :PSE:275:
-#: zypp/CountryCode.cc:384
+#: zypp/CountryCode.cc:340
 msgid "Portugal"
 msgstr "Portugal"
 
 #. language code: por pt
-#: zypp/LanguageCode.cc:920
+#: zypp/LanguageCode.cc:875
 msgid "Portuguese"
 msgstr "Portugisisk"
 
 #. language code: pra
-#: zypp/LanguageCode.cc:922
+#: zypp/LanguageCode.cc:877
 msgid "Prakrit Languages"
 msgstr "Prakrit-språk"
 
@@ -3421,7 +3451,7 @@
 msgstr "Problemløsning, dvs. teknisk støtte som er utformet for å løse sammensatte problemer ved hjelp av teknisk ekspertise, og som kan rette produktfeil som er identifisert med Nivå 2-brukerstøtte."
 
 #. language code: pro
-#: zypp/LanguageCode.cc:924
+#: zypp/LanguageCode.cc:879
 msgid "Provencal, Old (to 1500)"
 msgstr "Provensalsk, gammelprovensalsk (til 1500)"
 
@@ -3430,55 +3460,55 @@
 msgstr "Inneholder"
 
 #. :PCN:612:
-#: zypp/CountryCode.cc:382
+#: zypp/CountryCode.cc:338
 msgid "Puerto Rico"
 msgstr "Puerto Rico"
 
 #. language code: pus ps
-#: zypp/LanguageCode.cc:926
+#: zypp/LanguageCode.cc:881
 msgid "Pushto"
 msgstr "Pushto"
 
 #. :PRY:600:
-#: zypp/CountryCode.cc:387
+#: zypp/CountryCode.cc:343
 msgid "Qatar"
 msgstr "Qatar"
 
 #. language code: que qu
-#: zypp/LanguageCode.cc:928
+#: zypp/LanguageCode.cc:883
 msgid "Quechua"
 msgstr "Quechua"
 
-#: zypp/url/UrlBase.cc:782 zypp/url/UrlBase.cc:1227
+#: zypp/url/UrlBase.cc:786 zypp/url/UrlBase.cc:1231
 msgid "Query string parsing not supported for this URL"
 msgstr "Analyse av spørringsstreng støttes ikke for denne URL-en"
 
 #. TranslatorExplanation after semicolon is error message
 #. TranslatorExplanation the colon is followed by an error message
-#: zypp/target/rpm/RpmDb.cc:846 zypp/target/rpm/RpmDb.cc:1963
-#: zypp/target/rpm/RpmDb.cc:2110
+#: zypp/target/rpm/RpmDb.cc:850 zypp/target/rpm/RpmDb.cc:2044
+#: zypp/target/rpm/RpmDb.cc:2190
 msgid "RPM failed: "
 msgstr "RPM mislyktes: "
 
 #. language code: roh rm
-#: zypp/LanguageCode.cc:938
+#: zypp/LanguageCode.cc:893
 msgid "Raeto-Romance"
 msgstr "Retoromansk"
 
 # KZ
 # fuzzy
 #. language code: raj
-#: zypp/LanguageCode.cc:930
+#: zypp/LanguageCode.cc:885
 msgid "Rajasthani"
 msgstr "Rajasthani"
 
 #. language code: rap
-#: zypp/LanguageCode.cc:932
+#: zypp/LanguageCode.cc:887
 msgid "Rapanui"
 msgstr "Rapanui"
 
 #. language code: rar
-#: zypp/LanguageCode.cc:934
+#: zypp/LanguageCode.cc:889
 msgid "Rarotongan"
 msgstr "Rarotongansk"
 
@@ -3486,21 +3516,21 @@
 msgid "Recommends"
 msgstr "Anbefalt"
 
-#: zypp/url/UrlBase.cc:1115 zypp/url/UrlBase.cc:1129
+#: zypp/url/UrlBase.cc:1119 zypp/url/UrlBase.cc:1133
 msgid "Relative path not allowed if authority exists"
 msgstr "Relativ sti ikke tillatt hvis autoritet finnes"
 
-#: zypp/RepoManager.cc:1552
-#, c-format
+#: zypp/RepoManager.cc:1687
+#, c-format, boost-format
 msgid "Removing repository '%s'"
 msgstr "Fjerner pakkebrønnen '%s'"
 
-#: zypp/RepoManager.cc:255
+#: zypp/RepoManager.cc:268
 msgid "Repository alias cannot start with dot."
 msgstr "Et pakkebrønnalias kan ikke begynne med punktum."
 
-#: zypp/parser/RepoindexFileReader.cc:187
-#, c-format
+#: zypp/parser/RepoindexFileReader.cc:197
+#, c-format, boost-format
 msgid "Required attribute '%s' is missing."
 msgstr "Nødvendig attributt '%s' mangler."
 
@@ -3509,192 +3539,192 @@
 msgstr "Krever"
 
 #. :QAT:634:
-#: zypp/CountryCode.cc:388
+#: zypp/CountryCode.cc:344
 msgid "Reunion"
 msgstr "Reunion"
 
 #. language code: roa
-#: zypp/LanguageCode.cc:936
+#: zypp/LanguageCode.cc:891
 msgid "Romance (Other)"
 msgstr "Romansk (annet)"
 
 #. :REU:638:
-#: zypp/CountryCode.cc:389
+#: zypp/CountryCode.cc:345
 msgid "Romania"
 msgstr "Romania"
 
 #. language code: rum ron ro
-#: zypp/LanguageCode.cc:942 zypp/LanguageCode.cc:944
+#: zypp/LanguageCode.cc:897 zypp/LanguageCode.cc:899
 msgid "Romanian"
 msgstr "Rumensk"
 
 #. language code: rom
-#: zypp/LanguageCode.cc:940
+#: zypp/LanguageCode.cc:895
 msgid "Romany"
 msgstr "Romsk"
 
 #. language code: run rn
-#: zypp/LanguageCode.cc:946
+#: zypp/LanguageCode.cc:901
 msgid "Rundi"
 msgstr "Rundi"
 
 #. language code: rus ru
-#: zypp/LanguageCode.cc:948
+#: zypp/LanguageCode.cc:903
 msgid "Russian"
 msgstr "Russisk"
 
-#: zypp/CountryCode.cc:391
+#: zypp/CountryCode.cc:347
 msgid "Russian Federation"
 msgstr "Russland"
 
 # RW
 # fuzzy
 #. :RUS:643:
-#: zypp/CountryCode.cc:392
+#: zypp/CountryCode.cc:348
 msgid "Rwanda"
 msgstr "Rwanda"
 
 #. :SGP:702:
-#: zypp/CountryCode.cc:399
+#: zypp/CountryCode.cc:355
 msgid "Saint Helena"
 msgstr "St. Helena"
 
 # KN
 # fuzzy
 #. :COM:174:
-#: zypp/CountryCode.cc:320
+#: zypp/CountryCode.cc:276
 msgid "Saint Kitts and Nevis"
 msgstr "St. Kitts og Nevis"
 
 # LC
 # fuzzy
 #. :LBN:422:
-#: zypp/CountryCode.cc:328
+#: zypp/CountryCode.cc:284
 msgid "Saint Lucia"
 msgstr "St. Lucia"
 
-#: zypp/CountryCode.cc:341
+#: zypp/CountryCode.cc:297
 msgid "Saint Martin"
 msgstr "Saint Martin"
 
 #. :POL:616:
-#: zypp/CountryCode.cc:380
+#: zypp/CountryCode.cc:336
 msgid "Saint Pierre and Miquelon"
 msgstr "Saint Pierre og Miquelon"
 
 # VC
 # fuzzy
 #. :VAT:336:
-#: zypp/CountryCode.cc:435
+#: zypp/CountryCode.cc:391
 msgid "Saint Vincent and the Grenadines"
 msgstr "St. Vincent og Grenadinene"
 
 #. language code: sal
-#: zypp/LanguageCode.cc:958
+#: zypp/LanguageCode.cc:913
 msgid "Salishan Languages"
 msgstr "Salisjanske språk"
 
 #. language code: sam
-#: zypp/LanguageCode.cc:960
+#: zypp/LanguageCode.cc:915
 msgid "Samaritan Aramaic"
 msgstr "Samaritansk arameisk"
 
 #. language code: smi
-#: zypp/LanguageCode.cc:1010
+#: zypp/LanguageCode.cc:965
 msgid "Sami Languages (Other)"
 msgstr "Samiske språk (annet)"
 
 #. :WLF:876:
-#: zypp/CountryCode.cc:442
+#: zypp/CountryCode.cc:398
 msgid "Samoa"
 msgstr "Samoa"
 
 #. language code: smo sm
-#: zypp/LanguageCode.cc:1016
+#: zypp/LanguageCode.cc:971
 msgid "Samoan"
 msgstr "Samoisk"
 
 #. :SLE:694:
-#: zypp/CountryCode.cc:404
+#: zypp/CountryCode.cc:360
 msgid "San Marino"
 msgstr "San Marino"
 
 #. language code: sad
-#: zypp/LanguageCode.cc:950
+#: zypp/LanguageCode.cc:905
 msgid "Sandawe"
 msgstr "Sandawe"
 
 #. language code: sag sg
-#: zypp/LanguageCode.cc:952
+#: zypp/LanguageCode.cc:907
 msgid "Sango"
 msgstr "Sango"
 
 #. language code: san sa
-#: zypp/LanguageCode.cc:962
+#: zypp/LanguageCode.cc:917
 msgid "Sanskrit"
 msgstr "Sanskrit"
 
 #. language code: sat
-#: zypp/LanguageCode.cc:966
+#: zypp/LanguageCode.cc:921
 msgid "Santali"
 msgstr "Santali"
 
 #. :SUR:740:
-#: zypp/CountryCode.cc:408
+#: zypp/CountryCode.cc:364
 msgid "Sao Tome and Principe"
 msgstr "Sao Tome og Principe"
 
 #. language code: srd sc
-#: zypp/LanguageCode.cc:1036
+#: zypp/LanguageCode.cc:991
 msgid "Sardinian"
 msgstr "Sardinsk"
 
 #. language code: sas
-#: zypp/LanguageCode.cc:964
+#: zypp/LanguageCode.cc:919
 msgid "Sasak"
 msgstr "Sasak"
 
 #. :RWA:646:
-#: zypp/CountryCode.cc:393
+#: zypp/CountryCode.cc:349
 msgid "Saudi Arabia"
 msgstr "Saudi-Arabia"
 
 #. language code: sco
-#: zypp/LanguageCode.cc:974
+#: zypp/LanguageCode.cc:929
 msgid "Scots"
 msgstr "Skotsk"
 
 #. language code: sel
-#: zypp/LanguageCode.cc:980
+#: zypp/LanguageCode.cc:935
 msgid "Selkup"
 msgstr "Selkup"
 
 #. language code: sem
-#: zypp/LanguageCode.cc:982
+#: zypp/LanguageCode.cc:937
 msgid "Semitic (Other)"
 msgstr "Semittisk (annet)"
 
 #. :SMR:674:
-#: zypp/CountryCode.cc:405
+#: zypp/CountryCode.cc:361
 msgid "Senegal"
 msgstr "Senegal"
 
 #. :ROU:642:
-#: zypp/CountryCode.cc:390
+#: zypp/CountryCode.cc:346
 msgid "Serbia"
 msgstr "Serbia"
 
 #. language code: scc srp sr
-#: zypp/LanguageCode.cc:968 zypp/LanguageCode.cc:970
+#: zypp/LanguageCode.cc:923 zypp/LanguageCode.cc:925
 msgid "Serbian"
 msgstr "Serbisk"
 
 #. language code: srr
-#: zypp/LanguageCode.cc:1038
+#: zypp/LanguageCode.cc:993
 msgid "Serer"
 msgstr "Serer"
 
-#: zypp/RepoManager.cc:266
+#: zypp/RepoManager.cc:279
 msgid "Service alias cannot start with dot."
 msgstr "Tjenestealiaset kan ikke begynne med punktum."
 
@@ -3705,151 +3735,183 @@
 msgstr "ressurstypen VAR1 støtter ikke funksjonen 'vis endringer'"
 
 #. :SLB:090:
-#: zypp/CountryCode.cc:395
+#: zypp/CountryCode.cc:351
 msgid "Seychelles"
 msgstr "Seychellene"
 
 #. language code: shn
-#: zypp/LanguageCode.cc:988
+#: zypp/LanguageCode.cc:943
 msgid "Shan"
 msgstr "Shan"
 
 #. language code: sna sn
-#: zypp/LanguageCode.cc:1020
+#: zypp/LanguageCode.cc:975
 msgid "Shona"
 msgstr "Shona"
 
 #. language code: iii ii
-#: zypp/LanguageCode.cc:596
+#: zypp/LanguageCode.cc:551
 msgid "Sichuan Yi"
 msgstr "Sichuan Yi"
 
 #. language code: scn
-#: zypp/LanguageCode.cc:972
+#: zypp/LanguageCode.cc:927
 msgid "Sicilian"
 msgstr "Siciliansk"
 
 #. language code: sid
-#: zypp/LanguageCode.cc:990
+#: zypp/LanguageCode.cc:945
 msgid "Sidamo"
 msgstr "Sidamo"
 
 #. :SVK:703:
-#: zypp/CountryCode.cc:403
+#: zypp/CountryCode.cc:359
 msgid "Sierra Leone"
 msgstr "Sierra Leone"
 
 #. language code: sgn
-#: zypp/LanguageCode.cc:986
+#: zypp/LanguageCode.cc:941
 msgid "Sign Languages"
 msgstr "Tegnspråk"
 
-#: zypp/KeyRing.cc:565
-#, c-format
+#. translators: possible rpm package signature check result [brief]
+#: zypp/target/rpm/RpmDb.cc:2370
+#, fuzzy
+#| msgid "Signature file %s not found"
+msgid "Signature does not verify"
+msgstr "Signaturfilen %s ikke funnet"
+
+#: zypp/KeyRing.cc:578
+#, c-format, boost-format
 msgid "Signature file %s not found"
 msgstr "Signaturfilen %s ikke funnet"
 
+#. translators: possible rpm package signature check result [brief]
+#: zypp/target/rpm/RpmDb.cc:2366
+#, fuzzy
+#| msgid "Signature file %s not found"
+msgid "Signature is OK"
+msgstr "Signaturfilen %s ikke funnet"
+
+#. translators: possible rpm package signature check result [brief]
+#: zypp/target/rpm/RpmDb.cc:2372
+#, fuzzy
+#| msgid "Signature file %s not found"
+msgid "Signature is OK, but key is not trusted"
+msgstr "Signaturfilen %s ikke funnet"
+
+#: zypp/repo/PackageProvider.cc:216
+#, fuzzy
+#| msgid " execution failed"
+msgid "Signature verification failed"
+msgstr " kjøring mislyktes"
+
+#. translators: possible rpm package signature check result [brief]
+#: zypp/target/rpm/RpmDb.cc:2374
+msgid "Signatures public key is not available"
+msgstr ""
+
 #. language code: bla
-#: zypp/LanguageCode.cc:322
+#: zypp/LanguageCode.cc:277
 msgid "Siksika"
 msgstr "Siksika"
 
 #. language code: snd sd
-#: zypp/LanguageCode.cc:1022
+#: zypp/LanguageCode.cc:977
 msgid "Sindhi"
 msgstr "Sindhi"
 
 #. :SWE:752:
-#: zypp/CountryCode.cc:398
+#: zypp/CountryCode.cc:354
 msgid "Singapore"
 msgstr "Singapore"
 
 #. language code: sin si
-#: zypp/LanguageCode.cc:992
+#: zypp/LanguageCode.cc:947
 msgid "Sinhala"
 msgstr "Sinhala"
 
 #. language code: sit
-#: zypp/LanguageCode.cc:996
+#: zypp/LanguageCode.cc:951
 msgid "Sino-Tibetan (Other)"
 msgstr "Sinotibetansk (annet)"
 
 #. language code: sio
-#: zypp/LanguageCode.cc:994
+#: zypp/LanguageCode.cc:949
 msgid "Siouan Languages"
 msgstr "Siouanske språk"
 
 #. language code: sms
-#: zypp/LanguageCode.cc:1018
+#: zypp/LanguageCode.cc:973
 msgid "Skolt Sami"
 msgstr "Skoltesamisk"
 
 #. language code: den
-#: zypp/LanguageCode.cc:428
+#: zypp/LanguageCode.cc:383
 msgid "Slave (Athapascan)"
 msgstr "Slavisk (athapascansk)"
 
 #. language code: sla
-#: zypp/LanguageCode.cc:998
+#: zypp/LanguageCode.cc:953
 msgid "Slavic (Other)"
 msgstr "Slavisk (annet)"
 
 #. language code: slo slk sk
-#: zypp/LanguageCode.cc:1000 zypp/LanguageCode.cc:1002
+#: zypp/LanguageCode.cc:955 zypp/LanguageCode.cc:957
 msgid "Slovak"
 msgstr "Slovakisk"
 
 #. :SJM:744:
-#: zypp/CountryCode.cc:402
+#: zypp/CountryCode.cc:358
 msgid "Slovakia"
 msgstr "Slovakia"
 
 #. :SHN:654:
-#: zypp/CountryCode.cc:400
+#: zypp/CountryCode.cc:356
 msgid "Slovenia"
 msgstr "Slovenia"
 
 #. language code: slv sl
-#: zypp/LanguageCode.cc:1004
+#: zypp/LanguageCode.cc:959
 msgid "Slovenian"
 msgstr "Slovensk"
 
 #. language code: sog
-#: zypp/LanguageCode.cc:1026
+#: zypp/LanguageCode.cc:981
 msgid "Sogdian"
 msgstr "Sogdiansk"
 
 #. :SAU:682:
-#: zypp/CountryCode.cc:394
+#: zypp/CountryCode.cc:350
 msgid "Solomon Islands"
 msgstr "Solomonøyene"
 
 # SO
 # fuzzy
 #. language code: som so
-#: zypp/LanguageCode.cc:1028
+#: zypp/LanguageCode.cc:983
 msgid "Somali"
 msgstr "Somalisk"
 
 # SO
 # fuzzy
 #. :SEN:686:
-#: zypp/CountryCode.cc:406
+#: zypp/CountryCode.cc:362
 msgid "Somalia"
 msgstr "Somalia"
 
 #. language code: son
-#: zypp/LanguageCode.cc:1030
+#: zypp/LanguageCode.cc:985
 msgid "Songhai"
 msgstr "Songhai"
 
 #. language code: snk
-#: zypp/LanguageCode.cc:1024
+#: zypp/LanguageCode.cc:979
 msgid "Soninke"
 msgstr "Soninke"
 
 #. language code: wen
-#: zypp/LanguageCode.cc:1164
+#: zypp/LanguageCode.cc:1119
 msgid "Sorbian Languages"
 msgstr "Sorbianske språk"
 
@@ -3858,57 +3920,57 @@
 msgstr "Beklager, men denne versjonen av libzypp er kompilert uten HAL-støtte."
 
 #. language code: sot st
-#: zypp/LanguageCode.cc:1032
+#: zypp/LanguageCode.cc:987
 msgid "Sotho, Southern"
 msgstr "Sotho, sørlig"
 
 #. :MYT:175:
-#: zypp/CountryCode.cc:445
+#: zypp/CountryCode.cc:401
 msgid "South Africa"
 msgstr "Sør-Afrika"
 
 #. language code: sai
-#: zypp/LanguageCode.cc:956
+#: zypp/LanguageCode.cc:911
 msgid "South American Indian (Other)"
 msgstr "Søramerikansk indiansk (annet)"
 
 #. :GRC:300:
-#: zypp/CountryCode.cc:290
+#: zypp/CountryCode.cc:246
 msgid "South Georgia and the South Sandwich Islands"
 msgstr "Sør-Georgia og De sørlige sandwichøyene"
 
 #. :PRK:408:
-#: zypp/CountryCode.cc:322
+#: zypp/CountryCode.cc:278
 msgid "South Korea"
 msgstr "Sør-Korea"
 
 #. language code: alt
-#: zypp/LanguageCode.cc:238
+#: zypp/LanguageCode.cc:193
 msgid "Southern Altai"
 msgstr "Sør-altaisk"
 
 #. language code: sma
-#: zypp/LanguageCode.cc:1006
+#: zypp/LanguageCode.cc:961
 msgid "Southern Sami"
 msgstr "Sørsamisk"
 
 #. :ERI:232:
-#: zypp/CountryCode.cc:267
+#: zypp/CountryCode.cc:223
 msgid "Spain"
 msgstr "Spania"
 
 #. language code: spa es
-#: zypp/LanguageCode.cc:1034
+#: zypp/LanguageCode.cc:989
 msgid "Spanish"
 msgstr "Spansk"
 
 #. :LIE:438:
-#: zypp/CountryCode.cc:330
+#: zypp/CountryCode.cc:286
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
 #. :SYC:690:
-#: zypp/CountryCode.cc:396
+#: zypp/CountryCode.cc:352
 msgid "Sudan"
 msgstr "Sudan"
 
@@ -3917,17 +3979,17 @@
 msgstr "Forslag"
 
 #. language code: suk
-#: zypp/LanguageCode.cc:1044
+#: zypp/LanguageCode.cc:999
 msgid "Sukuma"
 msgstr "Sukuma"
 
 #. language code: sux
-#: zypp/LanguageCode.cc:1050
+#: zypp/LanguageCode.cc:1005
 msgid "Sumerian"
 msgstr "Sumerisk"
 
 #. language code: sun su
-#: zypp/LanguageCode.cc:1046
+#: zypp/LanguageCode.cc:1001
 msgid "Sundanese"
 msgstr "Sudanesisk"
 
@@ -3936,75 +3998,75 @@
 msgstr "Tillegg"
 
 #. :SOM:706:
-#: zypp/CountryCode.cc:407
+#: zypp/CountryCode.cc:363
 msgid "Suriname"
 msgstr "Surinam"
 
 #. language code: sus
-#: zypp/LanguageCode.cc:1048
+#: zypp/LanguageCode.cc:1003
 msgid "Susu"
 msgstr "Susu"
 
 #. :SVN:705:
-#: zypp/CountryCode.cc:401
+#: zypp/CountryCode.cc:357
 msgid "Svalbard and Jan Mayen"
 msgstr "Svalbard og Jan Mayen"
 
 # SZ
 # fuzzy
 #. language code: swa sw
-#: zypp/LanguageCode.cc:1052
+#: zypp/LanguageCode.cc:1007
 msgid "Swahili"
 msgstr "Swahili"
 
 #. language code: ssw ss
-#: zypp/LanguageCode.cc:1042
+#: zypp/LanguageCode.cc:997
 msgid "Swati"
 msgstr "Swati"
 
 # SZ
 # fuzzy
 #. :SYR:760:
-#: zypp/CountryCode.cc:411
+#: zypp/CountryCode.cc:367
 msgid "Swaziland"
 msgstr "Thailand"
 
 #. :SDN:736:
-#: zypp/CountryCode.cc:397
+#: zypp/CountryCode.cc:353
 msgid "Sweden"
 msgstr "Sverige"
 
 #. language code: swe sv
-#: zypp/LanguageCode.cc:1054
+#: zypp/LanguageCode.cc:1009
 msgid "Swedish"
 msgstr "Svensk"
 
 #. :COG:178:
-#: zypp/CountryCode.cc:243
+#: zypp/CountryCode.cc:199
 msgid "Switzerland"
 msgstr "Sveits"
 
 # SY
 # fuzzy
 #. :SLV:222:
-#: zypp/CountryCode.cc:410
+#: zypp/CountryCode.cc:366
 msgid "Syria"
 msgstr "Serbia"
 
 # SY
 # fuzzy
 #. language code: syr
-#: zypp/LanguageCode.cc:1056
+#: zypp/LanguageCode.cc:1011
 msgid "Syriac"
 msgstr "Syrisk"
 
 #: zypp/media/MediaException.cc:91
-#, c-format
+#, c-format, boost-format
 msgid "System exception '%s' on medium '%s'."
 msgstr "Systemunntak '%s' på mediet '%s'."
 
 #: zypp/ZYppFactory.cc:394
-#, c-format
+#, c-format, boost-format
 msgid ""
 "System management is locked by the application with pid %d (%s).\n"
 "Close this application before trying again."
@@ -4013,77 +4075,77 @@
 "Lukk dette programmet før du forsøker igjen."
 
 #. language code: tgl tl
-#: zypp/LanguageCode.cc:1076
+#: zypp/LanguageCode.cc:1031
 msgid "Tagalog"
 msgstr "Tagalogsk"
 
 #. language code: tah ty
-#: zypp/LanguageCode.cc:1058
+#: zypp/LanguageCode.cc:1013
 msgid "Tahitian"
 msgstr "Tahitisk"
 
 #. language code: tai
-#: zypp/LanguageCode.cc:1060
+#: zypp/LanguageCode.cc:1015
 msgid "Tai (Other)"
 msgstr "Tai (annet)"
 
 #. :TUV:798:
-#: zypp/CountryCode.cc:426
+#: zypp/CountryCode.cc:382
 msgid "Taiwan"
 msgstr "Taiwan"
 
 #. language code: tgk tg
-#: zypp/LanguageCode.cc:1074
+#: zypp/LanguageCode.cc:1029
 msgid "Tajik"
 msgstr "Tadsjikisk"
 
 #. :THA:764:
-#: zypp/CountryCode.cc:417
+#: zypp/CountryCode.cc:373
 msgid "Tajikistan"
 msgstr "Tadsjikistan"
 
 #. language code: tmh
-#: zypp/LanguageCode.cc:1096
+#: zypp/LanguageCode.cc:1051
 msgid "Tamashek"
 msgstr "Tamasjek"
 
 #. language code: tam ta
-#: zypp/LanguageCode.cc:1062
+#: zypp/LanguageCode.cc:1017
 msgid "Tamil"
 msgstr "Tamilsk"
 
 #. :TWN:158:
-#: zypp/CountryCode.cc:427
+#: zypp/CountryCode.cc:383
 msgid "Tanzania"
 msgstr "Tanzania"
 
 #. language code: tat tt
-#: zypp/LanguageCode.cc:1064
+#: zypp/LanguageCode.cc:1019
 msgid "Tatar"
 msgstr "Tatar"
 
 #. language code: tel te
-#: zypp/LanguageCode.cc:1066
+#: zypp/LanguageCode.cc:1021
 msgid "Telugu"
 msgstr "Telugu"
 
 #. language code: ter
-#: zypp/LanguageCode.cc:1070
+#: zypp/LanguageCode.cc:1025
 msgid "Tereno"
 msgstr "Tereno"
 
 #. language code: tet
-#: zypp/LanguageCode.cc:1072
+#: zypp/LanguageCode.cc:1027
 msgid "Tetum"
 msgstr "Tetum"
 
 #. language code: tha th
-#: zypp/LanguageCode.cc:1078
+#: zypp/LanguageCode.cc:1033
 msgid "Thai"
 msgstr "Thai"
 
 #. :TGO:768:
-#: zypp/CountryCode.cc:416
+#: zypp/CountryCode.cc:372
 msgid "Thailand"
 msgstr "Thailand"
 
@@ -4099,200 +4161,200 @@
 msgid "This action is being run by another program already."
 msgstr "Denne handlingen utføres allerede av et annet program."
 
-#: zypp/solver/detail/SATResolver.cc:1237
-#: zypp/solver/detail/SATResolver.cc:1258
+#: zypp/solver/detail/SATResolver.cc:1215
+#: zypp/solver/detail/SATResolver.cc:1236
 msgid "This request will break your system!"
 msgstr "Denne kommandoen vil skade systemet!"
 
 #. language code: tib bod bo
-#: zypp/LanguageCode.cc:1080 zypp/LanguageCode.cc:1082
+#: zypp/LanguageCode.cc:1035 zypp/LanguageCode.cc:1037
 msgid "Tibetan"
 msgstr "Tibetansk"
 
 #. language code: tig
-#: zypp/LanguageCode.cc:1084
+#: zypp/LanguageCode.cc:1039
 msgid "Tigre"
 msgstr "Tigre"
 
 # NG
 # fuzzy
 #. language code: tir ti
-#: zypp/LanguageCode.cc:1086
+#: zypp/LanguageCode.cc:1041
 msgid "Tigrinya"
 msgstr "Tigrinya"
 
 #: zypp/media/MediaException.cc:207
-#, c-format
+#, c-format, boost-format
 msgid "Timeout exceeded when accessing '%s'."
 msgstr "Tidsavbrudd under tilgang '%s'."
 
 #. language code: tem
-#: zypp/LanguageCode.cc:1068
+#: zypp/LanguageCode.cc:1023
 msgid "Timne"
 msgstr "Timne"
 
 #. language code: tiv
-#: zypp/LanguageCode.cc:1088
+#: zypp/LanguageCode.cc:1043
 msgid "Tiv"
 msgstr "Tiv"
 
 #. language code: tli
-#: zypp/LanguageCode.cc:1094
+#: zypp/LanguageCode.cc:1049
 msgid "Tlingit"
 msgstr "Tlingit"
 
 #. :ATF:260:
-#: zypp/CountryCode.cc:415
+#: zypp/CountryCode.cc:371
 msgid "Togo"
 msgstr "Togo"
 
 #. language code: tpi
-#: zypp/LanguageCode.cc:1102
+#: zypp/LanguageCode.cc:1057
 msgid "Tok Pisin"
 msgstr "Tok Pisin"
 
 #. :TJK:762:
 #. language code: tkl
-#: zypp/CountryCode.cc:418 zypp/LanguageCode.cc:1090
+#: zypp/CountryCode.cc:374 zypp/LanguageCode.cc:1045
 msgid "Tokelau"
 msgstr "Tokelau"
 
 #. :TUN:788:
-#: zypp/CountryCode.cc:421
+#: zypp/CountryCode.cc:377
 msgid "Tonga"
 msgstr "Tonga"
 
 #. language code: tog
-#: zypp/LanguageCode.cc:1098
+#: zypp/LanguageCode.cc:1053
 msgid "Tonga (Nyasa)"
 msgstr "Tonga (Nyasa)"
 
 #. language code: ton to
-#: zypp/LanguageCode.cc:1100
+#: zypp/LanguageCode.cc:1055
 msgid "Tonga (Tonga Islands)"
 msgstr "Tonga (Tongaøyene)"
 
-#: zypp/KeyRing.cc:512
-#, c-format
+#: zypp/KeyRing.cc:525
+#, c-format, boost-format
 msgid "Tried to import not existent key %s into keyring %s"
 msgstr "Forsøkte å importere ikke-eksisterende nøkkel %s til nøkkelring %s"
 
 # TT
 #. :TUR:792:
-#: zypp/CountryCode.cc:424
+#: zypp/CountryCode.cc:380
 msgid "Trinidad and Tobago"
 msgstr "Trinidad og Tobago"
 
 #. language code: tsi
-#: zypp/LanguageCode.cc:1104
+#: zypp/LanguageCode.cc:1059
 msgid "Tsimshian"
 msgstr "Tsimshian"
 
 #. language code: tso ts
-#: zypp/LanguageCode.cc:1108
+#: zypp/LanguageCode.cc:1063
 msgid "Tsonga"
 msgstr "Tsonga"
 
 #. language code: tsn tn
-#: zypp/LanguageCode.cc:1106
+#: zypp/LanguageCode.cc:1061
 msgid "Tswana"
 msgstr "Tswana"
 
 #. language code: tum
-#: zypp/LanguageCode.cc:1112
+#: zypp/LanguageCode.cc:1067
 msgid "Tumbuka"
 msgstr "Tumbuka"
 
 #. :TKM:795:
-#: zypp/CountryCode.cc:420
+#: zypp/CountryCode.cc:376
 msgid "Tunisia"
 msgstr "Tunisia"
 
 #. language code: tup
-#: zypp/LanguageCode.cc:1114
+#: zypp/LanguageCode.cc:1069
 msgid "Tupi Languages"
 msgstr "Tupi-språk"
 
 #. :TLS:626:
-#: zypp/CountryCode.cc:423
+#: zypp/CountryCode.cc:379
 msgid "Turkey"
 msgstr "Tyrkia"
 
 #. language code: tur tr
-#: zypp/LanguageCode.cc:1116
+#: zypp/LanguageCode.cc:1071
 msgid "Turkish"
 msgstr "Tyrkisk"
 
 #. language code: ota
-#: zypp/LanguageCode.cc:886
+#: zypp/LanguageCode.cc:841
 msgid "Turkish, Ottoman (1500-1928)"
 msgstr "Tyrkisk, ottomansk (1500-1928)"
 
 #. language code: tuk tk
-#: zypp/LanguageCode.cc:1110
+#: zypp/LanguageCode.cc:1065
 msgid "Turkmen"
 msgstr "Turkmensk"
 
 #. :TKL:772:
-#: zypp/CountryCode.cc:419
+#: zypp/CountryCode.cc:375
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
 #. :SWZ:748:
-#: zypp/CountryCode.cc:412
+#: zypp/CountryCode.cc:368
 msgid "Turks and Caicos Islands"
 msgstr "Turks- og Caicosøyene"
 
 #. :TTO:780:
 #. language code: tvl
-#: zypp/CountryCode.cc:425 zypp/LanguageCode.cc:1120
+#: zypp/CountryCode.cc:381 zypp/LanguageCode.cc:1075
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
 #. language code: tyv
-#: zypp/LanguageCode.cc:1124
+#: zypp/LanguageCode.cc:1079
 msgid "Tuvinian"
 msgstr "Tuviniansk"
 
 #. language code: twi tw
-#: zypp/LanguageCode.cc:1122
+#: zypp/LanguageCode.cc:1077
 msgid "Twi"
 msgstr "Twi"
 
 #. language code: udm
-#: zypp/LanguageCode.cc:1126
+#: zypp/LanguageCode.cc:1081
 msgid "Udmurt"
 msgstr "Udmurt"
 
 # UG
 # fuzzy
 #. :UKR:804:
-#: zypp/CountryCode.cc:429
+#: zypp/CountryCode.cc:385
 msgid "Uganda"
 msgstr "Canada"
 
 #. language code: uga
-#: zypp/LanguageCode.cc:1128
+#: zypp/LanguageCode.cc:1083
 msgid "Ugaritic"
 msgstr "Ugaritisk"
 
 #. language code: uig ug
-#: zypp/LanguageCode.cc:1130
+#: zypp/LanguageCode.cc:1085
 msgid "Uighur"
 msgstr "Uighursk"
 
 #. :TZA:834:
-#: zypp/CountryCode.cc:428
+#: zypp/CountryCode.cc:384
 msgid "Ukraine"
 msgstr "Ukraina"
 
 #. language code: ukr uk
-#: zypp/LanguageCode.cc:1132
+#: zypp/LanguageCode.cc:1087
 msgid "Ukrainian"
 msgstr "Ukrainsk"
 
 #. language code: umb
-#: zypp/LanguageCode.cc:1134
+#: zypp/LanguageCode.cc:1089
 msgid "Umbundu"
 msgstr "Umbundu"
 
@@ -4313,66 +4375,67 @@
 msgstr "Kan ikke analysere URL-komponenter"
 
 #. language code: und
-#: zypp/LanguageCode.cc:1136
+#: zypp/LanguageCode.cc:1091
 msgid "Undetermined"
 msgstr "Udefinert"
 
-#: zypp/RepoManager.cc:1201
+#: zypp/RepoManager.cc:1307
 msgid "Unhandled repository type"
 msgstr "Pakkebrønntypen er ugyldig"
 
 #. :AND:020:
-#: zypp/CountryCode.cc:203
+#: zypp/CountryCode.cc:159
 msgid "United Arab Emirates"
 msgstr "De forente arabiske emirater"
 
 #. :GAB:266:
-#: zypp/CountryCode.cc:277
+#: zypp/CountryCode.cc:233
 msgid "United Kingdom"
 msgstr "Storbritannia"
 
 # US
 # fuzzy
 #. :UMI:581:
-#: zypp/CountryCode.cc:431
+#: zypp/CountryCode.cc:387
 msgid "United States"
 msgstr "Amerikas forente stater"
 
 # UM
 # fuzzy
 #. :UGA:800:
-#: zypp/CountryCode.cc:430
+#: zypp/CountryCode.cc:386
 msgid "United States Minor Outlying Islands"
 msgstr "Amerikas forente stater"
 
-#: zypp/CountryCode.cc:113
+#: zypp/CountryCode.cc:50
 msgid "Unknown country: "
 msgstr "Ukjent land: "
 
 #. TranslatorExplanation '%s' is an URL
-#: zypp/RepoManager.cc:1284 zypp/RepoManager.cc:2185
-#, c-format
+#: zypp/RepoManager.cc:1397 zypp/RepoManager.cc:2410
+#, c-format, boost-format
 msgid "Unknown error reading from '%s'"
 msgstr "Ukjent feil ved lesing fra '%s'"
 
-#: zypp/LanguageCode.cc:113
+#: zypp/LanguageCode.cc:49
 msgid "Unknown language: "
 msgstr "Ukjent språk: "
 
-#: zypp/base/StrMatcher.cc:151
-#, c-format
+#: zypp/base/StrMatcher.cc:152
+#, c-format, boost-format
 msgid "Unknown match mode '%s'"
 msgstr "Ukjent samsvarsmodus '%s'"
 
-#: zypp/base/StrMatcher.cc:152
-#, c-format
+#: zypp/base/StrMatcher.cc:153
+#, c-format, boost-format
 msgid "Unknown match mode '%s' for pattern '%s'"
 msgstr "Ukjent samsvarsmodus '%s' for mønsteret '%s'."
 
 #. translators: Cleanup a repository previously owned by a meanwhile unknown (deleted) service.
 #. %1% = service name
 #. %2% = repository name
-#: zypp/RepoManager.cc:671
+#: zypp/RepoManager.cc:779
+#, boost-format
 msgid "Unknown service '%1%': Removing orphaned service repository '%2%'"
 msgstr ""
 
@@ -4380,345 +4443,351 @@
 msgid "Unknown support option. Description not available"
 msgstr "Ukjent brukerstøttevalg. Ingen beskrivelse tilgjengelig"
 
+#. translators: possible rpm package signature check result [brief]
+#: zypp/target/rpm/RpmDb.cc:2368
+msgid "Unknown type of signature"
+msgstr ""
+
 #: zypp/media/MediaUserAuth.cc:136
-#, c-format
+#, c-format, boost-format
 msgid "Unsupported HTTP authentication method '%s'"
 msgstr "HTTP-autentiseringsmetode '%s' er ikke støttet"
 
 #: zypp/media/MediaException.cc:140
-#, c-format
+#, c-format, boost-format
 msgid "Unsupported URI scheme in '%s'."
 msgstr "URI-skjema som ikke støttes i '%s'."
 
 #. language code: hsb
-#: zypp/LanguageCode.cc:580
+#: zypp/LanguageCode.cc:535
 msgid "Upper Sorbian"
 msgstr "Sorbiansk, øvre"
 
 #. language code: urd ur
-#: zypp/LanguageCode.cc:1138
+#: zypp/LanguageCode.cc:1093
 msgid "Urdu"
 msgstr "Urdu"
 
 #: zypp/url/UrlBase.cc:154
-#, c-format
+#, c-format, boost-format
 msgid "Url scheme does not allow a %s"
 msgstr "Adressestrategi tillater ikke %s"
 
-#: zypp/url/UrlBase.cc:1018
+#: zypp/url/UrlBase.cc:1022
 msgid "Url scheme does not allow a host component"
 msgstr "Adressestrategi tillater ikke en vertskomponent"
 
-#: zypp/url/UrlBase.cc:979
+#: zypp/url/UrlBase.cc:983
 msgid "Url scheme does not allow a password"
 msgstr "Adressestrategi tillater ikke passord"
 
-#: zypp/url/UrlBase.cc:1066
+#: zypp/url/UrlBase.cc:1070
 msgid "Url scheme does not allow a port"
 msgstr "Adressestrategi tillater ikke port"
 
-#: zypp/url/UrlBase.cc:945
+#: zypp/url/UrlBase.cc:949
 msgid "Url scheme does not allow a username"
 msgstr "Adressestrategi tillater ikke brukernavn"
 
-#: zypp/url/UrlBase.cc:820
+#: zypp/url/UrlBase.cc:824
 msgid "Url scheme is a required component"
 msgstr "Adressestrategi er en obligatorisk komponent"
 
-#: zypp/url/UrlBase.cc:1008
+#: zypp/url/UrlBase.cc:1012
 msgid "Url scheme requires a host component"
 msgstr "Adressestrategi krever en vertskomponent"
 
-#: zypp/url/UrlBase.cc:1094
+#: zypp/url/UrlBase.cc:1098
 msgid "Url scheme requires path name"
 msgstr "Adressestrategi krever banenavn"
 
 #. :USA:840:
-#: zypp/CountryCode.cc:432
+#: zypp/CountryCode.cc:388
 msgid "Uruguay"
 msgstr "Uruguay"
 
 #. language code: uzb uz
-#: zypp/LanguageCode.cc:1140
+#: zypp/LanguageCode.cc:1095
 msgid "Uzbek"
 msgstr "Usbekistansk"
 
 #. :URY:858:
-#: zypp/CountryCode.cc:433
+#: zypp/CountryCode.cc:389
 msgid "Uzbekistan"
 msgstr "Usbekistan"
 
 #. language code: vai
-#: zypp/LanguageCode.cc:1142
+#: zypp/LanguageCode.cc:1097
 msgid "Vai"
 msgstr "Vai"
 
+#. we will throw this later if no URL checks out fine
+#: zypp/RepoManager.cc:1012
+#, fuzzy
+#| msgid "Valid metadata not found at specified URL(s)"
+msgid "Valid metadata not found at specified URL"
+msgid_plural "Valid metadata not found at specified URLs"
+msgstr[0] "Ingen gyldige metadata funnet på spesifisert(e) nettadresse(r)"
+msgstr[1] "Ingen gyldige metadata funnet på spesifisert(e) nettadresse(r)"
+
 #. :VNM:704:
-#: zypp/CountryCode.cc:440
+#: zypp/CountryCode.cc:396
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
 #. language code: ven ve
-#: zypp/LanguageCode.cc:1144
+#: zypp/LanguageCode.cc:1099
 msgid "Venda"
 msgstr "Venda"
 
 #. :VCT:670:
-#: zypp/CountryCode.cc:436
+#: zypp/CountryCode.cc:392
 msgid "Venezuela"
 msgstr "Venezuela"
 
 # VN
 # fuzzy
 #. :VIR:850:
-#: zypp/CountryCode.cc:439
+#: zypp/CountryCode.cc:395
 msgid "Vietnam"
 msgstr "Vietnam"
 
 #. language code: vie vi
-#: zypp/LanguageCode.cc:1146
+#: zypp/LanguageCode.cc:1101
 msgid "Vietnamese"
 msgstr "Vietnamesisk"
 
 # VI
 # fuzzy
 #. :VGB:092:
-#: zypp/CountryCode.cc:438
+#: zypp/CountryCode.cc:394
 msgid "Virgin Islands, U.S."
 msgstr "Jomfruøyene, USA"
 
-#: zypp/media/MediaCurl.cc:1003
+#: zypp/media/MediaCurl.cc:1006
 msgid "Visit the Novell Customer Center to check whether your registration is valid and has not expired."
 msgstr "Besøk Novell kundesenter for å kontrollere om din registrering er gyldig og ikke er utløpt."
 
 #. language code: vol vo
-#: zypp/LanguageCode.cc:1148
+#: zypp/LanguageCode.cc:1103
 msgid "Volapuk"
 msgstr "Volapuk"
 
 #. language code: vot
-#: zypp/LanguageCode.cc:1150
+#: zypp/LanguageCode.cc:1105
 msgid "Votic"
 msgstr "Votisk"
 
 #. language code: wak
-#: zypp/LanguageCode.cc:1152
+#: zypp/LanguageCode.cc:1107
 msgid "Wakashan Languages"
 msgstr "Wakasjanske språk"
 
 #. language code: wal
-#: zypp/LanguageCode.cc:1154
+#: zypp/LanguageCode.cc:1109
 msgid "Walamo"
 msgstr "Walamo"
 
 #. :VUT:548:
-#: zypp/CountryCode.cc:441
+#: zypp/CountryCode.cc:397
 msgid "Wallis and Futuna"
 msgstr "Wallis og Futuna"
 
 #. language code: wln wa
-#: zypp/LanguageCode.cc:1166
+#: zypp/LanguageCode.cc:1121
 msgid "Walloon"
 msgstr "Wallonsk"
 
 #. language code: war
-#: zypp/LanguageCode.cc:1156
+#: zypp/LanguageCode.cc:1111
 msgid "Waray"
 msgstr "Waray"
 
 #. language code: was
-#: zypp/LanguageCode.cc:1158
+#: zypp/LanguageCode.cc:1113
 msgid "Washo"
 msgstr "Washo"
 
 #. language code: wel cym cy
-#: zypp/LanguageCode.cc:1160 zypp/LanguageCode.cc:1162
+#: zypp/LanguageCode.cc:1115 zypp/LanguageCode.cc:1117
 msgid "Welsh"
 msgstr "Walisisk"
 
 #. :EGY:818:
-#: zypp/CountryCode.cc:265
+#: zypp/CountryCode.cc:221
 msgid "Western Sahara"
 msgstr "Vest-Sahara"
 
 #. language code: wol wo
-#: zypp/LanguageCode.cc:1168
+#: zypp/LanguageCode.cc:1123
 msgid "Wolof"
 msgstr "Wolof"
 
 #. language code: xho xh
-#: zypp/LanguageCode.cc:1172
+#: zypp/LanguageCode.cc:1127
 msgid "Xhosa"
 msgstr "Xhosa"
 
 #. language code: sah
-#: zypp/LanguageCode.cc:954
+#: zypp/LanguageCode.cc:909
 msgid "Yakut"
 msgstr "Yakut"
 
 #. language code: yao
-#: zypp/LanguageCode.cc:1174
+#: zypp/LanguageCode.cc:1129
 msgid "Yao"
 msgstr "Yao"
 
 #. language code: yap
-#: zypp/LanguageCode.cc:1176
+#: zypp/LanguageCode.cc:1131
 msgid "Yapese"
 msgstr "Yapesisk"
 
 #. :WSM:882:
-#: zypp/CountryCode.cc:443
+#: zypp/CountryCode.cc:399
 msgid "Yemen"
 msgstr "Jemen"
 
 #. language code: yid yi
-#: zypp/LanguageCode.cc:1178
+#: zypp/LanguageCode.cc:1133
 msgid "Yiddish"
 msgstr "Yiddish"
 
 # CU
 # fuzzy
 #. language code: yor yo
-#: zypp/LanguageCode.cc:1180
+#: zypp/LanguageCode.cc:1135
 msgid "Yoruba"
 msgstr "Yoruba"
 
 #. language code: ypk
-#: zypp/LanguageCode.cc:1182
+#: zypp/LanguageCode.cc:1137
 msgid "Yupik Languages"
 msgstr "Yupik-språk"
 
 # ZM
 # fuzzy
 #. :ZAF:710:
-#: zypp/CountryCode.cc:446
+#: zypp/CountryCode.cc:402
 msgid "Zambia"
 msgstr "Jamaica"
 
 #. language code: znd
-#: zypp/LanguageCode.cc:1190
+#: zypp/LanguageCode.cc:1145
 msgid "Zande"
 msgstr "Zande"
 
 #. language code: zap
-#: zypp/LanguageCode.cc:1184
+#: zypp/LanguageCode.cc:1139
 msgid "Zapotec"
 msgstr "Zapotec"
 
 #. language code: zen
-#: zypp/LanguageCode.cc:1186
+#: zypp/LanguageCode.cc:1141
 msgid "Zenaga"
 msgstr "Zenaga"
 
 #. language code: zha za
-#: zypp/LanguageCode.cc:1188
+#: zypp/LanguageCode.cc:1143
 msgid "Zhuang"
 msgstr "Zhuang"
 
 #. :ZMB:894:
-#: zypp/CountryCode.cc:447
+#: zypp/CountryCode.cc:403
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
 #. language code: zul zu
-#: zypp/LanguageCode.cc:1192
+#: zypp/LanguageCode.cc:1147
 msgid "Zulu"
 msgstr "Zulu"
 
 #. language code: zun
-#: zypp/LanguageCode.cc:1194
+#: zypp/LanguageCode.cc:1149
 msgid "Zuni"
 msgstr "Zuni"
 
-#: zypp/repo/PackageProvider.cc:384
+#: zypp/repo/PackageProvider.cc:515
 msgid "applydeltarpm check failed."
 msgstr "applydeltarpm-kontroll mislyktes."
 
-#: zypp/repo/PackageProvider.cc:394
+#: zypp/repo/PackageProvider.cc:525
 msgid "applydeltarpm failed."
 msgstr "applydeltarpm mislyktes."
 
-#: zypp/solver/detail/SATResolver.cc:1345
-#, c-format
+#: zypp/solver/detail/SATResolver.cc:1323
+#, c-format, boost-format
 msgid "architecture change of %s to %s"
 msgstr "Arkitekturendring fra %s til %s"
 
 #. TranslatorExplanation %s = name of package, patch, selection ...
-#: zypp/solver/detail/ProblemSolutionIgnore.cc:52
-#, c-format
+#: zypp/solver/detail/ProblemSolutionIgnore.cc:42
+#, c-format, boost-format
 msgid "break %s by ignoring some of its dependencies"
 msgstr "ignorer noen avhengigheter selv om %s ikke vil fungere"
 
-#: zypp/solver/detail/SATResolver.cc:1039
-#, c-format
+#: zypp/solver/detail/SATResolver.cc:1017
+#, c-format, boost-format
 msgid "cannot install both %s and %s"
 msgstr "kan ikke installere både %s og %s"
 
-#: zypp/solver/detail/SATResolver.cc:1008
+#: zypp/solver/detail/SATResolver.cc:986
 msgid "conflicting requests"
 msgstr "kommandokonflikter"
 
-#: zypp/target/rpm/RpmDb.cc:2266
-#, c-format
+#: zypp/target/rpm/RpmDb.cc:2345
+#, c-format, boost-format
 msgid "created backup %s"
 msgstr "opprettet sikkerhetskopi %s"
 
-#: zypp/solver/detail/SATResolver.cc:1374
-#, c-format
+#: zypp/solver/detail/SATResolver.cc:1352
+#, c-format, boost-format
 msgid "deinstallation of %s"
 msgstr "avinstallasjon av %s"
 
-#: zypp/solver/detail/SATResolver.cc:1092
+#: zypp/solver/detail/SATResolver.cc:1070
 msgid "deleted providers: "
 msgstr "slettede leverandører: "
 
-#: zypp/solver/detail/SATResolver.cc:1265
-#, c-format
+#: zypp/solver/detail/SATResolver.cc:1243
+#, c-format, boost-format
 msgid "do not ask to delete all solvables providing %s"
 msgstr "ikke be om å slette alle nødvendige pakker som gir %s"
 
-#: zypp/solver/detail/SATResolver.cc:1243
-#, c-format
+#: zypp/solver/detail/SATResolver.cc:1221
+#, c-format, boost-format
 msgid "do not ask to install a solvable providing %s"
 msgstr "ikke be om å installere en nødvendig pakke som gir %s"
 
-#: zypp/solver/detail/SATResolver.cc:1186
-#, c-format
-msgid "do not forbid installation of %s"
-msgstr "ikke forby installasjon av %s"
-
-#: zypp/solver/detail/SATResolver.cc:1166
-#: zypp/solver/detail/SATResolver.cc:1202
-#, c-format
+#: zypp/solver/detail/SATResolver.cc:1144
+#: zypp/solver/detail/SATResolver.cc:1180
+#, c-format, boost-format
 msgid "do not install %s"
 msgstr "Ikke installer %s"
 
-#: zypp/solver/detail/SATResolver.cc:1278
-#, c-format
+#: zypp/solver/detail/SATResolver.cc:1256
+#, c-format, boost-format
 msgid "do not install most recent version of %s"
 msgstr "ikke installer nyeste versjon av %s"
 
-#: zypp/solver/detail/SATResolver.cc:1161
-#, c-format
-msgid "do not keep %s installed"
-msgstr "ikke behold %s"
-
-#: zypp/solver/detail/SATResolver.cc:1338
-#, c-format
+#: zypp/solver/detail/SATResolver.cc:1316
+#, c-format, boost-format
 msgid "downgrade of %s to %s"
 msgstr "nedgradering av %s til %s"
 
-#: zypp/solver/detail/ProblemSolutionIgnore.cc:61
-msgid "generally ignore of some dependecies"
+#: zypp/solver/detail/ProblemSolutionIgnore.cc:48
+#, fuzzy
+#| msgid "generally ignore of some dependecies"
+msgid "generally ignore of some dependencies"
 msgstr "ignorer generelt noen avhengigheter"
 
-#: zypp/solver/detail/SATResolver.cc:1238
-#: zypp/solver/detail/SATResolver.cc:1259
+#: zypp/solver/detail/SATResolver.cc:1216
+#: zypp/solver/detail/SATResolver.cc:1237
 msgid "ignore the warning of a broken system"
 msgstr "ignorer advarsel om skadet system"
 
-#: zypp/solver/detail/SATResolver.cc:1354
-#, c-format
+#: zypp/solver/detail/SATResolver.cc:1332
+#, c-format, boost-format
 msgid ""
 "install %s (with vendor change)\n"
 "  %s  -->  %s"
@@ -4726,18 +4795,18 @@
 "installer %s (med produsentendring)\n"
 "  %s  -->  %s"
 
-#: zypp/solver/detail/SATResolver.cc:1304
-#, c-format
+#: zypp/solver/detail/SATResolver.cc:1282
+#, c-format, boost-format
 msgid "install %s despite the inferior architecture"
 msgstr "installer %s selv om arkitekturen ikke er riktig"
 
-#: zypp/solver/detail/SATResolver.cc:1318
-#, c-format
+#: zypp/solver/detail/SATResolver.cc:1296
+#, c-format, boost-format
 msgid "install %s from excluded repository"
 msgstr "installer %s fra deaktivert pakkebrønn"
 
-#: zypp/solver/detail/SATResolver.cc:1054
-#, c-format
+#: zypp/solver/detail/SATResolver.cc:1032
+#, c-format, boost-format
 msgid "installed %s obsoletes %s provided by %s"
 msgstr "installert %s foreldede %s fra %s"
 
@@ -4745,19 +4814,19 @@
 msgid "invalid"
 msgstr "ugyldig"
 
-#: zypp/solver/detail/SATResolver.cc:1181
-#: zypp/solver/detail/SATResolver.cc:1223
-#, c-format
+#: zypp/solver/detail/SATResolver.cc:1159
+#: zypp/solver/detail/SATResolver.cc:1201
+#, c-format, boost-format
 msgid "keep %s"
 msgstr "behold %s"
 
-#: zypp/solver/detail/SATResolver.cc:1299
-#, c-format
+#: zypp/solver/detail/SATResolver.cc:1277
+#, c-format, boost-format
 msgid "keep %s despite the inferior architecture"
 msgstr "behold %s selv om arkitekturen er feil"
 
-#: zypp/solver/detail/SATResolver.cc:1313
-#, c-format
+#: zypp/solver/detail/SATResolver.cc:1291
+#, c-format, boost-format
 msgid "keep obsolete %s"
 msgstr "behold den foreldede pakken %s"
 
@@ -4769,40 +4838,51 @@
 msgid "libhal_set_dbus_connection: Can't set dbus connection"
 msgstr "libhal_set_dbus_connection: Kan ikke angi dbus-tilkobling"
 
-#: zypp/solver/detail/SATResolver.cc:1034
-#, c-format
+#: zypp/solver/detail/SATResolver.cc:1012
+#, c-format, boost-format
 msgid "nothing provides %s needed by %s"
 msgstr "ingenting inneholder %s som kreves av %s"
 
-#: zypp/solver/detail/SATResolver.cc:1014
-#, c-format
+#: zypp/solver/detail/SATResolver.cc:992
+#, c-format, boost-format
 msgid "nothing provides requested %s"
 msgstr "ingenting inneholder den nødvendige %s"
 
-#: zypp/solver/detail/SATResolver.cc:1018
-#, c-format
+#: zypp/solver/detail/SATResolver.cc:996
+#, c-format, boost-format
 msgid "package %s does not exist"
 msgstr "pakken %s finnes ikke"
 
-#: zypp/solver/detail/SATResolver.cc:1005
-#, c-format
+#: zypp/solver/detail/SATResolver.cc:983
+#, c-format, boost-format
 msgid "problem with installed package %s"
 msgstr "problem med den installerte pakken %s"
 
-#: zypp/solver/detail/SATResolver.cc:1363
-#, c-format
+#: zypp/solver/detail/SATResolver.cc:1164
+#, fuzzy, c-format, boost-format
+#| msgid "do not forbid installation of %s"
+msgid "remove lock to allow installation of %s"
+msgstr "ikke forby installasjon av %s"
+
+#: zypp/solver/detail/SATResolver.cc:1139
+#, c-format, boost-format
+msgid "remove lock to allow removal of %s"
+msgstr ""
+
+#: zypp/solver/detail/SATResolver.cc:1341
+#, c-format, boost-format
 msgid "replacement of %s with %s"
 msgstr "%s erstattes av %s"
 
 #. %s = filenames
-#: zypp/target/rpm/RpmDb.cc:1949
-#, c-format
+#: zypp/target/rpm/RpmDb.cc:2030
+#, c-format, boost-format
 msgid "rpm created %s as %s, but it was impossible to determine the difference"
 msgstr "rpm opprettet %s som %s, men det var umulig å finne noen forskjell"
 
 #. %s = filenames
-#: zypp/target/rpm/RpmDb.cc:1951
-#, c-format
+#: zypp/target/rpm/RpmDb.cc:2032
+#, c-format, boost-format
 msgid ""
 "rpm created %s as %s.\n"
 "Here are the first 25 lines of difference:\n"
@@ -4811,14 +4891,14 @@
 "Her er de 25 første avvikende linjene:\n"
 
 #. %s = filenames
-#: zypp/target/rpm/RpmDb.cc:1944
-#, c-format
+#: zypp/target/rpm/RpmDb.cc:2025
+#, c-format, boost-format
 msgid "rpm saved %s as %s, but it was impossible to determine the difference"
 msgstr "rpm lagret %s som %s, men det var umulig å finne noen forskjell"
 
 #. %s = filenames
-#: zypp/target/rpm/RpmDb.cc:1946
-#, c-format
+#: zypp/target/rpm/RpmDb.cc:2027
+#, c-format, boost-format
 msgid ""
 "rpm saved %s as %s.\n"
 "Here are the first 25 lines of difference:\n"
@@ -4826,16 +4906,16 @@
 "rpm lagret %s som %s.\n"
 "Her er de 25 første avvikende linjene:\n"
 
-#: zypp/solver/detail/SATResolver.cc:1058
-#, c-format
+#: zypp/solver/detail/SATResolver.cc:1036
+#, c-format, boost-format
 msgid "solvable %s conflicts with %s provided by itself"
 msgstr "løsningen %s er i konflikt med %s som den selv inneholder"
 
-#: zypp/solver/detail/SATResolver.cc:1011
+#: zypp/solver/detail/SATResolver.cc:989
 msgid "some dependency problem"
 msgstr "en konflikt"
 
-#: zypp/solver/detail/SATResolver.cc:1104
+#: zypp/solver/detail/SATResolver.cc:1082
 msgid "uninstallable providers: "
 msgstr "uinstallerbare nødvendige pakker: "
 
@@ -4847,10 +4927,13 @@
 msgid "unsupported"
 msgstr "støttes ikke"
 
-#: zypp/solver/detail/SATResolver.cc:1022
+#: zypp/solver/detail/SATResolver.cc:1000
 msgid "unsupported request"
 msgstr "forespørselen støttes ikke"
 
+#~ msgid "do not keep %s installed"
+#~ msgstr "ikke behold %s"
+
 #~ msgid "Cannot create public key %s from %s keyring to file %s"
 #~ msgstr "Kan ikke opprette den offentlige nøkkelen %s fra %s nøkkelringen for filen %s"
 
@@ -4878,9 +4961,6 @@
 #~ msgid "Failed to download %s from %s"
 #~ msgstr "Kunne ikke laste ned %s fra %s"
 
-#~ msgid "Valid metadata not found at specified URL(s)"
-#~ msgstr "Ingen gyldige metadata funnet på spesifisert(e) nettadresse(r)"
-
 #~ msgid "Serbia and Montenegro"
 #~ msgstr "Serbia og Montenegro"

    

[opensuse-translation-commit] r95404 - trunk/lcn/nb/po

minton＠svn2.opensuse.org